* [gentoo-commits] proj/sci:master commit in: dev-vcs/dandi-cli/, dev-vcs/dandi-cli/files/
@ 2022-05-02 7:54 Horea Christian
0 siblings, 0 replies; 2+ messages in thread
From: Horea Christian @ 2022-05-02 7:54 UTC (permalink / raw
To: gentoo-commits
commit: 1cfaf223c60f41b79d7db71c61d96e2e6f07cf23
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Mon May 2 07:53:58 2022 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Mon May 2 07:53:58 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1cfaf223
dev-vcs/dandi-cli: dropped old version
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
dev-vcs/dandi-cli/dandi-cli-0.35.0.ebuild | 83 ----------------------
.../files/dandi-cli-0.34.1-pip-versioncheck.patch | 13 ----
.../files/dandi-cli-0.35.0-test_nonetwork.patch | 21 ------
3 files changed, 117 deletions(-)
diff --git a/dev-vcs/dandi-cli/dandi-cli-0.35.0.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.35.0.ebuild
deleted file mode 100644
index e59f3ca7f..000000000
--- a/dev-vcs/dandi-cli/dandi-cli-0.35.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="DANDI command line client to facilitate common operations"
-HOMEPAGE="https://github.com/dandi/dandi-cli"
-SRC_URI="https://github.com/dandi/dandi-cli/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test etelemetry"
-
-RDEPEND="
- dev-python/appdirs[${PYTHON_USEDEP}]
- dev-python/click[${PYTHON_USEDEP}]
- dev-python/click-didyoumean[${PYTHON_USEDEP}]
- =dev-python/dandischema-0.5*[${PYTHON_USEDEP}]
- dev-python/fasteners[${PYTHON_USEDEP}]
- dev-python/fscacher[${PYTHON_USEDEP}]
- dev-python/humanize[${PYTHON_USEDEP}]
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/keyring[${PYTHON_USEDEP}]
- dev-python/keyrings_alt[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pycryptodome[${PYTHON_USEDEP}]
- dev-python/pydantic[${PYTHON_USEDEP}]
- dev-python/pynwb[${PYTHON_USEDEP}]
- dev-python/pyout[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/ruamel-yaml[${PYTHON_USEDEP}]
- dev-python/semantic_version[${PYTHON_USEDEP}]
- dev-python/tenacity[${PYTHON_USEDEP}]
- dev-python/tqdm[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
-"
-
-DEPEND="
- test? (
- dev-python/anys[${PYTHON_USEDEP}]
- dev-python/responses[${PYTHON_USEDEP}]
- dev-python/pyfakefs[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- )
-"
-
-# Some tests require deep copy with git history
-# https://github.com/dandi/dandi-cli/issues/878#issuecomment-1021720299
-EPYTEST_DESELECT=(
- "dandi/tests/test_utils.py::test_get_instance_dandi_with_api"
- "dandi/tests/test_utils.py::test_get_instance_url"
- "dandi/tests/test_utils.py::test_get_instance_cli_version_too_old"
- "dandi/tests/test_utils.py::test_get_instance_bad_cli_version"
-)
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.34.1-pip-versioncheck.patch"
- "${FILESDIR}/${PN}-0.35.0-test_nonetwork.patch"
-)
-
-src_prepare() {
- if use etelemetry; then
- default
- else
- eapply "${FILESDIR}/${PN}-0.28.0-no-etelemetry.patch"
- default
- sed -i "/etelemetry/d" setup.cfg
- fi
-}
-
-python_test() {
- export DANDI_TESTS_NONETWORK=1
- epytest
-}
diff --git a/dev-vcs/dandi-cli/files/dandi-cli-0.34.1-pip-versioncheck.patch b/dev-vcs/dandi-cli/files/dandi-cli-0.34.1-pip-versioncheck.patch
deleted file mode 100644
index 4595390b3..000000000
--- a/dev-vcs/dandi-cli/files/dandi-cli-0.34.1-pip-versioncheck.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/setup.cfg 2021-10-06 11:44:40.549337707 -0400
-+++ b/dsetup.cfg 2021-10-06 11:45:10.236935245 -0400
-@@ -30,8 +30,8 @@
- appdirs
- click
- click-didyoumean
-- dandischema ~= 0.5.1
-- etelemetry >= 0.2.2
-+ dandischema
-+ etelemetry
- fasteners
- fscacher
- # Specifying != might be what causes pip 19.3.1 first to install hdmf 1.5.1
diff --git a/dev-vcs/dandi-cli/files/dandi-cli-0.35.0-test_nonetwork.patch b/dev-vcs/dandi-cli/files/dandi-cli-0.35.0-test_nonetwork.patch
deleted file mode 100644
index 89b48b21d..000000000
--- a/dev-vcs/dandi-cli/files/dandi-cli-0.35.0-test_nonetwork.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From e5a6dd4bdc4db828ea1de2a48e96cbdb80465e86 Mon Sep 17 00:00:00 2001
-From: "John T. Wodder II" <git@varonathe.org>
-Date: Tue, 25 Jan 2022 18:53:53 -0500
-Subject: [PATCH] Mark a test with missing `skipif_no_network` marker
-
----
- dandi/tests/test_metadata.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dandi/tests/test_metadata.py b/dandi/tests/test_metadata.py
-index 5896e6ef..a0a6bce1 100644
---- a/dandi/tests/test_metadata.py
-+++ b/dandi/tests/test_metadata.py
-@@ -351,6 +351,7 @@ def test_parseobourl(url, value):
- assert parse_purlobourl(url) == value
-
-
-+@mark.skipif_no_network
- def test_species():
- m = {"species": "http://purl.obolibrary.org/obo/NCBITaxon_28584"}
- assert extract_species(m).json_dict() == {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-vcs/dandi-cli/, dev-vcs/dandi-cli/files/
@ 2022-05-04 21:01 Horea Christian
0 siblings, 0 replies; 2+ messages in thread
From: Horea Christian @ 2022-05-04 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 3d6fdbfbf90124d40d87e422c9c69e6ad9b44a42
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Wed May 4 19:34:51 2022 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Wed May 4 21:01:10 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3d6fdbfb
dev-vcs/dandi-cli: PEP517 fix suggested by mgorny
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
dev-vcs/dandi-cli/dandi-cli-0.37.0.ebuild | 2 +
dev-vcs/dandi-cli/dandi-cli-0.38.0.ebuild | 2 +
dev-vcs/dandi-cli/dandi-cli-0.39.4.ebuild | 5 ++-
.../dandi-cli/files/dandi-cli-0.37.0-pep517.patch | 46 ++++++++++++++++++++++
4 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/dev-vcs/dandi-cli/dandi-cli-0.37.0.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.37.0.ebuild
index e1117b65e..08d652de9 100644
--- a/dev-vcs/dandi-cli/dandi-cli-0.37.0.ebuild
+++ b/dev-vcs/dandi-cli/dandi-cli-0.37.0.ebuild
@@ -3,6 +3,7 @@
EAPI=8
+DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -67,6 +68,7 @@ distutils_enable_tests pytest
PATCHES=(
"${FILESDIR}/${PN}-0.37.0-pip-versioncheck.patch"
+ "${FILESDIR}/${PN}-0.37.0-pep517.patch"
)
src_prepare() {
diff --git a/dev-vcs/dandi-cli/dandi-cli-0.38.0.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.38.0.ebuild
index e1117b65e..08d652de9 100644
--- a/dev-vcs/dandi-cli/dandi-cli-0.38.0.ebuild
+++ b/dev-vcs/dandi-cli/dandi-cli-0.38.0.ebuild
@@ -3,6 +3,7 @@
EAPI=8
+DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -67,6 +68,7 @@ distutils_enable_tests pytest
PATCHES=(
"${FILESDIR}/${PN}-0.37.0-pip-versioncheck.patch"
+ "${FILESDIR}/${PN}-0.37.0-pep517.patch"
)
src_prepare() {
diff --git a/dev-vcs/dandi-cli/dandi-cli-0.39.4.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.39.4.ebuild
index 1f68c40bf..11f322912 100644
--- a/dev-vcs/dandi-cli/dandi-cli-0.39.4.ebuild
+++ b/dev-vcs/dandi-cli/dandi-cli-0.39.4.ebuild
@@ -3,6 +3,7 @@
EAPI=8
+DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -39,11 +40,12 @@ RDEPEND="
dev-python/ruamel-yaml[${PYTHON_USEDEP}]
dev-python/semantic_version[${PYTHON_USEDEP}]
dev-python/tenacity[${PYTHON_USEDEP}]
+ dev-python/versioneer[${PYTHON_USEDEP}]
dev-python/wheel[${PYTHON_USEDEP}]
dev-python/zarr[${PYTHON_USEDEP}]
"
-DEPEND="
+BDEPEND="
test? (
dev-python/anys[${PYTHON_USEDEP}]
dev-python/responses[${PYTHON_USEDEP}]
@@ -68,6 +70,7 @@ distutils_enable_tests pytest
PATCHES=(
"${FILESDIR}/${PN}-0.37.0-pip-versioncheck.patch"
+ "${FILESDIR}/${PN}-0.37.0-pep517.patch"
)
src_prepare() {
diff --git a/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pep517.patch b/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pep517.patch
new file mode 100644
index 000000000..4d4715f95
--- /dev/null
+++ b/dev-vcs/dandi-cli/files/dandi-cli-0.37.0-pep517.patch
@@ -0,0 +1,46 @@
+From a363b68b79b3dd2004912640c90958882a918537 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 4 May 2022 19:49:37 +0200
+Subject: [PATCH] Prepend to sys.path to fix versioneer in PEP517 mode
+
+Prepend the current directory to sys.path rather than appending it
+in order to fix the build in PEP517 mode properly. If the path
+is appended and versioneer is installed on the system, the system
+versioneer.py (i.e. the module used to install versioneer into projects)
+is imported rather than the local file, and the build fails:
+
+```
+Traceback (most recent call last):
+ File "/usr/lib/python-exec/python3.10/gpep517", line 4, in <module>
+ sys.exit(main())
+ File "/usr/lib/python3.10/site-packages/gpep517/__main__.py", line 136, in main
+ return func(args)
+ File "/usr/lib/python3.10/site-packages/gpep517/__main__.py", line 44, in build_wheel
+ wheel_name = backend.build_wheel(args.wheel_dir, args.config_json)
+ File "/usr/lib/python3.10/site-packages/setuptools/build_meta.py", line 244, in build_wheel
+ return self._build_with_temp_dir(['bdist_wheel'], '.whl',
+ File "/usr/lib/python3.10/site-packages/setuptools/build_meta.py", line 229, in _build_with_temp_dir
+ self.run_setup()
+ File "/usr/lib/python3.10/site-packages/setuptools/build_meta.py", line 174, in run_setup
+ exec(compile(code, __file__, 'exec'), locals())
+ File "setup.py", line 32, in <module>
+ "version": versioneer.get_version(),
+AttributeError: module 'versioneer' has no attribute 'get_version'
+```
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index e8dddc985..05765009c 100755
+--- a/setup.py
++++ b/setup.py
+@@ -23,7 +23,7 @@
+ # This is needed for versioneer to be importable when building with PEP 517.
+ # See <https://github.com/warner/python-versioneer/issues/193> and links
+ # therein for more information.
+-sys.path.append(os.path.dirname(__file__))
++sys.path.insert(0, os.path.dirname(__file__))
+
+ try:
+ import versioneer
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-04 21:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-02 7:54 [gentoo-commits] proj/sci:master commit in: dev-vcs/dandi-cli/, dev-vcs/dandi-cli/files/ Horea Christian
-- strict thread matches above, loose matches on Subject: below --
2022-05-04 21:01 Horea Christian
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox