diff --git a/.gitignore b/.gitignore index 87f5fcf..5a5d521 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /orjson-3.9.10.tar.gz /orjson-3.9.12.tar.gz /orjson-3.9.13.tar.gz +/orjson-3.10.1.tar.gz diff --git a/Remove-strict-ahash-version-pin.patch b/Remove-strict-ahash-version-pin.patch deleted file mode 100644 index 569f70f..0000000 --- a/Remove-strict-ahash-version-pin.patch +++ /dev/null @@ -1,25 +0,0 @@ -From db97d953cbe35e6a34372e4a9d4702d3fdd5ddb1 Mon Sep 17 00:00:00 2001 -From: Maxwell G -Date: Thu, 18 Jan 2024 21:07:59 +0000 -Subject: [PATCH] Remove strict ahash version pin - ---- - Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Cargo.toml b/Cargo.toml -index c2cf457..475a1c0 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -45,7 +45,7 @@ no-panic = [ - yyjson = [] - - [dependencies] --ahash = { version = "=0.8.6", default_features = false, features = ["compile-time-rng"] } -+ahash = { version = "0.8.6", default_features = false, features = ["compile-time-rng"] } - arrayvec = { version = "0.7", default_features = false, features = ["std", "serde"] } - associative-cache = { version = "2", default_features = false } - beef = { version = "0.5", default_features = false, features = ["impl_serde"] } --- -2.43.0 - diff --git a/python-orjson.spec b/python-orjson.spec index 539ae9c..1b346dc 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -8,14 +8,13 @@ %bcond tests 1 Name: python-orjson -Version: 3.9.13 +Version: 3.10.1 Release: 1%{?dist} Summary: Fast, correct Python JSON library License: Apache-2.0 OR MIT URL: https://github.com/ijl/orjson Source: %{pypi_source orjson} -Patch: Remove-strict-ahash-version-pin.patch BuildRequires: tomcli BuildRequires: python3-devel @@ -57,11 +56,16 @@ License: %{shrink: tomcli-set Cargo.toml del 'features.unstable-simd' # Remove no-panic feature tomcli-set Cargo.toml del 'features.no-panic' +# Remove strict dependencies +sed -Ei 's|(version = ")=|\1|' Cargo.toml # Remove bundled rust crates rm -r include/cargo # Remove bundled yyjson. rm -rv include/yyjson/ +# Remove unpackaged PyPI plugin +sed -i '/pytest-random-order/d' test/requirements.txt + %generate_buildrequires @@ -95,6 +99,9 @@ export RUSTFLAGS='%{build_rustflags}' %changelog +* Mon Apr 15 2024 Maxwell G - 3.10.1-1 +- Update to 3.10.1. Fixes rhbz#2264126. + * Tue Feb 6 2024 Maxwell G - 3.9.13-1 - Update to 3.9.13. Fixes rhbz#2262570. diff --git a/sources b/sources index b6c529d..fffc269 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orjson-3.9.13.tar.gz) = c3fc7ad42a2ea40fa996cec11609c3d72ad3ad42a2ef24d36472bb89e5231ae6288c4ded57ba69074a04244e2e8ab7cf878c26b79bb01d5f6883be18395cd219 +SHA512 (orjson-3.10.1.tar.gz) = 54b927f407a584b0751403b3473bdb26fa3827e07895a28255b7ef938dc404d36fd388e47ddd0e724916786a3e52ef9fe5f245d8d2732d1cb6880bedb75135cf