diff --git a/.gitignore b/.gitignore index 59c9ea3..72a1df7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,8 @@ /orjson-3.9.7.tar.gz /orjson-3.9.8.tar.gz /orjson-3.9.10.tar.gz +/orjson-3.9.12.tar.gz +/orjson-3.9.13.tar.gz +/orjson-3.9.15.tar.gz +/orjson-3.10.6.tar.gz +/orjson-3.10.7.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..baad23f --- /dev/null +++ b/changelog @@ -0,0 +1,37 @@ +* Tue Jun 04 2024 Benjamin A. Beasley - 3.9.15-1 +- Update to 3.9.15. Fixes rhbz#2262570. Fixes rhbz#2259025. + +* Fri May 24 2024 Benjamin A. Beasley - 3.9.10-2 +- Rebuild with Rust 1.78 to fix incomplete debuginfo and backtraces + +* Wed Nov 22 2023 Maxwell G - 3.9.10-1 +- Update to 3.9.10. Fixes rhbz#2243767. + +* Tue Oct 10 2023 Maxwell G - 3.9.8-1 +- Update to 3.9.8. Fixes rhbz#2229530. + +* Tue Jul 25 2023 Tomáš Hrnčiar - 3.9.2-2 +- Backport patch to add PyType_GetDict for Python 3.12 +- Fixes: rhbz#2220383 + +* Fri Jul 21 2023 Maxwell G - 3.9.2-1 +- Update to 3.9.2. Fixes rhbz#2211703. + +* Fri Jul 21 2023 Maxwell G - 3.8.14-1 +- Update to 3.8.14. + +* Fri Jul 21 2023 Fedora Release Engineering - 3.8.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 27 2023 Python Maint - 3.8.12-2 +- Rebuilt for Python 3.12 + +* Thu May 18 2023 Maxwell G - 3.8.12-1 +- Update to 3.8.12. +- Use maturin as a build system when available + +* Fri May 5 2023 Maxwell G - 3.8.11-1 +- Update to 3.8.11. Fixes rhbz#2193468. + +* Wed Apr 12 2023 Maxwell G - 3.8.10-1 +- Initial package (rhbz#2184237). diff --git a/python-orjson.spec b/python-orjson.spec index bcad5d6..ddddd97 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -8,8 +8,8 @@ %bcond tests 1 Name: python-orjson -Version: 3.9.10 -Release: 1%{?dist} +Version: 3.10.7 +Release: %autorelease Summary: Fast, correct Python JSON library License: Apache-2.0 OR MIT @@ -19,6 +19,16 @@ Source: %{pypi_source orjson} BuildRequires: tomcli BuildRequires: python3-devel BuildRequires: %{py3_dist pytest-forked} +# Upstream restricts these test dependencies to particular Python interpreter +# versions and architectures, but we would like to run the corresponding tests +# everywhere. +BuildRequires: %{py3_dist numpy} +BuildRequires: %{py3_dist pendulum} +# These are not in tests/requirements.txt, but they enable additional tests +%ifnarch %{ix86} +BuildRequires: %{py3_dist pandas} +%endif +BuildRequires: %{py3_dist psutil} BuildRequires: rust-packaging @@ -32,16 +42,19 @@ datetimes, and numpy} %package -n python3-orjson Summary: %{summary} # (Apache-2.0 OR MIT) AND BSD-3-Clause -# Apache-2.0 # Apache-2.0 OR BSL-1.0 # Apache-2.0 OR MIT +# BSL-1.0 # MIT +# MIT OR Apache-2.0 (duplicate) +# Unlicense OR MIT License: %{shrink: (Apache-2.0 OR MIT) AND BSD-3-Clause AND - Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND - MIT + BSL-1.0 AND + MIT AND + (Unlicense OR MIT) } @@ -52,15 +65,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 @@ -84,7 +108,8 @@ export RUSTFLAGS='%{build_rustflags}' %pyproject_check_import %if %{with tests} # --forked: protect the pytest process against test segfaults -%pytest --forked +# -rs: print the reasons for skipped tests +%pytest --forked -rs %endif @@ -94,34 +119,4 @@ export RUSTFLAGS='%{build_rustflags}' %changelog -* Wed Nov 22 2023 Maxwell G - 3.9.10-1 -- Update to 3.9.10. Fixes rhbz#2243767. - -* Tue Oct 10 2023 Maxwell G - 3.9.8-1 -- Update to 3.9.8. Fixes rhbz#2229530. - -* Tue Jul 25 2023 Tomáš Hrnčiar - 3.9.2-2 -- Backport patch to add PyType_GetDict for Python 3.12 -- Fixes: rhbz#2220383 - -* Fri Jul 21 2023 Maxwell G - 3.9.2-1 -- Update to 3.9.2. Fixes rhbz#2211703. - -* Fri Jul 21 2023 Maxwell G - 3.8.14-1 -- Update to 3.8.14. - -* Fri Jul 21 2023 Fedora Release Engineering - 3.8.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 27 2023 Python Maint - 3.8.12-2 -- Rebuilt for Python 3.12 - -* Thu May 18 2023 Maxwell G - 3.8.12-1 -- Update to 3.8.12. -- Use maturin as a build system when available - -* Fri May 5 2023 Maxwell G - 3.8.11-1 -- Update to 3.8.11. Fixes rhbz#2193468. - -* Wed Apr 12 2023 Maxwell G - 3.8.10-1 -- Initial package (rhbz#2184237). +%autochangelog diff --git a/sources b/sources index 19aef9a..ea98349 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orjson-3.9.10.tar.gz) = 070bbee45ec08b1496b0f92d5b36d278000e33f00af6e45f2857b97c14682887558ca6413789cfebfc96a29d2366be0832a01e5e9a69868ab66d2907f86d999a +SHA512 (orjson-3.10.7.tar.gz) = 3940b76039d6494626e69f9a2a0373779827c6686ab1321411f3b3a5056e0df227b68c9555796ce45f3952fe597c50740934d764f30dcf8bc1c84b2baf4b6631