From 3a5dccf5d409f96bb23b9d4ce52012ac84e767e5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 24 May 2024 13:09:41 -0400 Subject: [PATCH 1/8] Rebuild with Rust 1.78 to fix incomplete debuginfo and backtraces --- python-orjson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-orjson.spec b/python-orjson.spec index bcad5d6..d2a6743 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -9,7 +9,7 @@ Name: python-orjson Version: 3.9.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast, correct Python JSON library License: Apache-2.0 OR MIT @@ -94,6 +94,9 @@ export RUSTFLAGS='%{build_rustflags}' %changelog +* 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. From 428e94c439b659ad0c39331478021cbf79b3dffd Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 18 Jan 2024 21:04:20 +0000 Subject: [PATCH 2/8] Update to 3.9.15. Fixes rhbz#2262570. Fixes rhbz#2259025. --- .gitignore | 3 +++ python-orjson.spec | 11 +++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 59c9ea3..ddff4cc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ /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 diff --git a/python-orjson.spec b/python-orjson.spec index d2a6743..80a2952 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -8,8 +8,8 @@ %bcond tests 1 Name: python-orjson -Version: 3.9.10 -Release: 2%{?dist} +Version: 3.9.15 +Release: 1%{?dist} Summary: Fast, correct Python JSON library License: Apache-2.0 OR MIT @@ -32,15 +32,15 @@ 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 +# BSD-2-Clause OR Apache-2.0 OR MIT # 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 + (BSD-2-Clause OR Apache-2.0 OR MIT) AND MIT } @@ -94,6 +94,9 @@ export RUSTFLAGS='%{build_rustflags}' %changelog +* 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 diff --git a/sources b/sources index 19aef9a..85276eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orjson-3.9.10.tar.gz) = 070bbee45ec08b1496b0f92d5b36d278000e33f00af6e45f2857b97c14682887558ca6413789cfebfc96a29d2366be0832a01e5e9a69868ab66d2907f86d999a +SHA512 (orjson-3.9.15.tar.gz) = ad6a7bbb8ffbf1eff05fd421527264336a844133dd8c19303cd22d767ad5f76047191beba8b45b1eed79c7024099a9e04529c40d669db76475191c67a42fc183 From 3d90414b2f386d3aa6ad52c4b95664dbb2e8a205 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 1 Jun 2024 08:44:03 -0400 Subject: [PATCH 3/8] Print the reasons for skipped tests --- python-orjson.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-orjson.spec b/python-orjson.spec index 80a2952..d134db4 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -84,7 +84,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 From 1625d8359f0ed83725395bbedb49aaf8742f014e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 1 Jun 2024 15:50:44 -0400 Subject: [PATCH 4/8] Re-enable skipped numpy and pendulum integration tests --- python-orjson.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-orjson.spec b/python-orjson.spec index d134db4..6ed4589 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -19,6 +19,11 @@ 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} BuildRequires: rust-packaging From 5ad6665f7101fec19656b15b558d0f5ab86351e2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 1 Jun 2024 15:52:28 -0400 Subject: [PATCH 5/8] Enable skipped pandas and psutil integration tests --- python-orjson.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-orjson.spec b/python-orjson.spec index 6ed4589..f126e4f 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -24,6 +24,11 @@ BuildRequires: %{py3_dist pytest-forked} # 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 From 6616eda4c041d785e9d2c772a89ccb74c963c3db Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 31 Jul 2024 14:26:07 -0400 Subject: [PATCH 6/8] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 37 +++++++++++++++++++++++++++++++++++++ python-orjson.spec | 40 ++-------------------------------------- 2 files changed, 39 insertions(+), 38 deletions(-) create mode 100644 changelog 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 f126e4f..5e84e0e 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -9,7 +9,7 @@ Name: python-orjson Version: 3.9.15 -Release: 1%{?dist} +Release: %autorelease Summary: Fast, correct Python JSON library License: Apache-2.0 OR MIT @@ -105,40 +105,4 @@ export RUSTFLAGS='%{build_rustflags}' %changelog -* 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). +%autochangelog From 4dbb402b63de50e9c4bc490fdb0aa66f34bb23b8 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 15 Apr 2024 23:31:00 +0000 Subject: [PATCH 7/8] Update to 3.10.6. - Fixes rhbz#2291190, fixes rhbz#2278078, fixes rhbz#2264126. --- .gitignore | 1 + python-orjson.spec | 20 ++++++++++++++++---- sources | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) 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 From 8c023b31e4becf6cf05c5f97ff2ff4cc394f3ef1 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 9 Aug 2024 11:32:16 -0400 Subject: [PATCH 8/8] Update to 3.10.7 (close RHBZ#2303811) --- .gitignore | 1 + python-orjson.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9c3db56..72a1df7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /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/python-orjson.spec b/python-orjson.spec index a9f8d6a..ddddd97 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -8,7 +8,7 @@ %bcond tests 1 Name: python-orjson -Version: 3.10.6 +Version: 3.10.7 Release: %autorelease Summary: Fast, correct Python JSON library @@ -47,12 +47,14 @@ Summary: %{summary} # 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 OR BSL-1.0) AND BSL-1.0 AND - MIT + MIT AND + (Unlicense OR MIT) } diff --git a/sources b/sources index 76f47dc..ea98349 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orjson-3.10.6.tar.gz) = a3b6bfe4c9611ae62476490ccf9378135df2a714743df2252d247c8bf5724943d5717d2821d22305a854426e2be38cb9d40067aa892035414e8db5b26f1d90fb +SHA512 (orjson-3.10.7.tar.gz) = 3940b76039d6494626e69f9a2a0373779827c6686ab1321411f3b3a5056e0df227b68c9555796ce45f3952fe597c50740934d764f30dcf8bc1c84b2baf4b6631