Compare commits
No commits in common. "rawhide" and "f40" have entirely different histories.
2 changed files with 21 additions and 57 deletions
|
|
@ -1,34 +0,0 @@
|
||||||
From b550f88e64c01194029a50b92d94955c39bf169f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sandro <devel@penguinpee.nl>
|
|
||||||
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
|
|
||||||
|
|
||||||
|
|
@ -1,16 +1,5 @@
|
||||||
%global forgeurl https://github.com/G-node/nixpy
|
%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
|
Name: python-nixio
|
||||||
Version: 1.5.4
|
Version: 1.5.4
|
||||||
Release: %autorelease
|
Release: %autorelease
|
||||||
|
|
@ -38,27 +27,36 @@ Source1: info.json
|
||||||
# * Script used to obtain Source0: ./get_source %%{version}
|
# * Script used to obtain Source0: ./get_source %%{version}
|
||||||
Source2: get_source
|
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
|
BuildArch: noarch
|
||||||
# No need for nix, they're uncoupling it from the C++
|
# No need for nix, they're uncoupling it from the C++
|
||||||
# https://github.com/G-Node/nixpy/pull/276
|
# 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
|
||||||
|
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
|
||||||
|
|
||||||
%description %{desc}
|
The current implementations store the actual data using the HDF5 file format as
|
||||||
|
a storage backend.
|
||||||
|
|
||||||
%package -n python3-nixio
|
%package -n python3-nixio
|
||||||
Summary: %{summary}
|
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 %{desc}
|
%description -n python3-nixio
|
||||||
|
%{description}
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n nixpy-%{version} -p1
|
%autosetup -n nixpy-%{version}
|
||||||
|
|
||||||
# it sets examples_path based on the name of the cwd
|
# it sets examples_path based on the name of the cwd
|
||||||
sed -i "s/nixpy/nixpy-%{version}/" nixio/test/test_doc_examples.py
|
sed -i "s/nixpy/nixpy-%{version}/" nixio/test/test_doc_examples.py
|
||||||
|
|
@ -66,14 +64,14 @@ sed -i "s/nixpy/nixpy-%{version}/" nixio/test/test_doc_examples.py
|
||||||
cp %{SOURCE1} nixio/info.json -v -p
|
cp %{SOURCE1} nixio/info.json -v -p
|
||||||
|
|
||||||
%generate_buildrequires
|
%generate_buildrequires
|
||||||
%pyproject_buildrequires -x test
|
%pyproject_buildrequires
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%pyproject_wheel
|
%pyproject_wheel
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%pyproject_install
|
%pyproject_install
|
||||||
%pyproject_save_files -l nixio
|
%pyproject_save_files nixio
|
||||||
|
|
||||||
%check
|
%check
|
||||||
# These require the removed lenna.png sample file:
|
# These require the removed lenna.png sample file:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue