From 0de39b50f4c0462a789b96e221c609016d2ccc4c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 20 Feb 2025 10:49:51 -0500 Subject: [PATCH 1/6] Remove deprecated pytest-runner dependency - Since the patch offered upstream introduces a "test" extra, use it - Assert that .dist-info contains a license file --- ...-deprecated-pytest-runner-dependency.patch | 34 +++++++++++++++++++ python-nixio.spec | 21 ++++++------ 2 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 0001-Remove-deprecated-pytest-runner-dependency.patch diff --git a/0001-Remove-deprecated-pytest-runner-dependency.patch b/0001-Remove-deprecated-pytest-runner-dependency.patch new file mode 100644 index 0000000..850805a --- /dev/null +++ b/0001-Remove-deprecated-pytest-runner-dependency.patch @@ -0,0 +1,34 @@ +From b550f88e64c01194029a50b92d94955c39bf169f Mon Sep 17 00:00:00 2001 +From: Sandro +Date: Tue, 24 Dec 2024 09:08:28 +0100 +Subject: [PATCH] Remove deprecated pytest-runner dependency + +The `pytest-runner` project has been deprecated since 2019 and has been +archived on git hub in December 2024. + +This removes the dependency on the deprecated package and also removes +deprecated keywords from `setup.py` related to it. +--- + setup.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 16379a5..be594d5 100644 +--- a/setup.py ++++ b/setup.py +@@ -75,9 +75,9 @@ setup( + packages=packages, + scripts=[], + python_requires=">=3.6", +- tests_require=['pytest', 'scipy', 'pillow', 'matplotlib'], +- test_suite='pytest', +- setup_requires=['pytest-runner'], ++ extras_require={ ++ "test": ['pytest', 'scipy', 'pillow', 'matplotlib'], ++ }, + install_requires=['numpy', 'h5py', 'six', 'enum34;python_version<"3.4"'], + package_data={'nixio': [license_text, description_text]}, + include_package_data=True, +-- +2.48.1 + diff --git a/python-nixio.spec b/python-nixio.spec index 44a2e76..9a0cc6d 100644 --- a/python-nixio.spec +++ b/python-nixio.spec @@ -27,10 +27,18 @@ Source1: info.json # * Script used to obtain Source0: ./get_source %%{version} Source2: get_source +# Remove deprecated pytest-runner dependency +# https://github.com/G-Node/nixpy/pull/547 +# Rebased on 1.5.4, without changes to GitHub CI configuration +# https://fedoraproject.org/wiki/Changes/DeprecatePythonPytestRunner +Patch: 0001-Remove-deprecated-pytest-runner-dependency.patch + BuildArch: noarch # No need for nix, they're uncoupling it from the C++ # https://github.com/G-Node/nixpy/pull/276 +BuildRequires: python3-devel + %description The NIX project started as an initiative within the Electrophysiology Task Force a part of the INCF Data sharing Program. The NIX data model allows to @@ -44,19 +52,12 @@ a storage backend. %package -n python3-nixio Summary: %{summary} -BuildRequires: python3-devel -# use tests_require which is deprecated -BuildRequires: %{py3_dist pytest} -BuildRequires: %{py3_dist pytest-runner} -BuildRequires: %{py3_dist scipy} -BuildRequires: %{py3_dist pillow} -BuildRequires: %{py3_dist matplotlib} %description -n python3-nixio %{description} %prep -%autosetup -n nixpy-%{version} +%autosetup -n nixpy-%{version} -p1 # it sets examples_path based on the name of the cwd sed -i "s/nixpy/nixpy-%{version}/" nixio/test/test_doc_examples.py @@ -64,14 +65,14 @@ sed -i "s/nixpy/nixpy-%{version}/" nixio/test/test_doc_examples.py cp %{SOURCE1} nixio/info.json -v -p %generate_buildrequires -%pyproject_buildrequires +%pyproject_buildrequires -x test %build %pyproject_wheel %install %pyproject_install -%pyproject_save_files nixio +%pyproject_save_files -l nixio %check # These require the removed lenna.png sample file: From 8710162d43cb5f80d9e2584ec945d1b54c2765a1 Mon Sep 17 00:00:00 2001 From: Tim Landscheidt Date: Wed, 26 Mar 2025 10:09:03 +0000 Subject: [PATCH 2/6] Fix package description for python3-nixio --- python-nixio.spec | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/python-nixio.spec b/python-nixio.spec index 9a0cc6d..812eabb 100644 --- a/python-nixio.spec +++ b/python-nixio.spec @@ -1,5 +1,16 @@ %global forgeurl https://github.com/G-node/nixpy +%global desc \ +The NIX project started as an initiative within the Electrophysiology Task \ +Force a part of the INCF Data sharing Program. The NIX data model allows to \ +store fully annotated scientific data-set, i.e. the data together with its \ +metadata within the same container. Our aim is to achieve standardization by \ +providing a common/generic data structure for a multitude of data types. See \ +the wiki for more information \ + \ +The current implementations store the actual data using the HDF5 file format as \ +a storage backend. + Name: python-nixio Version: 1.5.4 Release: %autorelease @@ -39,22 +50,12 @@ BuildArch: noarch BuildRequires: python3-devel -%description -The NIX project started as an initiative within the Electrophysiology Task -Force a part of the INCF Data sharing Program. The NIX data model allows to -store fully annotated scientific data-set, i.e. the data together with its -metadata within the same container. Our aim is to achieve standardization by -providing a common/generic data structure for a multitude of data types. See -the wiki for more information - -The current implementations store the actual data using the HDF5 file format as -a storage backend. +%description %{desc} %package -n python3-nixio Summary: %{summary} -%description -n python3-nixio -%{description} +%description -n python3-nixio %{desc} %prep %autosetup -n nixpy-%{version} -p1 From 285c473c5738f86921cb927d6e84657d966746c8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 21:15:55 +0200 Subject: [PATCH 3/6] Rebuilt for Python 3.14 From 2af42a40dfa5aa388f67b6bb20972f69c9d16d7a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 09:04:04 +0000 Subject: [PATCH 4/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 81ba8fa429ceb7bf67cb7e7280cedfd1f365bb28 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 14:14:13 +0200 Subject: [PATCH 5/6] Rebuilt for Python 3.14.0rc2 bytecode From ec936fdcf96887e3b8b56a3b95f9e1fb1bee53a1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 13:50:14 +0200 Subject: [PATCH 6/6] Rebuilt for Python 3.14.0rc3 bytecode