diff --git a/.gitignore b/.gitignore index bba3f77..da47b5e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,3 @@ /pyMapVBVD-test-data.tar.zst /pymapvbvd-0.6.0.tar.gz /pymapvbvd-test-data.tar.zst -/pymapvbvd-0.6.1.tar.gz diff --git a/0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch b/0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch new file mode 100644 index 0000000..e2ecd93 --- /dev/null +++ b/0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch @@ -0,0 +1,26 @@ +From a9d7794e07a538bacc1fe2ff2887dbe6e2d0d95f Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Wed, 3 Jul 2024 11:52:05 -0400 +Subject: [PATCH] Downstream-only: do not pin the scipy version (and allow + 0.11.x) + +--- + requirements.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requirements.yml b/requirements.yml +index 8b8b674..007181f 100644 +--- a/requirements.yml ++++ b/requirements.yml +@@ -1,7 +1,7 @@ + dependencies: + - numpy>=1.26 + - tqdm +- - scipy==1.13.* ++ - scipy>=1.11.3 + - matplotlib + - h5py + - six +-- +2.45.2 + diff --git a/python-pymapvbvd.rpmlintrc b/python-pymapvbvd.rpmlintrc index bab460e..89c2d18 100644 --- a/python-pymapvbvd.rpmlintrc +++ b/python-pymapvbvd.rpmlintrc @@ -4,6 +4,6 @@ addFilter(r" spelling-error \('(dat|twix)',") # This source cannot be a URL because we must use a script to download its # contents from git-lfs. -addFilter(r" invalid-url Source[0-9]+: pymapvbvd-test-data\.tar\.zst$") +addFilter(r" invalid-url Source[0-9]+: pyMapVBVD-test-data\.tar\.zst$") # Bogus; it is a perfectly fine zstandard file. -addFilter(r" inconsistent-file-extension pymapvbvd-test-data\.tar\.zst$") +addFilter(r" inconsistent-file-extension pyMapVBVD-test-data\.tar\.zst$") diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec index fbb7b36..702ea93 100644 --- a/python-pymapvbvd.spec +++ b/python-pymapvbvd.spec @@ -1,5 +1,5 @@ Name: python-pymapvbvd -Version: 0.6.1 +Version: 0.6.0 Release: %autorelease Summary: Python twix file reader @@ -14,15 +14,16 @@ Source0: %{pypi_source pymapvbvd} Source1: pymapvbvd-test-data.tar.zst Source2: get_test_data.sh -BuildSystem: pyproject -BuildOption(generate_buildrequires): -x tests -BuildOption(install): -l mapvbvd +# Downstream-only: do not pin the scipy version (and allow 0.11.x) +Patch: 0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch BuildArch: noarch # PyMapVBVD assumes the platform is little-endian # https://bugzilla.redhat.com/show_bug.cgi?id=2225518 ExcludeArch: s390x +BuildRequires: python3-devel + %global common_description %{expand: Python port of the Matlab mapVBVD tool for reading Siemens raw data 'twix' (.dat) files.} @@ -51,15 +52,22 @@ Summary: %{summary} rm -v versioneer.py -%generate_buildrequires -p +%generate_buildrequires export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' +%pyproject_buildrequires -x tests -%build -p +%build export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' +%pyproject_wheel -%check -a +%install +%pyproject_install +%pyproject_save_files -l mapvbvd + + +%check %pytest -v diff --git a/sources b/sources index 8624192..67de59d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pymapvbvd-0.6.1.tar.gz) = b1c12e8f4c261522858feea9c66b5c174b37203a73a54aac8e2bbfb3ab7b1933ba44c9c172aa9cf7a97dba0c4554d99042c042fef9b42f73e912f747ceac1d55 +SHA512 (pymapvbvd-0.6.0.tar.gz) = 59a6776858535d245dfdbee1037b41eccf74d7a68fb926ea6181fc14de9a31f3d46cb6aeaba10eb1b7a3b32ea2bdd9cf88243830eb1579edee6511e6260b8525 SHA512 (pymapvbvd-test-data.tar.zst) = 638be0a8ad0e0876b13948d657bcf921e18938e964215c0c61b9deb6eb5f3abee449a0391238e8e60ffef55c4ca3b9c2906f4c4fd3655e23eed3567279e72323