Update to 3.10.14 (close RHBZ#2336424)

This commit is contained in:
Benjamin A. Beasley 2025-01-09 14:13:26 -05:00
commit e0e16f61a9
4 changed files with 7 additions and 45 deletions

1
.gitignore vendored
View file

@ -16,3 +16,4 @@
/orjson-3.10.11.tar.gz
/orjson-3.10.12.tar.gz
/orjson-3.10.13.tar.gz
/orjson-3.10.14.tar.gz

View file

@ -1,12 +0,0 @@
diff -Naur orjson-3.10.13-original/pyproject.toml orjson-3.10.13/pyproject.toml
--- orjson-3.10.13-original/pyproject.toml 2024-12-29 18:05:45.000000000 -0500
+++ orjson-3.10.13/pyproject.toml 2024-12-30 08:39:38.935289119 -0500
@@ -31,7 +31,7 @@
[build-system]
build-backend = "maturin"
-requires = ["maturin==1.7.8"]
+requires = ["maturin>=1,<2"]
[tool.maturin]
python-source = "pysrc"

View file

@ -8,7 +8,7 @@
%bcond tests 1
Name: python-orjson
Version: 3.10.13
Version: 3.10.14
Release: %autorelease
Summary: Fast, correct Python JSON library
@ -16,31 +16,6 @@ License: Apache-2.0 OR MIT
URL: https://github.com/ijl/orjson
Source: %{pypi_source orjson}
# To fix compatibility with maturin 1.8.0 and later *in the GitHub source
# archive*, we would need:
#
# pyproject.toml: Specify version metadata as dynamic
# https://github.com/ijl/orjson/pull/542
#
# Fixes:
#
# Build error with maturin 1.8.0
# https://github.com/ijl/orjson/issues/541
#
# See also:
#
# https://github.com/PyO3/maturin/issues/2390
#
# Upstream rejected this PR and decided to pin an old version of maturin
# instead, but we cannot respect this; we must use the system version. As long
# as we are using the *PyPI sdist* as our source, pyproject.toml has a static
# version field, and we dont need to patch in the rejected PR. However, we
# must still unpin maturin via a partial revert just the part that matters to
# us, in pyproject.toml of:
#
# https://github.com/ijl/orjson/commit/9a4ef46991ad205b9a92cb6fdcb123c7ff72b640
Patch: orjson-3.10.13-unpin-maturin.patch
BuildRequires: tomcli
BuildRequires: python3-devel
BuildRequires: %{py3_dist pytest-forked}
@ -90,12 +65,10 @@ License: %{shrink:
# “You are welcome to work to upstream the diff if you find the vendoring
# unsuitable for your organization's own preferences.”
#
# Note that the vendored crates are actually *forked* from a snapshot,
# https://github.com/PyO3/pyo3/commit/dc415fae9f5eaa8ac0f6d0ea769b9ab28860898f;
# see https://github.com/ijl/orjson/issues/524#issuecomment-2424170405 for
# details.
Provides: bundled(crate(pyo3-build-config)) = 0.23.0~dev^20241018gitdc415fa
Provides: bundled(crate(pyo3-ffi)) = 0.23.0~dev^20241018gitdc415fa
# Note that these crates are actually forked, not only bundled/vendored; see
# https://github.com/ijl/orjson/issues/524#issuecomment-2424170405 for details.
Provides: bundled(crate(pyo3-build-config)) = 0.23.3
Provides: bundled(crate(pyo3-ffi)) = 0.23.3
%description -n python3-orjson %{_description}

View file

@ -1 +1 @@
SHA512 (orjson-3.10.13.tar.gz) = 84ee3a42654e5576190dd115483db1e3a9a151b22de79b99b497c2e181adbd5e33a4aa77bb5f72394e0947887e657c5dc6380e852dddb4a5e95b47e72486b18c
SHA512 (orjson-3.10.14.tar.gz) = d186e95ac6750af9f2688744fe663e63973e06942fcbfc10deadc1d63a5ad59f437ea4e2485d1866bde6abcd59086fa5c1a0794d3ba975e693995d3ca58f0f76