commit: ee5933c91a1a18023763a6dc2f25e1c9199a4360 Author: Horea Christian <chr <AT> chymera <DOT> eu> AuthorDate: Mon May 22 11:06:04 2023 +0000 Commit: Horea Christian <horea.christ <AT> gmail <DOT> com> CommitDate: Mon May 22 11:06:04 2023 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ee5933c9
dev-python/pynwb: update SRC_URI Signed-off-by: Horea Christian <chr <AT> chymera.eu> .../df0f7ed71defb8d12a7ff72746b93211304c4d4b.patch | 54 ---------------------- dev-python/pynwb/pynwb-2.2.0-r1.ebuild | 3 +- dev-python/pynwb/pynwb-2.3.1-r1.ebuild | 1 - dev-python/pynwb/pynwb-2.3.1.ebuild | 1 - 4 files changed, 1 insertion(+), 58 deletions(-) diff --git a/dev-python/pynwb/files/df0f7ed71defb8d12a7ff72746b93211304c4d4b.patch b/dev-python/pynwb/files/df0f7ed71defb8d12a7ff72746b93211304c4d4b.patch deleted file mode 100644 index bf496b900..000000000 --- a/dev-python/pynwb/files/df0f7ed71defb8d12a7ff72746b93211304c4d4b.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/pynwb-2.2.0-r1.ebuild b/dev-python/pynwb/pynwb-2.2.0-r1.ebuild index 52fab7a63..5a286c3b6 100644 --- a/dev-python/pynwb/pynwb-2.2.0-r1.ebuild +++ b/dev-python/pynwb/pynwb-2.2.0-r1.ebuild @@ -5,11 +5,10 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..11} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="A Python API for working with Neurodata stored in the NWB Format " HOMEPAGE="https://github.com/NeurodataWithoutBorders/pynwb"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="BSD" diff --git a/dev-python/pynwb/pynwb-2.3.1-r1.ebuild b/dev-python/pynwb/pynwb-2.3.1-r1.ebuild index 585dcc37d..382bfdb60 100644 --- a/dev-python/pynwb/pynwb-2.3.1-r1.ebuild +++ b/dev-python/pynwb/pynwb-2.3.1-r1.ebuild @@ -9,7 +9,6 @@ inherit distutils-r1 pypi DESCRIPTION="A Python API for working with Neurodata stored in the NWB Format " HOMEPAGE="https://github.com/NeurodataWithoutBorders/pynwb"; -SRC_URI="$(pypi_sdist_url pynwb)" SLOT="0" LICENSE="BSD" diff --git a/dev-python/pynwb/pynwb-2.3.1.ebuild b/dev-python/pynwb/pynwb-2.3.1.ebuild index cce90c5d1..e36e65dbe 100644 --- a/dev-python/pynwb/pynwb-2.3.1.ebuild +++ b/dev-python/pynwb/pynwb-2.3.1.ebuild @@ -9,7 +9,6 @@ inherit distutils-r1 pypi DESCRIPTION="A Python API for working with Neurodata stored in the NWB Format " HOMEPAGE="https://github.com/NeurodataWithoutBorders/pynwb"; -SRC_URI="$(pypi_sdist_url pynwb)" SLOT="0" LICENSE="BSD"
