diff --git a/.gitignore b/.gitignore index ddff4cc..9c3db56 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /orjson-3.9.12.tar.gz /orjson-3.9.13.tar.gz /orjson-3.9.15.tar.gz +/orjson-3.10.6.tar.gz diff --git a/python-orjson.spec b/python-orjson.spec index 5e84e0e..a9f8d6a 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -8,7 +8,7 @@ %bcond tests 1 Name: python-orjson -Version: 3.9.15 +Version: 3.10.6 Release: %autorelease Summary: Fast, correct Python JSON library @@ -44,13 +44,14 @@ Summary: %{summary} # (Apache-2.0 OR MIT) AND BSD-3-Clause # Apache-2.0 OR BSL-1.0 # Apache-2.0 OR MIT -# BSD-2-Clause OR Apache-2.0 OR MIT +# BSL-1.0 # MIT +# MIT OR Apache-2.0 (duplicate) License: %{shrink: (Apache-2.0 OR MIT) AND BSD-3-Clause AND (Apache-2.0 OR BSL-1.0) AND - (BSD-2-Clause OR Apache-2.0 OR MIT) AND + BSL-1.0 AND MIT } @@ -62,15 +63,26 @@ License: %{shrink: %autosetup -p1 -n orjson-%{version} %cargo_prep -# Remove unstable feature that requires rust nightly +# Remove unstable features that require rust nightly; the avx512 feature also +# requires the x86_64 architecture tomcli-set Cargo.toml del 'features.unstable-simd' +tomcli-set Cargo.toml del 'features.avx512' # Remove no-panic feature tomcli-set Cargo.toml del 'features.no-panic' +# Remove unwind feature, which is not useful here: the comment above it says +# “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. rm -rv include/yyjson/ +# Remove unpackaged PyPI plugin +sed -i '/pytest-random-order/d' test/requirements.txt + %generate_buildrequires diff --git a/sources b/sources index 85276eb..76f47dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orjson-3.9.15.tar.gz) = ad6a7bbb8ffbf1eff05fd421527264336a844133dd8c19303cd22d767ad5f76047191beba8b45b1eed79c7024099a9e04529c40d669db76475191c67a42fc183 +SHA512 (orjson-3.10.6.tar.gz) = a3b6bfe4c9611ae62476490ccf9378135df2a714743df2252d247c8bf5724943d5717d2821d22305a854426e2be38cb9d40067aa892035414e8db5b26f1d90fb