pygjson 0.0.2__tar.gz → 0.0.3__tar.gz

pygjson-0.0.3/.github/workflows/test.yml

@@ -0,0 +1,38 @@
+name: Tests
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    name: Test Python ${{ matrix.python-version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Build wheel
+        uses: PyO3/maturin-action@v1
+        with:
+          command: build
+          args: --out dist
+        env:
+          PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1
+
+      - name: Install wheel and pytest
+        shell: bash
+        run: pip install dist/*.whl pytest
+
+      - name: Run tests
+        run: pytest tests/ -v

{pygjson-0.0.2 → pygjson-0.0.3}/Cargo.lock

@@ -2,12 +2,6 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "autocfg"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
-
 [[package]]
 name = "cc"
 version = "1.2.60"
@@ -18,12 +12,6 @@ dependencies = [
  "shlex",
 ]
 
-[[package]]
-name = "cfg-if"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
-
 [[package]]
 name = "find-msvc-tools"
 version = "0.1.9"
@@ -42,29 +30,11 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "indoc"
-version = "2.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
-dependencies = [
- "rustversion",
-]
-
 [[package]]
 name = "libc"
-version = "0.2.184"
+version = "0.2.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
-
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
+checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
 
 [[package]]
 name = "once_cell"
@@ -89,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "pygjson"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "gjson",
  "pyo3",
@@ -97,38 +67,33 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.22.6"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884"
+checksum = "91fd8e38a3b50ed1167fb981cd6fd60147e091784c427b8f7183a7ee32c31c12"
 dependencies = [
- "cfg-if",
- "indoc",
  "libc",
- "memoffset",
  "once_cell",
  "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
- "unindent",
 ]
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.22.6"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38"
+checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e"
 dependencies = [
- "once_cell",
  "python3-dll-a",
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.22.6"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636"
+checksum = "7f29e10af80b1f7ccaf7f69eace800a03ecd13e883acfacc1e5d0988605f651e"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -136,9 +101,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.22.6"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453"
+checksum = "df6e520eff47c45997d2fc7dd8214b25dd1310918bbb2642156ef66a67f29813"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -148,9 +113,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.22.6"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe"
+checksum = "c4cdc218d835738f81c2338f822078af45b4afdf8b2e33cbb5916f108b813acb"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -177,12 +142,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "rustversion"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
-
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -202,18 +161,12 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
 
 [[package]]
 name = "unicode-ident"
 version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
-
-[[package]]
-name = "unindent"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"

{pygjson-0.0.2 → pygjson-0.0.3}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pygjson"
-version = "0.0.2"
+version = "0.0.3"
 edition = "2021"
 readme = "README.md"
 
@@ -9,5 +9,5 @@ name = "_pygjson"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.22", features = ["extension-module", "abi3-py310", "generate-import-lib"] }
+pyo3 = { version = "0.28.3", features = ["extension-module", "abi3-py310", "generate-import-lib"] }
 gjson = "0.8"

{pygjson-0.0.2 → pygjson-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygjson
-Version: 0.0.2
+Version: 0.0.3
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 License-File: LICENSE

{pygjson-0.0.2 → pygjson-0.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "pygjson"
-version = "0.0.2"
+version = "0.0.3"
 description = "Python bindings for gjson.rs - fast JSON path queries"
 requires-python = ">=3.10"
 license = { file = "LICENSE" }

{pygjson-0.0.2 → pygjson-0.0.3}/src/lib.rs

@@ -4,7 +4,7 @@ use pyo3::types::{PyDict, PyTuple};
 use std::sync::Arc;
 
 /// Mirror of `gjson::Kind`, exposed to Python as a class with constant attributes.
-#[pyclass(module = "pygjson._pygjson", eq, eq_int)]
+#[pyclass(module = "pygjson._pygjson", eq, eq_int, skip_from_py_object)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Kind {
     Null,
@@ -123,13 +123,13 @@ impl Value {
     }
 
     /// Signed integer value (`i64`).
-    fn to_int(&self, py: Python<'_>) -> PyObject {
-        self.parsed().i64().into_py(py)
+    fn to_int(&self, py: Python<'_>) -> PyResult<Py<PyAny>> {
+        Ok(self.parsed().i64().into_pyobject(py)?.into_any().unbind())
     }
 
     /// Unsigned integer value (`u64`).
-    fn to_uint(&self, py: Python<'_>) -> PyObject {
-        self.parsed().u64().into_py(py)
+    fn to_uint(&self, py: Python<'_>) -> PyResult<Py<PyAny>> {
+        Ok(self.parsed().u64().into_pyobject(py)?.into_any().unbind())
     }
 
     /// Floating point value.
@@ -157,7 +157,7 @@ impl Value {
         py: Python<'_>,
         path: &str,
         args: &Bound<'_, pyo3::types::PyTuple>,
-    ) -> PyResult<PyObject> {
+    ) -> PyResult<Py<PyAny>> {
         if args.len() > 1 {
             return Err(pyo3::exceptions::PyTypeError::new_err(
                 "get() takes at most 2 positional arguments",
@@ -166,9 +166,9 @@ impl Value {
         let parsed = self.parsed();
         let val = Value::child(&self.raw, parsed.get(path));
         if !val.exists && !args.is_empty() {
-            return Ok(args.get_item(0)?.into_py(py));
+            return Ok(args.get_item(0)?.unbind());
         }
-        Ok(val.into_py(py))
+        Ok(Py::new(py, val)?.into_any())
     }
 
     /// Return the value as a list of `Value` objects (empty for non-arrays).
@@ -184,7 +184,7 @@ impl Value {
 
     /// Return the value as a `dict[str, Value]` (empty for non-objects).
     fn to_dict<'py>(&self, py: Python<'py>) -> PyResult<Bound<'py, PyDict>> {
-        let dict = PyDict::new_bound(py);
+        let dict = PyDict::new(py);
         // Only iterate as a map for objects; arrays would yield empty keys.
         if matches!(self.kind, Kind::Object) {
             let parsed = self.parsed();
@@ -192,7 +192,7 @@ impl Value {
             parsed.each(|k, v| {
                 let key = k.str().to_string();
                 let child = Value::child(&self.raw, v);
-                match dict.set_item(key, child.into_py(py)) {
+                match dict.set_item(key, child) {
                     Ok(()) => true,
                     Err(e) => {
                         err = Some(e);
@@ -336,11 +336,11 @@ impl Value {
         )
     }
 
-    fn __int__(&self, py: Python<'_>) -> PyObject {
+    fn __int__(&self, py: Python<'_>) -> PyResult<Py<PyAny>> {
         if self.raw_slice().starts_with('-') {
-            self.parsed().i64().into_py(py)
+            Ok(self.parsed().i64().into_pyobject(py)?.into_any().unbind())
         } else {
-            self.parsed().u64().into_py(py)
+            Ok(self.parsed().u64().into_pyobject(py)?.into_any().unbind())
         }
     }
 
@@ -465,7 +465,7 @@ impl ValueIterator {
         slf
     }
 
-    fn __next__(&mut self, py: Python<'_>) -> PyResult<Option<PyObject>> {
+    fn __next__(&mut self, py: Python<'_>) -> PyResult<Option<Py<PyAny>>> {
         let i = self.cursor;
         match self.mode {
             IterMode::Strings => {
@@ -473,7 +473,7 @@ impl ValueIterator {
                     return Ok(None);
                 }
                 self.cursor += 1;
-                Ok(Some(self.strings[i].as_ref().to_string().into_py(py)))
+                Ok(Some(self.strings[i].as_ref().into_pyobject(py)?.into_any().unbind()))
             }
             IterMode::Values => {
                 if i >= self.children.len() {
@@ -488,7 +488,7 @@ impl ValueIterator {
                     kind: v.kind,
                     exists: v.exists,
                 };
-                Ok(Some(Py::new(py, cloned)?.into_py(py)))
+                Ok(Some(Py::new(py, cloned)?.into_any()))
             }
             IterMode::Items => {
                 if i >= self.children.len() {
@@ -503,10 +503,10 @@ impl ValueIterator {
                     kind: v.kind,
                     exists: v.exists,
                 };
-                let key_obj = self.strings[i].as_ref().to_string().into_py(py);
-                let val_obj = Py::new(py, cloned)?.into_py(py);
-                let tup = PyTuple::new_bound(py, &[key_obj, val_obj]);
-                Ok(Some(tup.into_py(py)))
+                let key_obj = self.strings[i].as_ref().into_pyobject(py)?;
+                let val_obj = Py::new(py, cloned)?.into_bound(py).into_any();
+                let tup = PyTuple::new(py, [key_obj.into_any(), val_obj])?;
+                Ok(Some(tup.into_any().unbind()))
             }
         }
     }