cargo update, MSRV 1.65

.github/workflows/debug.yaml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         rust: [
-          { version: "1.60" }, # MSRV
+          { version: "1.65" }, # MSRV
           { version: "nightly-2023-08-30" },
         ]
         python: [
@@ -28,7 +28,7 @@ jobs:
         python-version: '${{ matrix.python.version }}'
     - run: python -m pip install --user --upgrade pip "maturin>=1,<2" wheel
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: build
       run: |

.github/workflows/lint.yaml

@@ -10,7 +10,7 @@ jobs:
     - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=default -y
     - run: pip install -U autoflake isort black ruff mypy types-python-dateutil types-pytz types-simplejson types-ujson
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - run: cargo fmt
     - run: ./script/lint

.github/workflows/linux.yaml

@@ -7,12 +7,12 @@ jobs:
     strategy:
       fail-fast: false
     env:
-      RUST_TOOLCHAIN: "1.60" # MSRV
+      RUST_TOOLCHAIN: "1.65" # MSRV
     steps:
     - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain $RUST_TOOLCHAIN -y
     - run: rustup default $RUST_TOOLCHAIN
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - run: python3 -m pip install --user --upgrade pip "maturin>=1,<2" wheel
 
@@ -73,10 +73,9 @@ jobs:
     - run: yum install -y clang lld
     - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-08-30 --profile minimal -y
     - run: rustup component add rust-src --toolchain nightly-2023-08-30-x86_64-unknown-linux-gnu
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: build-std
-      if: matrix.target.arch != 'aarch64'
       run: |
         mkdir .cargo
         cp ci/config.toml .cargo/config.toml
@@ -128,10 +127,9 @@ jobs:
             arch: x86_64
             platform: linux/amd64
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: build-std
-      if: matrix.target.arch != 'aarch64'
       run: |
         mkdir .cargo
         cp ci/config.toml .cargo/config.toml
@@ -153,7 +151,7 @@ jobs:
 
     - name: Set up QEMU
       if: matrix.platform.arch != 'x86_64'
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
       with:
         image: tonistiigi/binfmt:qemu-v7.0.0
         platforms: ${{ matrix.platform.platform }}
@@ -216,10 +214,9 @@ jobs:
           },
         ]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: build-std
-      if: matrix.target.arch != 'aarch64'
       run: |
         mkdir .cargo
         cp ci/config.toml .cargo/config.toml

Cargo.toml

@@ -5,7 +5,7 @@ authors = ["ijl <[email protected]>"]
 description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
 edition = "2021"
 resolver = "2"
-rust-version = "1.60"
+rust-version = "1.65"
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/ijl/orjson"
 homepage = "https://github.com/ijl/orjson"
@@ -50,9 +50,9 @@ yyjson = []
 [dependencies]
 ahash = { version = "0.8", default_features = false }
 arrayvec = { version = "0.7", default_features = false, features = ["std", "serde"] }
-associative-cache = { version = "1", default_features = false }
+associative-cache = { version = "2", default_features = false }
 beef = { version = "0.5", default_features = false, features = ["impl_serde"] }
-bytecount = { version = "^0.6.3", default_features = false, features = ["runtime-dispatch-simd"] }
+bytecount = { version = "^0.6.4", default_features = false, features = ["runtime-dispatch-simd"] }
 chrono = { version = "^0.4.24", default_features = false }
 compact_str = { version = "0.7", default_features = false, features = ["serde"] }
 encoding_rs = { version = "0.8", default_features = false }

README.md

@@ -1183,7 +1183,7 @@ Probably not.
 
 ## Packaging
 
