diff --git a/.gitignore b/.gitignore index cc3f74a..b2d5787 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /orjson-3.10.12.tar.gz /orjson-3.10.13.tar.gz /orjson-3.10.14.tar.gz +/orjson-3.10.16.tar.gz diff --git a/orjson-fix-metadata.diff b/orjson-fix-metadata.diff new file mode 100644 index 0000000..b3116ec --- /dev/null +++ b/orjson-fix-metadata.diff @@ -0,0 +1,12 @@ +diff -Naur orjson-3.10.16-original/Cargo.toml orjson-3.10.16/Cargo.toml +--- orjson-3.10.16-original/Cargo.toml 1969-12-31 19:00:00.000000000 -0500 ++++ orjson-3.10.16/Cargo.toml 2025-04-02 20:09:24.874851253 -0400 +@@ -51,7 +51,7 @@ + [dependencies] + associative-cache = { version = "2", default-features = false } + bytecount = { version = "^0.6.7", default-features = false, features = ["runtime-dispatch-simd"] } +-compact_str = { version = "0.9", default-features = false, features = ["serde"] } ++compact_str = { version = ">=0.8, <0.10", default-features = false, features = ["serde"] } + encoding_rs = { version = "0.8", default-features = false } + half = { version = "2", default-features = false, features = ["std"] } + itoa = { version = "1", default-features = false } diff --git a/python-orjson.spec b/python-orjson.spec index 99136a1..31d96a3 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -10,7 +10,7 @@ %bcond pendulum %{undefined el10} Name: python-orjson -Version: 3.10.14 +Version: 3.10.16 Release: %autorelease Summary: Fast, correct Python JSON library @@ -18,6 +18,11 @@ License: Apache-2.0 OR MIT URL: https://github.com/ijl/orjson Source: %{pypi_source orjson} +# Manual patches for Cargo.toml +# - For now, allow compact_str 0.8; +# https://bugzilla.redhat.com/show_bug.cgi?id=2347456 +Patch: orjson-fix-metadata.diff + BuildRequires: tomcli BuildRequires: python3-devel BuildRequires: %{py3_dist pytest-forked} @@ -89,8 +94,6 @@ tomcli-set Cargo.toml del 'features.avx512' # “Avoid bundling libgcc on musl.” tomcli-set Cargo.toml del 'features.unwind' tomcli-set Cargo.toml del 'dependencies.unwinding' -# Remove strict dependencies -sed -Ei 's|(version = ")=|\1|' Cargo.toml # Remove bundled rust crates rm -r include/cargo # Remove bundled yyjson. diff --git a/sources b/sources index 21c9858..e553587 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orjson-3.10.14.tar.gz) = d186e95ac6750af9f2688744fe663e63973e06942fcbfc10deadc1d63a5ad59f437ea4e2485d1866bde6abcd59086fa5c1a0794d3ba975e693995d3ca58f0f76 +SHA512 (orjson-3.10.16.tar.gz) = ea71aa463206feae1a96bb604366af2f17ddb083a1a4b7cc87c1b8ad1f01b54bd5c4ef148e9472fed8d8308de37b2a4e4fe0b4a4290d19eaf4fc3ae5777791f9