From d965b583143080562d3fe4a1b2a543c12b3c7e83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 14:36:00 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 07249b40ddbc4d561a5ebfddbc0f71a9b7b8e03a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 31 Oct 2024 14:27:26 -0400 Subject: [PATCH 2/8] Update to 0.6.1 (close RHBZ#2322960) --- .gitignore | 1 + ...do-not-pin-the-scipy-version-and-all.patch | 26 ------------------- python-pymapvbvd.spec | 5 +--- sources | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch diff --git a/.gitignore b/.gitignore index da47b5e..bba3f77 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /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 deleted file mode 100644 index e2ecd93..0000000 --- a/0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch +++ /dev/null @@ -1,26 +0,0 @@ -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.spec b/python-pymapvbvd.spec index 702ea93..50f756e 100644 --- a/python-pymapvbvd.spec +++ b/python-pymapvbvd.spec @@ -1,5 +1,5 @@ Name: python-pymapvbvd -Version: 0.6.0 +Version: 0.6.1 Release: %autorelease Summary: Python twix file reader @@ -14,9 +14,6 @@ Source0: %{pypi_source pymapvbvd} Source1: pymapvbvd-test-data.tar.zst Source2: get_test_data.sh -# 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 diff --git a/sources b/sources index 67de59d..8624192 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pymapvbvd-0.6.0.tar.gz) = 59a6776858535d245dfdbee1037b41eccf74d7a68fb926ea6181fc14de9a31f3d46cb6aeaba10eb1b7a3b32ea2bdd9cf88243830eb1579edee6511e6260b8525 +SHA512 (pymapvbvd-0.6.1.tar.gz) = b1c12e8f4c261522858feea9c66b5c174b37203a73a54aac8e2bbfb3ab7b1933ba44c9c172aa9cf7a97dba0c4554d99042c042fef9b42f73e912f747ceac1d55 SHA512 (pymapvbvd-test-data.tar.zst) = 638be0a8ad0e0876b13948d657bcf921e18938e964215c0c61b9deb6eb5f3abee449a0391238e8e60ffef55c4ca3b9c2906f4c4fd3655e23eed3567279e72323 From 10664e9197249e6c11c44f3cb729e86f6fed9772 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 17:53:48 +0000 Subject: [PATCH 3/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a7154955f9c96883e2ac0cc3fe65191c70a896fd Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 6 May 2025 14:53:52 -0400 Subject: [PATCH 4/8] F41+: Use the provisional pyproject declarative buildsystem --- python-pymapvbvd.rpmlintrc | 4 ++-- python-pymapvbvd.spec | 19 +++++++------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/python-pymapvbvd.rpmlintrc b/python-pymapvbvd.rpmlintrc index 89c2d18..bab460e 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 50f756e..fbb7b36 100644 --- a/python-pymapvbvd.spec +++ b/python-pymapvbvd.spec @@ -14,13 +14,15 @@ 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 + 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.} @@ -49,22 +51,15 @@ Summary: %{summary} rm -v versioneer.py -%generate_buildrequires +%generate_buildrequires -p export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' -%pyproject_buildrequires -x tests -%build +%build -p export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' -%pyproject_wheel -%install -%pyproject_install -%pyproject_save_files -l mapvbvd - - -%check +%check -a %pytest -v From 9d25fc900d994a1565675be09fd9bfcbe26d342d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 21:16:17 +0200 Subject: [PATCH 5/8] Rebuilt for Python 3.14 From b7c76663215923ea9baa69496ce8475357836bcb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 09:41:20 +0000 Subject: [PATCH 6/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 9057ef303eb34630082ae88fa31ea556570731d8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 14:32:07 +0200 Subject: [PATCH 7/8] Rebuilt for Python 3.14.0rc2 bytecode From f78cfa9db250afcb5dd043bcc85460a1b0ae8111 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:07:14 +0200 Subject: [PATCH 8/8] Rebuilt for Python 3.14.0rc3 bytecode