diff --git a/.gitignore b/.gitignore index 9fe6224..edc287e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /orjson-3.10.10.tar.gz /orjson-3.10.11.tar.gz /orjson-3.10.12.tar.gz +/orjson-3.10.13.tar.gz diff --git a/orjson-3.10.13-unpin-maturin.patch b/orjson-3.10.13-unpin-maturin.patch new file mode 100644 index 0000000..4de1017 --- /dev/null +++ b/orjson-3.10.13-unpin-maturin.patch @@ -0,0 +1,12 @@ +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" diff --git a/python-orjson.spec b/python-orjson.spec index 4af3e8a..85d4f16 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -8,7 +8,7 @@ %bcond tests 1 Name: python-orjson -Version: 3.10.12 +Version: 3.10.13 Release: %autorelease Summary: Fast, correct Python JSON library @@ -16,6 +16,31 @@ 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 don’t 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} diff --git a/sources b/sources index 6bdca07..e15eaa8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orjson-3.10.12.tar.gz) = 089420645ef4a54674436ebc4f49ba67fda4fff716c949e03a4af402fdd817decd066c508b18c19ac24b634e7173b37924ac1c2180679a92551884957d4b11ae +SHA512 (orjson-3.10.13.tar.gz) = 84ee3a42654e5576190dd115483db1e3a9a151b22de79b99b497c2e181adbd5e33a4aa77bb5f72394e0947887e657c5dc6380e852dddb4a5e95b47e72486b18c