diff --git a/.gitignore b/.gitignore index a7a581a..72e11ac 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,3 @@ /cramjam-cdc7d307d0f592f89b3319a7037fd875a5371ef3-filtered.tar.gz /cramjam-2.10.0rc1.tar.gz /cramjam-2.10.0.tar.gz -/cramjam-2.11.0rc2.tar.gz -/cramjam-2.11.0rc3.tar.gz -/cramjam-2.11.0.tar.gz diff --git a/python-cramjam.spec b/python-cramjam.spec index cb1b1c2..b734390 100644 --- a/python-cramjam.spec +++ b/python-cramjam.spec @@ -4,7 +4,7 @@ #global snapdate YYYYMMDD Name: python-cramjam -Version: 2.11.0 +Version: 2.10.0 Release: %autorelease Summary: Thin Python bindings to de/compression algorithms in Rust @@ -33,9 +33,7 @@ Source1: get_source %endif -BuildSystem: pyproject -BuildOption(install): -l cramjam - +BuildRequires: python3-devel BuildRequires: tomcli >= 0.8.0 BuildRequires: cargo-rpm-macros >= 24 @@ -44,6 +42,7 @@ BuildRequires: cargo-rpm-macros >= 24 # dev extra in pyproject.toml. BuildRequires: %{py3_dist numpy} BuildRequires: %{py3_dist pytest} +BuildRequires: %{py3_dist pytest-xdist} BuildRequires: %{py3_dist hypothesis} %endif @@ -57,6 +56,7 @@ BuildRequires: %{py3_dist hypothesis} Summary: %{summary} # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 +# Apache-2.0 OR MIT # BSD-3-Clause # BSD-3-Clause AND MIT # MIT @@ -74,7 +74,9 @@ License: %{shrink: %description -n python3-cramjam %{common_description} -%prep -a +%prep +%autosetup -n cramjam-%{srcversion} + # Downstream-only: patch out the generate-import-lib feature, which is only # relevant on Windows, and which depends on the corresponding pyo3 feature – # which is not packaged for that reason. @@ -116,20 +118,33 @@ do fi done +# EPEL10.0: SemVer-incompatible PyO3 0.24 blocked by policy, so use 0.23. +tomcli set Cargo.toml str dependencies.pyo3.version '^0.23' +tomcli set Cargo.toml str build-dependencies.pyo3-build-config '^0.23' + %cargo_prep -%generate_buildrequires -a +%generate_buildrequires +%pyproject_buildrequires %cargo_generate_buildrequires -%build -p +%build %cargo_license_summary %{cargo_license} > LICENSES.dependencies +%pyproject_wheel -%check -a +%install +%pyproject_install +%pyproject_save_files -l cramjam + + +%check +%pyproject_check_import %if %{with tests} +%if %{undefined el10} # Test failures in test_variants_decompress_into with recent hypothesis # versions: https://github.com/milesgranger/cramjam/issues/201 # @@ -139,13 +154,14 @@ done # not reason to believe that the package has *new* problems. It *might* have # newly *revealed* problems. This merits further investigation. k="${k-}${k+ and }not test_variants_decompress_into" +%endif # Regression with miniz_oxide>0.8.5 # https://github.com/milesgranger/cramjam/issues/211 # Failed: DID NOT RAISE k="${k-}${k+ and }not test_variants_raise_exception[deflate]" -%pytest -k "${k-}" --ignore=benchmarks/test_bench.py -v +%pytest -k "${k-}" --ignore=benchmarks/test_bench.py -v -n auto %endif diff --git a/sources b/sources index 9b98da9..d44109e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cramjam-2.11.0.tar.gz) = d92446c0c0ef885f3544783caa1f179fd50b6a6290ada011495b7385411527f75a2544c0c8cdc36910c83c879dbac7dd130f4fe8f3dc3b885a84a45286cb3695 +SHA512 (cramjam-2.10.0.tar.gz) = 0c44643844c6278160d9e2efa3005da265e464edb1d3dd670cadc3effaa744c21c772c0bfeac1ceec6e5f7e8a9a02440d79e5080c432e4dcb73984e613281ad2