commit: 0816f5a2b5a64c71ed56bed9f9bfbb29b5d5dd12
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Dec 30 17:50:14 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 08:50:15 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=0816f5a2
dev-python/pynwb: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-python/pynwb/files/pynwb-2.0.0-versions.patch | 21 ---------
dev-python/pynwb/files/pynwb-2.1.0-versions.patch | 21 ---------
dev-python/pynwb/files/pynwb-2.2.0-versions.patch | 21 ---------
.../pynwb/files/pynwb-2.3.1-pkg_resources.patch | 54 ----------------------
dev-python/pynwb/files/pynwb-2.3.1-typing.patch | 13 ------
5 files changed, 130 deletions(-)
diff --git a/dev-python/pynwb/files/pynwb-2.0.0-versions.patch
b/dev-python/pynwb/files/pynwb-2.0.0-versions.patch
deleted file mode 100644
index d09c50594..000000000
--- a/dev-python/pynwb/files/pynwb-2.0.0-versions.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/tmp/setup.py
-index 39e75824..f7948f64 100755
---- a/setup.py
-+++ b/setup.py
-@@ -19,11 +19,11 @@ print('found these packages:', pkgs)
- schema_dir = 'nwb-schema/core'
-
- reqs = [
-- 'h5py>=2.9,<4',
-- 'hdmf>=3.1.1,<4',
-- 'numpy>=1.16,<1.22',
-- 'pandas>=1.0.5,<2',
-- 'python-dateutil>=2.7,<3',
-+ 'h5py',
-+ 'hdmf',
-+ 'numpy',
-+ 'pandas',
-+ 'python-dateutil',
- 'setuptools'
- ]
-
diff --git a/dev-python/pynwb/files/pynwb-2.1.0-versions.patch
b/dev-python/pynwb/files/pynwb-2.1.0-versions.patch
deleted file mode 100644
index 8c816d226..000000000
--- a/dev-python/pynwb/files/pynwb-2.1.0-versions.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/tmp/setup.py
-index 39e75824..f7948f64 100755
---- a/setup.py
-+++ b/setup.py
-@@ -19,11 +19,11 @@ print('found these packages:', pkgs)
- schema_dir = 'nwb-schema/core'
-
- reqs = [
-- 'h5py>=2.10,<4',
-- 'hdmf>=3.3.2,<4',
-- 'numpy>=1.16,<1.23',
-- 'pandas>=1.0.5,<2',
-- 'python-dateutil>=2.7,<3',
-+ 'h5py',
-+ 'hdmf',
-+ 'numpy',
-+ 'pandas',
-+ 'python-dateutil',
- 'setuptools'
- ]
-
diff --git a/dev-python/pynwb/files/pynwb-2.2.0-versions.patch
b/dev-python/pynwb/files/pynwb-2.2.0-versions.patch
deleted file mode 100644
index 6141f629a..000000000
--- a/dev-python/pynwb/files/pynwb-2.2.0-versions.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/tmp/setup.py
-index 39e75824..f7948f64 100755
---- a/setup.py
-+++ b/setup.py
-@@ -19,11 +19,11 @@ print('found these packages:', pkgs)
- schema_dir = 'nwb-schema/core'
-
- reqs = [
-- 'h5py>=2.10,<4',
-- 'hdmf>=3.4.2,<4',
-- 'numpy>=1.16,<1.24',
-- 'pandas>=1.1.5,<2',
-- 'python-dateutil>=2.7.3,<3',
-+ 'h5py',
-+ 'hdmf',
-+ 'numpy',
-+ 'pandas',
-+ 'python-dateutil',
- 'setuptools'
- ]
-
diff --git a/dev-python/pynwb/files/pynwb-2.3.1-pkg_resources.patch
b/dev-python/pynwb/files/pynwb-2.3.1-pkg_resources.patch
deleted file mode 100644
index bf496b900..000000000
--- a/dev-python/pynwb/files/pynwb-2.3.1-pkg_resources.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From df0f7ed71defb8d12a7ff72746b93211304c4d4b Mon Sep 17 00:00:00 2001
-From: rly <[email protected]>
-Date: Fri, 24 Mar 2023 10:17:13 -0700
-Subject: [PATCH] Fix deprecation warning with pkg_resources
-
----
- src/pynwb/__init__.py | 14 +++++++++++---
- tests/back_compat/test_import_structure.py | 1 -
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/src/pynwb/__init__.py b/src/pynwb/__init__.py
-index 2df273d43..023cda237 100644
---- a/src/pynwb/__init__.py
-+++ b/src/pynwb/__init__.py
-@@ -15,16 +15,24 @@
- import hdmf.common
-
- CORE_NAMESPACE = 'core'
--__core_ns_file_name = 'nwb.namespace.yaml'
-
- from .spec import NWBDatasetSpec, NWBGroupSpec, NWBNamespace # noqa E402
- from .validate import validate # noqa: F401, E402
-
-
- def __get_resources():
-- from pkg_resources import resource_filename
-+ try:
-+ from importlib.resources import files
-+ except ImportError:
-+ # TODO: Remove when python 3.9 becomes the new minimum
-+ from importlib_resources import files
-+
-+ __location_of_this_file = files(__name__)
-+ __core_ns_file_name = 'nwb.namespace.yaml'
-+ __schema_dir = 'nwb-schema/core'
-+
- ret = dict()
-- ret['namespace_path'] = os.path.join(resource_filename(__name__,
'nwb-schema/core'), __core_ns_file_name)
-+ ret['namespace_path'] = str(__location_of_this_file / __schema_dir /
__core_ns_file_name)
- return ret
-
-
-diff --git a/tests/back_compat/test_import_structure.py
b/tests/back_compat/test_import_structure.py
-index dba11a48a..e5f931f5d 100644
---- a/tests/back_compat/test_import_structure.py
-+++ b/tests/back_compat/test_import_structure.py
-@@ -34,7 +34,6 @@ def test_outer_import_structure(self):
- "__TYPE_MAP",
- "__builtins__",
- "__cached__",
-- "__core_ns_file_name",
- "__doc__",
- "__file__",
- "__get_resources",
diff --git a/dev-python/pynwb/files/pynwb-2.3.1-typing.patch
b/dev-python/pynwb/files/pynwb-2.3.1-typing.patch
deleted file mode 100644
index e672f243b..000000000
--- a/dev-python/pynwb/files/pynwb-2.3.1-typing.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/pynwb/ophys.py b/src/pynwb/ophys.py
-index b09267ff6..e3d9f8f6d 100644
---- a/src/pynwb/ophys.py
-+++ b/src/pynwb/ophys.py
-@@ -192,7 +192,7 @@ def __init__(self, **kwargs):
- args_to_set = popargs_to_dict(keys_to_set, kwargs)
- super().__init__(**kwargs)
-
-- if args_to_set["binning"] < 0:
-+ if args_to_set["binning"] is not None and args_to_set["binning"] < 0:
- raise ValueError(f"Binning value must be >= 0:
{args_to_set['binning']}")
- if isinstance(args_to_set["binning"], int):
- args_to_set["binning"] = np.uint(args_to_set["binning"])
