diff --git a/.gitignore b/.gitignore index 72e11ac..a7a581a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ /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 2434432..cb1b1c2 100644 --- a/python-cramjam.spec +++ b/python-cramjam.spec @@ -4,7 +4,7 @@ #global snapdate YYYYMMDD Name: python-cramjam -Version: 2.10.0 +Version: 2.11.0 Release: %autorelease Summary: Thin Python bindings to de/compression algorithms in Rust @@ -33,7 +33,9 @@ Source1: get_source %endif -BuildRequires: python3-devel +BuildSystem: pyproject +BuildOption(install): -l cramjam + BuildRequires: tomcli >= 0.8.0 BuildRequires: cargo-rpm-macros >= 24 @@ -42,7 +44,6 @@ 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 @@ -56,7 +57,6 @@ 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,9 +74,7 @@ License: %{shrink: %description -n python3-cramjam %{common_description} -%prep -%autosetup -n cramjam-%{srcversion} - +%prep -a # 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. @@ -121,26 +119,17 @@ done %cargo_prep -%generate_buildrequires -%pyproject_buildrequires +%generate_buildrequires -a %cargo_generate_buildrequires -%build +%build -p %cargo_license_summary %{cargo_license} > LICENSES.dependencies -%pyproject_wheel -%install -%pyproject_install -%pyproject_save_files -l cramjam - - -%check -%pyproject_check_import +%check -a %if %{with tests} -%if %{undefined el10} # Test failures in test_variants_decompress_into with recent hypothesis # versions: https://github.com/milesgranger/cramjam/issues/201 # @@ -150,14 +139,13 @@ 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 -n auto +%pytest -k "${k-}" --ignore=benchmarks/test_bench.py -v %endif diff --git a/sources b/sources index d44109e..9b98da9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cramjam-2.10.0.tar.gz) = 0c44643844c6278160d9e2efa3005da265e464edb1d3dd670cadc3effaa744c21c772c0bfeac1ceec6e5f7e8a9a02440d79e5080c432e4dcb73984e613281ad2 +SHA512 (cramjam-2.11.0.tar.gz) = d92446c0c0ef885f3544783caa1f179fd50b6a6290ada011495b7385411527f75a2544c0c8cdc36910c83c879dbac7dd130f4fe8f3dc3b885a84a45286cb3695