From 714927b8966e483e3667ee842b7cb1db28964c5c Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 5 May 2023 12:28:57 -0500 Subject: [PATCH] Update to 3.8.11. Fixes rhbz#2193468. --- .gitignore | 1 + Remove-unstable-simd-feature.patch | 6 ++-- Use-setuptools-rust-instead-of-maturin.patch | 16 ++++----- ...dored-pyo3-build-config-and-pyo3-ffi.patch | 34 ------------------- python-orjson.spec | 7 ++-- sources | 2 +- 6 files changed, 16 insertions(+), 50 deletions(-) delete mode 100644 don-t-use-vendored-pyo3-build-config-and-pyo3-ffi.patch diff --git a/.gitignore b/.gitignore index bff7676..4a16d49 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /orjson-3.8.10.tar.gz +/orjson-3.8.11.tar.gz diff --git a/Remove-unstable-simd-feature.patch b/Remove-unstable-simd-feature.patch index 5c845c6..85f73e1 100644 --- a/Remove-unstable-simd-feature.patch +++ b/Remove-unstable-simd-feature.patch @@ -1,4 +1,4 @@ -From 9fdfb7e06d1f8c193c476a8bb7b12e3ba7952b51 Mon Sep 17 00:00:00 2001 +From e9f52399252765535db5ed946b00c9ce0be11964 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 25 Jan 2023 20:30:13 -0600 Subject: [PATCH] Remove unstable-simd feature @@ -9,7 +9,7 @@ This feature requires nightly Rust. 1 file changed, 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index 1822ce4..511acb0 100644 +index 8c7a50b..1a7a300 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,12 +32,6 @@ crate-type = ["cdylib"] @@ -26,5 +26,5 @@ index 1822ce4..511acb0 100644 # to build and on failure fall back to another backend. yyjson = [] -- -2.39.2 +2.40.1 diff --git a/Use-setuptools-rust-instead-of-maturin.patch b/Use-setuptools-rust-instead-of-maturin.patch index 41f6076..55c10e9 100644 --- a/Use-setuptools-rust-instead-of-maturin.patch +++ b/Use-setuptools-rust-instead-of-maturin.patch @@ -1,4 +1,4 @@ -From d464faa67a06b4277e315e2ea0c35c32f6832025 Mon Sep 17 00:00:00 2001 +From 9aa0036fa5c5bbcc346ab54b100ced22460d0672 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 25 Jan 2023 13:47:35 -0600 Subject: [PATCH] Use setuptools-rust instead of maturin @@ -9,9 +9,9 @@ This requires setutpools >= 61.0 which is available on F37+. The metadata in the [project] table can be translated to a setup.cfg or added to setup.py for greater compatibility. --- - pyproject.toml | 6 +++--- - setup.py | 11 +++++++++++ - 2 files changed, 14 insertions(+), 3 deletions(-) + pyproject.toml | 6 +++--- + setup.py | 9 +++++++++ + 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 setup.py diff --git a/pyproject.toml b/pyproject.toml @@ -39,12 +39,10 @@ index 8372fc8..9f07b95 100644 python-source = "pysrc" diff --git a/setup.py b/setup.py new file mode 100644 -index 0000000..98c881f +index 0000000..fb5a727 --- /dev/null +++ b/setup.py -@@ -0,0 +1,11 @@ -+import sys -+ +@@ -0,0 +1,9 @@ +from setuptools import setup +from setuptools_rust import RustExtension, Binding + @@ -55,5 +53,5 @@ index 0000000..98c881f + package_dir={"": "pysrc"}, +) -- -2.39.2 +2.40.1 diff --git a/don-t-use-vendored-pyo3-build-config-and-pyo3-ffi.patch b/don-t-use-vendored-pyo3-build-config-and-pyo3-ffi.patch deleted file mode 100644 index 57837a9..0000000 --- a/don-t-use-vendored-pyo3-build-config-and-pyo3-ffi.patch +++ /dev/null @@ -1,34 +0,0 @@ -From be3e97b9899bd8d37ffc664ab8c7d876c0a2ac2e Mon Sep 17 00:00:00 2001 -From: Maxwell G -Date: Wed, 12 Apr 2023 14:53:32 +0000 -Subject: [PATCH] don't use vendored pyo3-build-config and pyo3-ffi - ---- - Cargo.toml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Cargo.toml b/Cargo.toml -index 511acb0..db08a4e 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -48,7 +48,7 @@ encoding_rs = { version = "0.8", default_features = false } - itoa = { version = "1", default_features = false } - itoap = { version = "1", features = ["std", "simd"] } - once_cell = { version = "1", default_features = false, features = ["race"] } --pyo3-ffi = { path = "local_dependencies/pyo3-ffi", default_features = false, features = ["extension-module"]} -+pyo3-ffi = { version="0.18.2", default_features = false, features = ["extension-module"] } - ryu = { version = "1", default_features = false } - serde = { version = "1", default_features = false } - serde_json = { version = "1", default_features = false, features = ["std", "float_roundtrip"] } -@@ -57,7 +57,7 @@ smallvec = { version = "^1.10", default_features = false, features = ["union", " - - [build-dependencies] - cc = { version = "1" } --pyo3-build-config = { path = "local_dependencies/pyo3-build-config" } -+pyo3-build-config = { version = "0.18.2" } - version_check = { version = "0.9" } - - [profile.release] --- -2.39.2 - diff --git a/python-orjson.spec b/python-orjson.spec index 23490ec..1a0d821 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -6,7 +6,7 @@ %bcond tests 1 Name: python-orjson -Version: 3.8.10 +Version: 3.8.11 Release: 1%{?dist} Summary: Fast, correct Python JSON library @@ -17,8 +17,6 @@ Source: %{pypi_source orjson} Patch: Use-setuptools-rust-instead-of-maturin.patch # Ineligble for upstreaming Patch: Remove-unstable-simd-feature.patch -# https://github.com/ijl/orjson/issues/373 -Patch: don-t-use-vendored-pyo3-build-config-and-pyo3-ffi.patch BuildRequires: python3-devel BuildRequires: rust-packaging @@ -117,5 +115,8 @@ export RUSTFLAGS='%{build_rustflags}' %changelog +* 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/sources b/sources index 771f779..5edad3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orjson-3.8.10.tar.gz) = 68828e9b4dc2c8e2c8675ece61e366e38f027a7eb3058d0ed1f3a65916964ae67bbb11fcea3414c330841b79208fe52b2c18263493f09092c50d73ac0b549720 +SHA512 (orjson-3.8.11.tar.gz) = a6e898ab83abe45f1f285343985c7e638579cfefd5c453ac184a54d02b44f1ea7ab13ca5a3a20ac149e3b93da6a194e963dd816006c49c21abcf8aad9cfb13cf