diff --git a/.gitignore b/.gitignore index 12f6815..da47b5e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /pyMapVBVD-0.5.6.tar.gz /pyMapVBVD-0.5.7.tar.gz /pyMapVBVD-test-data.tar.zst +/pymapvbvd-0.6.0.tar.gz +/pymapvbvd-test-data.tar.zst 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/get_test_data.sh b/get_test_data.sh index b732e29..395006a 100755 --- a/get_test_data.sh +++ b/get_test_data.sh @@ -11,13 +11,13 @@ Usage: $1 VERSION Generate a source archive containing the test data files for pyMapVBVD that are tracked in git LFS and are not included in the default source archive. The -result will be named pyMapVBVD-test-data.tar.zst and will be written +result will be named pymapvbvd-test-data.tar.zst and will be written into the current working directory. The script attempts to produce a reproducible archive to avoid uploading near-duplicate archives to the lookaside cache when the test data does not change from one version to the next. Accordingly, the top-level directory -pyMapVBVD-\${VERSION}/ is omitted from the archived paths. +pymapvbvd-\${VERSION}/ is omitted from the archived paths. EOF } @@ -45,8 +45,8 @@ GITDIR="$(echo "${FORGEURL}" | sed -r 's@.*/@@')" #SOURCE0="${FORGEURL}/archive/${VERSION}/pdfminer.six-${VERSION}.tar.gz" #TARNAME="$(basename "${SOURCE0}")" -TARDIR="pyMapVBVD-${VERSION}" -NEWTAR='pyMapVBVD-test-data.tar.zst' +TARDIR="pymapvbvd-${VERSION}" +NEWTAR='pymapvbvd-test-data.tar.zst' SAVEDIR="${PWD}" XDIR="$(mktemp -d)" diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec index d88cbc7..702ea93 100644 --- a/python-pymapvbvd.spec +++ b/python-pymapvbvd.spec @@ -1,5 +1,5 @@ Name: python-pymapvbvd -Version: 0.5.7 +Version: 0.6.0 Release: %autorelease Summary: Python twix file reader @@ -9,11 +9,14 @@ Summary: Python twix file reader # also versioneer.py (which is removed in %%prep) License: MIT AND Unlicense URL: https://github.com/wtclarke/pymapvbvd -Source0: %{pypi_source pyMapVBVD} +Source0: %{pypi_source pymapvbvd} # Generated with Source2: ./get_test_data.sh %%{version} -Source1: pyMapVBVD-test-data.tar.zst +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 @@ -42,8 +45,8 @@ Summary: %{summary} %prep -%autosetup -n pyMapVBVD-%{version} -p1 -%setup -q -T -D -a 1 -c -n pyMapVBVD-%{version} +%autosetup -n pymapvbvd-%{version} -p1 +%setup -q -T -D -a 1 -c -n pymapvbvd-%{version} # We can use the system versioneer to generate _version.py, and can remove the # bundled, amaglamated versioneer.py to indicate we aren’t using it. rm -v versioneer.py diff --git a/sources b/sources index 0935064..67de59d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pyMapVBVD-0.5.7.tar.gz) = 0efd2d12ec48ae7f825095edf440d14064cf0f1690ab7dee63f247a923d359f633d057086a1d3defd2bd1606dbba0d1fabe2f6360f3658d04c78f347b61771ce -SHA512 (pyMapVBVD-test-data.tar.zst) = 1b8106a2f0cde214eb545e09803ec042e7b40c93d9fbfcbe4d2b189b8d7146dc3ba4e63b53f9084bbee289e0bdcdd4f570453642b5553da9d70bdcdaf2ecd426 +SHA512 (pymapvbvd-0.6.0.tar.gz) = 59a6776858535d245dfdbee1037b41eccf74d7a68fb926ea6181fc14de9a31f3d46cb6aeaba10eb1b7a3b32ea2bdd9cf88243830eb1579edee6511e6260b8525 +SHA512 (pymapvbvd-test-data.tar.zst) = 638be0a8ad0e0876b13948d657bcf921e18938e964215c0c61b9deb6eb5f3abee449a0391238e8e60ffef55c4ca3b9c2906f4c4fd3655e23eed3567279e72323