-To package orjson requires at least [Rust](https://www.rust-lang.org/) 1.60
+To package orjson requires at least [Rust](https://www.rust-lang.org/) 1.65
 and the [maturin](https://github.com/PyO3/maturin) build tool. The recommended
 build command is:
 
@@ -1195,7 +1195,7 @@ It benefits from also having a C build environment to compile a faster
 deserialization backend. See this project's `manylinux_2_28` builds for an
 example using clang and LTO.
 
-The project's own CI tests against `nightly-2023-08-30` and stable 1.60. It
+The project's own CI tests against `nightly-2023-08-30` and stable 1.65. It
 is prudent to pin the nightly version because that channel can introduce
 breaking changes.
 

ci/azure-pipelines.yml

@@ -12,7 +12,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12.0-rc.1'
+      versionSpec: '3.12.0'
       addToPath: true
       allowUnstable: true
   - checkout: self
@@ -79,13 +79,13 @@ jobs:
   pool:
     vmImage: windows-2022
   variables:
-    interpreter: C:\hostedtoolcache\windows\Python\3.12.0-rc.1\x64\python.exe
+    interpreter: C:\hostedtoolcache\windows\Python\3.12.0\x64\python.exe
     rustup: https://win.rustup.rs/x86_64
     target: x86_64-pc-windows-msvc
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12.0-rc.1'
+      versionSpec: '3.12.0'
       addToPath: true
       allowUnstable: true
       architecture: 'x64'
@@ -160,13 +160,13 @@ jobs:
   pool:
     vmImage: windows-2022
   variables:
-    interpreter: C:\hostedtoolcache\windows\Python\3.12.0-rc.1\x86\python.exe
+    interpreter: C:\hostedtoolcache\windows\Python\3.12.0\x86\python.exe
     rustup: https://win.rustup.rs/x86
     target: i686-pc-windows-msvc
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.12.0-rc.1'
+      versionSpec: '3.12.0'
       addToPath: true
       allowUnstable: true
       architecture: 'x86'

pyproject.toml

@@ -16,6 +16,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python",
     "Programming Language :: Rust",

src/util.rs

@@ -168,7 +168,7 @@ macro_rules! str_hash {
 #[cfg(Py_3_13)]
 macro_rules! pydict_contains {
     ($obj1:expr, $obj2:expr) => {
-        unsafe { pyo3_ffi::PyDict_Contains((*$obj1).tp_dict, $obj2) == 1 }
+        unsafe { pyo3_ffi::PyDict_Contains(pyo3_ffi::PyType_GetDict($obj1), $obj2) == 1 }
     };
 }
 

test/test_circular.py

@@ -15,6 +15,24 @@ def test_circular_dict(self):
         with pytest.raises(orjson.JSONEncodeError):
             orjson.dumps(obj)
 
+    def test_circular_dict_sort_keys(self):
+        """
+        dumps() circular reference dict OPT_SORT_KEYS
+        """
+        obj = {}  # type: ignore
+        obj["obj"] = obj
+        with pytest.raises(orjson.JSONEncodeError):
+            orjson.dumps(obj, option=orjson.OPT_SORT_KEYS)
+
+    def test_circular_dict_non_str_keys(self):
+        """
+        dumps() circular reference dict OPT_NON_STR_KEYS
+        """
+        obj = {}  # type: ignore
+        obj["obj"] = obj
+        with pytest.raises(orjson.JSONEncodeError):
+            orjson.dumps(obj, option=orjson.OPT_NON_STR_KEYS)
+
     def test_circular_list(self):
         """
         dumps() circular reference list
@@ -32,3 +50,21 @@ def test_circular_nested(self):
         obj["list"] = [{"obj": obj}]
         with pytest.raises(orjson.JSONEncodeError):
             orjson.dumps(obj)
+
+    def test_circular_nested_sort_keys(self):
+        """
+        dumps() circular reference nested dict, list OPT_SORT_KEYS
+        """
+        obj = {}  # type: ignore
+        obj["list"] = [{"obj": obj}]
+        with pytest.raises(orjson.JSONEncodeError):
+            orjson.dumps(obj, option=orjson.OPT_SORT_KEYS)
+
+    def test_circular_nested_non_str_keys(self):
+        """
+        dumps() circular reference nested dict, list OPT_NON_STR_KEYS
+        """
+        obj = {}  # type: ignore
+        obj["list"] = [{"obj": obj}]
+        with pytest.raises(orjson.JSONEncodeError):
+            orjson.dumps(obj, option=orjson.OPT_NON_STR_KEYS)