dockerfile-analyzer 0.3.0__tar.gz → 0.3.2__tar.gz

{dockerfile_analyzer-0.3.0 → dockerfile_analyzer-0.3.2}/Cargo.lock

@@ -20,7 +20,7 @@ dependencies = [
 
 [[package]]
 name = "dockerfile-analyzer"
-version = "0.3.0"
+version = "0.3.2"
 dependencies = [
  "docker-image",
  "parse-dockerfile",
@@ -94,9 +94,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a"
+checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
 dependencies = [
  "indoc",
  "libc",
@@ -111,19 +111,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598"
+checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
 dependencies = [
- "once_cell",
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c"
+checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -131,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50"
+checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -143,9 +142,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc"
+checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
 dependencies = [
  "heck",
  "proc-macro2",

{dockerfile_analyzer-0.3.0 → dockerfile_analyzer-0.3.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dockerfile-analyzer"
-version = "0.3.0"
+version = "0.3.2"
 edition = "2024"
 readme = "README.md"
 
@@ -10,7 +10,7 @@ name = "dockerfile_analyzer"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = "0.25.0"
+pyo3 = "0.26.0"
 docker-image = {version = "0.2.1"}
 parse-dockerfile = { version = "0.1.1", default-features = false }
 shlex = "1.3.0"

{dockerfile_analyzer-0.3.0 → dockerfile_analyzer-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dockerfile-analyzer
-Version: 0.3.0
+Version: 0.3.2
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{dockerfile_analyzer-0.3.0 → dockerfile_analyzer-0.3.2}/src/models.rs

@@ -26,7 +26,7 @@ impl InstructionStats {
         )
     }
 
-    fn to_dict(&self, py: Python) -> PyResult<PyObject> {
+    fn to_dict(&self, py: Python) -> PyResult<Py<PyAny>> {
         let dict = PyDict::new(py);
         dict.set_item("total_count", self.total_count)?;
         dict.set_item("by_type", &self.by_type)?;
@@ -64,7 +64,7 @@ impl ImageComponents {
         )
     }
 
-    fn to_dict(&self, py: Python) -> PyResult<PyObject> {
+    fn to_dict(&self, py: Python) -> PyResult<Py<PyAny>> {
         let dict = PyDict::new(py);
         dict.set_item("registry", &self.registry)?;
         dict.set_item("name", &self.name)?;
@@ -102,7 +102,7 @@ impl Image {
         )
     }
 
-    fn to_dict(&self, py: Python) -> PyResult<PyObject> {
+    fn to_dict(&self, py: Python) -> PyResult<Py<PyAny>> {
         let dict = PyDict::new(py);
         dict.set_item("full", &self.full)?;
 
@@ -148,7 +148,7 @@ impl MultistageAnalysis {
         )
     }
 
-    fn to_dict(&self, py: Python) -> PyResult<PyObject> {
+    fn to_dict(&self, py: Python) -> PyResult<Py<PyAny>> {
         let dict = PyDict::new(py);
         dict.set_item("is_multistage", self.is_multistage)?;
         dict.set_item(
@@ -215,12 +215,12 @@ impl Analysis {
         )
     }
 
-    fn to_dict(&self, py: Python) -> PyResult<PyObject> {
+    fn to_dict(&self, py: Python) -> PyResult<Py<PyAny>> {
         let dict = PyDict::new(py);
         dict.set_item("num_stages", self.num_stages)?;
 
         // Convert Vec<Image> to Vec<PyObject>
-        let images: PyResult<Vec<PyObject>> =
+        let images: PyResult<Vec<Py<PyAny>>> =
             self.images.iter().map(|img| img.to_dict(py)).collect();
         dict.set_item("images", images?)?;
 
@@ -259,7 +259,7 @@ impl KeyValueInstr {
         )
     }
 
-    fn to_dict(&self, py: Python) -> PyResult<PyObject> {
+    fn to_dict(&self, py: Python) -> PyResult<Py<PyAny>> {
         let dict = PyDict::new(py);
         dict.set_item("args", &self.args)?;
         dict.set_item("labels", &self.labels)?;

{dockerfile_analyzer-0.3.0 → dockerfile_analyzer-0.3.2}/src/parse_utils.rs

@@ -49,9 +49,9 @@ fn extract_tokens_from_instr(ins: &str) -> Vec<String> {
     processed
 }
 
-fn vec_to_map(v: &[String]) -> HashMap<String, String> {
+fn vec_to_map(toks: &[String]) -> HashMap<String, String> {
     let mut res = HashMap::new();
-    for chunk in v.chunks(2) {
+    for chunk in toks.chunks(2) {
         match chunk {
             [k, v] => {
                 res.insert(k.to_string(), v.to_string());
@@ -66,9 +66,9 @@ fn vec_to_map(v: &[String]) -> HashMap<String, String> {
     res
 }
 
-fn vec_to_map_opt_val(v: &[String]) -> HashMap<String, Option<String>> {
+fn vec_to_map_opt_val(toks: &[String]) -> HashMap<String, Option<String>> {
     let mut res: HashMap<String, Option<String>> = HashMap::new();
-    for chunk in v.chunks(2) {
+    for chunk in toks.chunks(2) {
         match chunk {
             [k, v] => {
                 res.insert(k.to_string(), Some(v.to_string()));