* [gentoo-commits] proj/sci:master commit in: dev-vcs/datalad/files/, dev-vcs/datalad/
@ 2023-01-12 12:18 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2023-01-12 12:18 UTC (permalink / raw
To: gentoo-commits
commit: 88284255c2eba49673ba9855f7118b765b7fa2b1
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 12:11:20 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 12:11:20 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=88284255
dev-vcs/datalad: drop 0.17.0-r1, 0.17.2-r1, 0.17.7
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-vcs/datalad/datalad-0.17.0-r1.ebuild | 84 ------------
dev-vcs/datalad/datalad-0.17.2-r1.ebuild | 76 -----------
dev-vcs/datalad/datalad-0.17.7.ebuild | 81 ------------
dev-vcs/datalad/files/datalad-0.16.1-input.patch | 131 ------------------
dev-vcs/datalad/files/datalad-0.16.1-tests.patch | 10 --
dev-vcs/datalad/files/datalad-0.17.0-skip.patch | 162 -----------------------
6 files changed, 544 deletions(-)
diff --git a/dev-vcs/datalad/datalad-0.17.0-r1.ebuild b/dev-vcs/datalad/datalad-0.17.0-r1.ebuild
deleted file mode 100644
index 6c1b5d77f..000000000
--- a/dev-vcs/datalad/datalad-0.17.0-r1.ebuild
+++ /dev/null
@@ -1,84 +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_10 )
-inherit distutils-r1
-
-DESCRIPTION="Keep code, data, containers under control with git and git-annex"
-HOMEPAGE="https://github.com/datalad/datalad"
-SRC_URI="https://github.com/datalad/datalad/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test +downloaders +metadata +publish misc"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-arch/p7zip
- app-arch/patool[${PYTHON_USEDEP}]
- dev-vcs/git-annex
- dev-python/annexremote[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
- dev-python/distro[${PYTHON_USEDEP}]
- dev-python/fasteners[${PYTHON_USEDEP}]
- dev-python/humanize[${PYTHON_USEDEP}]
- dev-python/iso8601[${PYTHON_USEDEP}]
- dev-python/platformdirs[${PYTHON_USEDEP}]
- dev-python/tqdm[${PYTHON_USEDEP}]
- dev-python/wraps[${PYTHON_USEDEP}]
- downloaders? (
- dev-python/boto[${PYTHON_USEDEP}]
- dev-python/keyring[${PYTHON_USEDEP}]
- dev-python/keyrings-alt[${PYTHON_USEDEP}]
- dev-python/msgpack[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- )
- metadata? (
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/whoosh[${PYTHON_USEDEP}]
- )
- misc? (
- dev-python/argcomplete[${PYTHON_USEDEP}]
- dev-python/pyperclip[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- )
- publish? (
- dev-vcs/python-gitlab[${PYTHON_USEDEP}]
- )
-"
-DEPEND="
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/httpretty[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/vcrpy[${PYTHON_USEDEP}]
- )
-"
-
-# Noticed by upstream:
-# https://github.com/datalad/datalad/issues/6623
-PATCHES=( "${FILESDIR}/${PN}-0.17.0-skip.patch" )
-
-EPYTEST_DESELECT=(
- # Reported upstream: https://github.com/datalad/datalad/issues/6870
- datalad/tests/test_misc.py::test_test
- datalad/local/tests/test_gitcredential.py::test_datalad_credential_helper
-)
-
-distutils_enable_tests pytest
-
-python_test() {
- local -x DATALAD_TESTS_NONETWORK=1
- #export DATALAD_TESTS_NONETWORK=1
- epytest -k "not turtle and not slow and not usecase"
- #epytest -k "not turtle"
- #${EPYTHON} -m nose -s -v -A "not(integration or usecase or slow or network or turtle)" datalad || die
- # Full test suite takes for ever:
- # ${EPYTHON} -m nose -s -v datalad || die
-}
diff --git a/dev-vcs/datalad/datalad-0.17.2-r1.ebuild b/dev-vcs/datalad/datalad-0.17.2-r1.ebuild
deleted file mode 100644
index 967fed7da..000000000
--- a/dev-vcs/datalad/datalad-0.17.2-r1.ebuild
+++ /dev/null
@@ -1,76 +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_10 )
-inherit distutils-r1
-
-DESCRIPTION="Keep code, data, containers under control with git and git-annex"
-HOMEPAGE="https://github.com/datalad/datalad"
-SRC_URI="https://github.com/datalad/datalad/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test +downloaders +metadata +publish misc"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-arch/p7zip
- app-arch/patool[${PYTHON_USEDEP}]
- dev-vcs/git-annex
- dev-python/annexremote[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
- dev-python/distro[${PYTHON_USEDEP}]
- dev-python/fasteners[${PYTHON_USEDEP}]
- dev-python/humanize[${PYTHON_USEDEP}]
- dev-python/iso8601[${PYTHON_USEDEP}]
- dev-python/platformdirs[${PYTHON_USEDEP}]
- dev-python/tqdm[${PYTHON_USEDEP}]
- dev-python/wraps[${PYTHON_USEDEP}]
- downloaders? (
- dev-python/boto[${PYTHON_USEDEP}]
- dev-python/keyring[${PYTHON_USEDEP}]
- dev-python/keyrings-alt[${PYTHON_USEDEP}]
- dev-python/msgpack[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- )
- metadata? (
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/whoosh[${PYTHON_USEDEP}]
- )
- misc? (
- dev-python/argcomplete[${PYTHON_USEDEP}]
- dev-python/pyperclip[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- )
- publish? (
- dev-vcs/python-gitlab[${PYTHON_USEDEP}]
- )
-"
-BDEPEND="
- dev-python/packaging[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/httpretty[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/vcrpy[${PYTHON_USEDEP}]
- )
-"
-
-EPYTEST_DESELECT=(
- # Reported upstream: https://github.com/datalad/datalad/issues/6870
- datalad/distributed/tests/test_ria_basics.py::test_version_check
- datalad/local/tests/test_gitcredential.py::test_datalad_credential_helper
-)
-
-distutils_enable_tests pytest
-
-python_test() {
- local -x DATALAD_TESTS_NONETWORK=1
- # see test groups in "tox.ini"
- epytest -k "not turtle and not slow and not usecase"
-}
diff --git a/dev-vcs/datalad/datalad-0.17.7.ebuild b/dev-vcs/datalad/datalad-0.17.7.ebuild
deleted file mode 100644
index bf4d0c4c1..000000000
--- a/dev-vcs/datalad/datalad-0.17.7.ebuild
+++ /dev/null
@@ -1,81 +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_10 )
-inherit distutils-r1
-
-DESCRIPTION="Keep code, data, containers under control with git and git-annex"
-HOMEPAGE="https://github.com/datalad/datalad"
-SRC_URI="https://github.com/datalad/datalad/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test +downloaders +metadata +publish misc"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-arch/p7zip
- app-arch/patool[${PYTHON_USEDEP}]
- dev-vcs/git-annex
- dev-python/annexremote[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
- dev-python/distro[${PYTHON_USEDEP}]
- dev-python/fasteners[${PYTHON_USEDEP}]
- dev-python/humanize[${PYTHON_USEDEP}]
- dev-python/iso8601[${PYTHON_USEDEP}]
- dev-python/platformdirs[${PYTHON_USEDEP}]
- dev-python/tqdm[${PYTHON_USEDEP}]
- dev-python/wraps[${PYTHON_USEDEP}]
- downloaders? (
- dev-python/boto[${PYTHON_USEDEP}]
- dev-python/keyring[${PYTHON_USEDEP}]
- dev-python/keyrings-alt[${PYTHON_USEDEP}]
- dev-python/msgpack[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- )
- metadata? (
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/whoosh[${PYTHON_USEDEP}]
- )
- misc? (
- dev-python/argcomplete[${PYTHON_USEDEP}]
- dev-python/pyperclip[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- )
- publish? (
- dev-vcs/python-gitlab[${PYTHON_USEDEP}]
- )
-"
-BEPEND="
- dev-python/packaging[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/httpretty[${PYTHON_USEDEP}]
- dev-python/mypy[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/vcrpy[${PYTHON_USEDEP}]
- )
-"
-# also wants base RDEPEND:
-# looseversion
-# Also wants test dep:
-# dev-python/types-requests
-# dev-python/types-python-dateutil
-
-EPYTEST_DESELECT=(
- # Reported upstream: https://github.com/datalad/datalad/issues/6870
- datalad/local/tests/test_gitcredential.py::test_datalad_credential_helper
-)
-
-distutils_enable_tests pytest
-
-python_test() {
- local -x DATALAD_TESTS_NONETWORK=1
- # see test groups in "tox.ini"
- epytest -k "not turtle and not slow and not usecase"
-}
diff --git a/dev-vcs/datalad/files/datalad-0.16.1-input.patch b/dev-vcs/datalad/files/datalad-0.16.1-input.patch
deleted file mode 100644
index 97d16e70a..000000000
--- a/dev-vcs/datalad/files/datalad-0.16.1-input.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff --git a/datalad/local/tests/test_gitcredential.py b/datalad/local/tests/test_gitcredential.py
-index 09387a70d..6dc0e0be4 100644
---- a/datalad/local/tests/test_gitcredential.py
-+++ b/datalad/local/tests/test_gitcredential.py
-@@ -70,89 +70,6 @@ def test_gitcredential_interface(path):
- assert_false(cred['password'])
-
-
--@with_tempfile
--def test_datalad_credential_helper(path):
--
-- ds = Dataset(path).create()
--
-- # tell git to use git-credential-datalad
-- ds.config.add('credential.helper', 'datalad', where='local')
-- ds.config.add('datalad.credentials.githelper.noninteractive', 'true',
-- where='global')
--
-- from datalad.downloaders.providers import Providers
--
-- url1 = "https://datalad-test.org/some"
-- url2 = "https://datalad-test.org/other"
-- provider_name = "datalad-test.org"
--
-- # `Providers` code is old and only considers a dataset root based on PWD
-- # for config lookup. contextmanager below can be removed once the
-- # provider/credential system is redesigned.
-- with chpwd(ds.path):
--
-- gitcred = GitCredentialInterface(url=url1, repo=ds)
--
-- # There's nothing set up yet, helper should return empty
-- gitcred.fill()
-- eq_(gitcred['username'], '')
-- eq_(gitcred['password'], '')
--
-- # store new credentials
-- # Note, that `Providers.enter_new()` currently uses user-level config
-- # files for storage only. TODO: make that an option!
-- # To not mess with existing ones, fail if it already exists:
--
-- cfg_file = Path(Providers._get_providers_dirs()['user']) \
-- / f"{provider_name}.cfg"
-- assert_false(cfg_file.exists())
--
-- # Make sure we clean up
-- from datalad.tests import _TEMP_PATHS_GENERATED
-- _TEMP_PATHS_GENERATED.append(str(cfg_file))
--
-- # Give credentials to git and ask it to store them:
-- gitcred = GitCredentialInterface(url=url1, username="dl-user",
-- password="dl-pwd", repo=ds)
-- gitcred.approve()
--
-- assert_true(cfg_file.exists())
-- providers = Providers.from_config_files()
-- p1 = providers.get_provider(url=url1, only_nondefault=True)
-- assert_is_instance(p1.credential, UserPassword)
-- eq_(p1.credential.get('user'), 'dl-user')
-- eq_(p1.credential.get('password'), 'dl-pwd')
--
-- # default regex should be host only, so matching url2, too
-- p2 = providers.get_provider(url=url2, only_nondefault=True)
-- assert_is_instance(p1.credential, UserPassword)
-- eq_(p1.credential.get('user'), 'dl-user')
-- eq_(p1.credential.get('password'), 'dl-pwd')
--
-- # git, too, should now find it for both URLs
-- gitcred = GitCredentialInterface(url=url1, repo=ds)
-- gitcred.fill()
-- eq_(gitcred['username'], 'dl-user')
-- eq_(gitcred['password'], 'dl-pwd')
--
-- gitcred = GitCredentialInterface(url=url2, repo=ds)
-- gitcred.fill()
-- eq_(gitcred['username'], 'dl-user')
-- eq_(gitcred['password'], 'dl-pwd')
--
-- # Rejection must not currently lead to deleting anything, since we would
-- # delete too broadly.
-- gitcred.reject()
-- assert_true(cfg_file.exists())
-- gitcred = GitCredentialInterface(url=url1, repo=ds)
-- gitcred.fill()
-- eq_(gitcred['username'], 'dl-user')
-- eq_(gitcred['password'], 'dl-pwd')
-- dlcred = UserPassword(name=provider_name)
-- eq_(dlcred.get('user'), 'dl-user')
-- eq_(dlcred.get('password'), 'dl-pwd')
--
--
- @with_tempfile
- def test_credential_cycle(path):
-
---- a/datalad/distribution/tests/test_siblings.py 2022-10-24 16:06:18.740935265 -0400
-+++ b/datalad/distribution/tests/test_siblings.py 2022-10-24 16:08:43.054322297 -0400
-@@ -9,6 +9,8 @@
-
- """
-
-+from nose import SkipTest
-+
- from datalad.support.path import (
- basename,
- join as opj,
-@@ -504,6 +504,7 @@
- @with_tempfile(mkdir=True)
- @serve_path_via_http
- def test_as_common_datasource(testbed, viapath, viaurl, remotepath, url):
-+ raise SkipTest("Known to fail in Portage environment.")
- ds = Dataset(remotepath).create()
- (ds.pathobj / 'testfile').write_text('likemagic')
- (ds.pathobj / 'testfile2').write_text('likemagic2')
---- a/datalad/local/tests/test_add_archive_content.py
-+++ b/datalad/local/tests/test_add_archive_content.py
-@@ -13,6 +13,7 @@
- __docformat__ = 'restructuredtext'
-
- import os
-+from nose import SkipTest
- from glob import glob
- from os import unlink
- from os.path import (
-@@ -514,6 +515,7 @@
- assert_false(lexists(self.ds.pathobj / '1.tar'))
-
- def test_add_archive_leading_dir(self):
-+ raise SkipTest("Known to fail in Portage environment.")
- import os
- os.mkdir(self.ds.pathobj / 'sub')
- f123 = Path('sub') / '123.tar'
diff --git a/dev-vcs/datalad/files/datalad-0.16.1-tests.patch b/dev-vcs/datalad/files/datalad-0.16.1-tests.patch
deleted file mode 100644
index e6231b7f1..000000000
--- a/dev-vcs/datalad/files/datalad-0.16.1-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/datalad-0.16.1/datalad/distribution/tests/test_siblings.py 2022-10-24 16:06:18.740935265 -0400
-+++ b/datalad-0.16.1/datalad/distribution/tests/test_siblings.py 2022-10-24 16:08:43.054322297 -0400
-@@ -504,6 +504,7 @@
- @with_tempfile(mkdir=True)
- @serve_path_via_http
- def test_as_common_datasource(testbed, viapath, viaurl, remotepath, url):
-+ raise SkipTest("Known to fail in Portage environment.")
- ds = Dataset(remotepath).create()
- (ds.pathobj / 'testfile').write_text('likemagic')
- (ds.pathobj / 'testfile2').write_text('likemagic2')
diff --git a/dev-vcs/datalad/files/datalad-0.17.0-skip.patch b/dev-vcs/datalad/files/datalad-0.17.0-skip.patch
deleted file mode 100644
index 33b2d6f63..000000000
--- a/dev-vcs/datalad/files/datalad-0.17.0-skip.patch
+++ /dev/null
@@ -1,162 +0,0 @@
---- a/datalad/tests/utils_pytest.py 2022-07-08 01:32:06.000000000 -0400
-+++ b/datalad/tests/utils_pytest.py 2022-07-21 05:07:09.341386460 -0400
-@@ -209,7 +209,7 @@
- try:
- imp = __import__(module)
- except Exception as exc:
-- pytest.skip("Module %s fails to load" % module)
-+ pytest.skip("Module %s fails to load" % module, allow_module_level=True)
-
-
- def skip_if_scrapy_without_selector():
-@@ -220,7 +220,9 @@
- except ImportError:
- pytest.skip(
- "scrapy misses Selector (too old? version: %s)"
-- % getattr(scrapy, '__version__'))
-+ % getattr(scrapy, '__version__'),
-+ allow_module_level=True,
-+ )
-
-
- def skip_if_url_is_not_available(url, regex=None):
-@@ -231,9 +233,11 @@
- try:
- content = providers.fetch(url)
- if regex and re.search(regex, content):
-- pytest.skip("%s matched %r -- skipping the test" % (url, regex))
-+ pytest.skip("%s matched %r -- skipping the test" % (url, regex),
-+ allow_module_level=True,
-+ )
- except DownloadError:
-- pytest.skip("%s failed to download" % url)
-+ pytest.skip("%s failed to download" % url, allow_module_level=True)
-
-
- def check_not_generatorfunction(func):
-@@ -252,7 +256,9 @@
-
- def check_and_raise():
- if dl_cfg.get('datalad.tests.nonetwork'):
-- pytest.skip("Skipping since no network settings")
-+ pytest.skip("Skipping since no network settings",
-+ allow_module_level=True,
-+ )
-
- if func:
- @wraps(func)
-@@ -273,7 +279,7 @@
-
- def check_and_raise():
- if on_windows:
-- pytest.skip("Skipping on Windows")
-+ pytest.skip("Skipping on Windows", allow_module_level=True)
-
- if func:
- @wraps(func)
-@@ -296,7 +302,9 @@
-
- def check_and_raise():
- if hasattr(os, "geteuid") and os.geteuid() == 0:
-- pytest.skip("Skipping: test assumptions fail under root")
-+ pytest.skip("Skipping: test assumptions fail under root",
-+ allow_module_level=True,
-+ )
-
- if func:
- @wraps(func)
-@@ -333,7 +341,9 @@
- def _wrap_skip_if(*args, **kwargs):
- if cond:
- if method == 'raise':
-- pytest.skip(msg if msg else "condition was True")
-+ pytest.skip(msg if msg else "condition was True",
-+ allow_module_level=True,
-+ )
- elif method == 'pass':
- print(msg if msg else "condition was True")
- return
-@@ -375,7 +385,7 @@
- @skip_ssh
- def _wrap_skip_nomultiplex_ssh(*args, **kwargs):
- if SSHManager is not MultiplexSSHManager:
-- pytest.skip("SSH without multiplexing is used")
-+ pytest.skip("SSH without multiplexing is used", allow_module_level=True)
- return func(*args, **kwargs)
- return _wrap_skip_nomultiplex_ssh
-
-@@ -784,7 +794,7 @@
- port = queue.get(timeout=300)
- except multiprocessing.queues.Empty as e:
- if self.use_ssl:
-- pytest.skip('No working SSL support')
-+ pytest.skip('No working SSL support', allow_module_level=True)
- else:
- raise
- self.url = 'http{}://{}:{}/'.format(
-@@ -822,7 +832,7 @@
- #except requests.exceptions.SSLError as e:
- except Exception as e:
- self.stop()
-- pytest.skip('No working HTTPS setup')
-+ pytest.skip('No working HTTPS setup', allow_module_level=True)
- # now verify that the stdlib tooling also works
- # if this fails, check datalad/tests/ca/prov.sh
- # for info on deploying a datalad-root.crt
-@@ -843,7 +853,7 @@
- #except URLError as e:
- except Exception as e:
- self.stop()
-- pytest.skip('No working HTTPS setup')
-+ pytest.skip('No working HTTPS setup', allow_module_level=True)
-
- def stop(self):
- """Stop serving `path`.
-@@ -911,7 +921,7 @@
- @attr('without_http_proxy')
- def _wrap_without_http_proxy(*args, **kwargs):
- if on_windows:
-- pytest.skip('Unclear why this is not working on windows')
-+ pytest.skip('Unclear why this is not working on windows', allow_module_level=True)
- # Such tests don't require real network so if http_proxy settings were
- # provided, we remove them from the env for the duration of this run
- env = os.environ.copy()
-@@ -1246,7 +1256,9 @@
- assert(testrepos_uris)
- else:
- if not testrepos_uris:
-- pytest.skip("No non-networked repos to test on")
-+ pytest.skip("No non-networked repos to test on",
-+ allow_module_level=True,
-+ )
-
- fake_dates = dl_cfg.get("datalad.fake-dates")
- ntested = 0
-@@ -1298,7 +1310,7 @@
- # https://git-annex.branchable.com/bugs/Recent_hang_with_rsync_remote_with_older_systems___40__Xenial__44___Jessie__41__/
- if external_versions['cmd:system-ssh'] < '7.4' and \
- '8.20200522' < external_versions['cmd:annex'] < '8.20200720':
-- pytest.skip("Test known to hang")
-+ pytest.skip("Test known to hang", allow_module_level=True)
-
- sr_path, repo_path = args[-2:]
- fn_args = args[:-2]
-@@ -2089,7 +2101,7 @@
- _TESTS_ADJUSTED_TMPDIR = _check()
-
- if _TESTS_ADJUSTED_TMPDIR:
-- pytest.skip("Test incompatible with adjusted branch default")
-+ pytest.skip("Test incompatible with adjusted branch default", allow_module_level=True)
- return func(*args, **kwargs)
- return _wrap_skip_if_adjusted_branch
-
-@@ -2134,7 +2146,9 @@
-
- if port is None:
- pytest.skip("port for {} could not be determined: {}"
-- .format(host, err))
-+ .format(host, err),
-+ allow_module_level=True,
-+ )
- return port
-
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/sci:master commit in: dev-vcs/datalad/files/, dev-vcs/datalad/
@ 2022-10-28 12:47 Horea Christian
0 siblings, 0 replies; 3+ messages in thread
From: Horea Christian @ 2022-10-28 12:47 UTC (permalink / raw
To: gentoo-commits
commit: bc7c1f1df1b8ac08fa992f065be3e6e7180fbff8
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Fri Oct 28 12:46:31 2022 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Fri Oct 28 12:46:31 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=bc7c1f1d
dev-vcs/datalad: add 0.17.7
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
dev-vcs/datalad/datalad-0.17.7.ebuild | 80 ++++++++++++++++++++++++
dev-vcs/datalad/files/datalad-0.16.1-input.patch | 37 +++++++++++
dev-vcs/datalad/files/datalad-0.16.1-tests.patch | 10 +++
3 files changed, 127 insertions(+)
diff --git a/dev-vcs/datalad/datalad-0.17.7.ebuild b/dev-vcs/datalad/datalad-0.17.7.ebuild
new file mode 100644
index 000000000..bbcd0c75a
--- /dev/null
+++ b/dev-vcs/datalad/datalad-0.17.7.ebuild
@@ -0,0 +1,80 @@
+# 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="Keep code, data, containers under control with git and git-annex"
+HOMEPAGE="https://github.com/datalad/datalad"
+SRC_URI="https://github.com/datalad/datalad/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +downloaders +metadata +publish misc"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-arch/p7zip
+ app-arch/patool[${PYTHON_USEDEP}]
+ dev-vcs/git-annex
+ dev-python/annexremote[${PYTHON_USEDEP}]
+ >=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+ dev-python/distro[${PYTHON_USEDEP}]
+ dev-python/fasteners[${PYTHON_USEDEP}]
+ dev-python/humanize[${PYTHON_USEDEP}]
+ dev-python/iso8601[${PYTHON_USEDEP}]
+ dev-python/platformdirs[${PYTHON_USEDEP}]
+ dev-python/tqdm[${PYTHON_USEDEP}]
+ dev-python/wraps[${PYTHON_USEDEP}]
+ downloaders? (
+ dev-python/boto[${PYTHON_USEDEP}]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ dev-python/keyrings-alt[${PYTHON_USEDEP}]
+ dev-python/msgpack[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ )
+ metadata? (
+ dev-python/simplejson[${PYTHON_USEDEP}]
+ dev-python/whoosh[${PYTHON_USEDEP}]
+ )
+ misc? (
+ dev-python/argcomplete[${PYTHON_USEDEP}]
+ dev-python/pyperclip[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ )
+ publish? (
+ dev-vcs/python-gitlab[${PYTHON_USEDEP}]
+ )
+"
+BEPEND="
+ dev-python/packaging[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/httpretty[${PYTHON_USEDEP}]
+ dev-python/mypy[${PYTHON_USEDEP}]
+ dev-python/vcrpy[${PYTHON_USEDEP}]
+ )
+"
+# also wants base RDEPEND:
+# looseversion
+# Also wants test dep:
+# dev-python/types-requests
+# dev-python/types-python-dateutil
+
+EPYTEST_DESELECT=(
+ # Reported upstream: https://github.com/datalad/datalad/issues/6870
+ datalad/local/tests/test_gitcredential.py::test_datalad_credential_helper
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+ local -x DATALAD_TESTS_NONETWORK=1
+ # see test groups in "tox.ini"
+ epytest -k "not turtle and not slow and not usecase"
+}
diff --git a/dev-vcs/datalad/files/datalad-0.16.1-input.patch b/dev-vcs/datalad/files/datalad-0.16.1-input.patch
index beb539b5d..97d16e70a 100644
--- a/dev-vcs/datalad/files/datalad-0.16.1-input.patch
+++ b/dev-vcs/datalad/files/datalad-0.16.1-input.patch
@@ -92,3 +92,40 @@ index 09387a70d..6dc0e0be4 100644
@with_tempfile
def test_credential_cycle(path):
+--- a/datalad/distribution/tests/test_siblings.py 2022-10-24 16:06:18.740935265 -0400
++++ b/datalad/distribution/tests/test_siblings.py 2022-10-24 16:08:43.054322297 -0400
+@@ -9,6 +9,8 @@
+
+ """
+
++from nose import SkipTest
++
+ from datalad.support.path import (
+ basename,
+ join as opj,
+@@ -504,6 +504,7 @@
+ @with_tempfile(mkdir=True)
+ @serve_path_via_http
+ def test_as_common_datasource(testbed, viapath, viaurl, remotepath, url):
++ raise SkipTest("Known to fail in Portage environment.")
+ ds = Dataset(remotepath).create()
+ (ds.pathobj / 'testfile').write_text('likemagic')
+ (ds.pathobj / 'testfile2').write_text('likemagic2')
+--- a/datalad/local/tests/test_add_archive_content.py
++++ b/datalad/local/tests/test_add_archive_content.py
+@@ -13,6 +13,7 @@
+ __docformat__ = 'restructuredtext'
+
+ import os
++from nose import SkipTest
+ from glob import glob
+ from os import unlink
+ from os.path import (
+@@ -514,6 +515,7 @@
+ assert_false(lexists(self.ds.pathobj / '1.tar'))
+
+ def test_add_archive_leading_dir(self):
++ raise SkipTest("Known to fail in Portage environment.")
+ import os
+ os.mkdir(self.ds.pathobj / 'sub')
+ f123 = Path('sub') / '123.tar'
diff --git a/dev-vcs/datalad/files/datalad-0.16.1-tests.patch b/dev-vcs/datalad/files/datalad-0.16.1-tests.patch
new file mode 100644
index 000000000..e6231b7f1
--- /dev/null
+++ b/dev-vcs/datalad/files/datalad-0.16.1-tests.patch
@@ -0,0 +1,10 @@
+--- a/datalad-0.16.1/datalad/distribution/tests/test_siblings.py 2022-10-24 16:06:18.740935265 -0400
++++ b/datalad-0.16.1/datalad/distribution/tests/test_siblings.py 2022-10-24 16:08:43.054322297 -0400
+@@ -504,6 +504,7 @@
+ @with_tempfile(mkdir=True)
+ @serve_path_via_http
+ def test_as_common_datasource(testbed, viapath, viaurl, remotepath, url):
++ raise SkipTest("Known to fail in Portage environment.")
+ ds = Dataset(remotepath).create()
+ (ds.pathobj / 'testfile').write_text('likemagic')
+ (ds.pathobj / 'testfile2').write_text('likemagic2')
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/sci:master commit in: dev-vcs/datalad/files/, dev-vcs/datalad/
@ 2022-07-23 12:10 Horea Christian
0 siblings, 0 replies; 3+ messages in thread
From: Horea Christian @ 2022-07-23 12:10 UTC (permalink / raw
To: gentoo-commits
commit: f61e8653c46fe69079bd62db3023a945d8e48b63
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Sat Jul 23 12:08:31 2022 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Sat Jul 23 12:09:54 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f61e8653
dev-vcs/datalad: version bump and test fixes
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
dev-vcs/datalad/datalad-0.17.0.ebuild | 18 ++-
...datalad-0.17.0.ebuild => datalad-0.17.2.ebuild} | 20 +--
dev-vcs/datalad/files/datalad-0.17.0-skip.patch | 162 +++++++++++++++++++++
3 files changed, 182 insertions(+), 18 deletions(-)
diff --git a/dev-vcs/datalad/datalad-0.17.0.ebuild b/dev-vcs/datalad/datalad-0.17.0.ebuild
index 26c601617..4fb1d3de1 100644
--- a/dev-vcs/datalad/datalad-0.17.0.ebuild
+++ b/dev-vcs/datalad/datalad-0.17.0.ebuild
@@ -60,14 +60,16 @@ DEPEND="
# Noticed by upstream:
# https://github.com/datalad/datalad/issues/6623
-#PATCHES=( "${FILESDIR}/${PN}-0.16.1-input.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.17.0-skip.patch" )
distutils_enable_tests pytest
-#python_test() {
-# export DATALAD_TESTS_NONETWORK=1
-# epytest
-# #${EPYTHON} -m nose -s -v -A "not(integration or usecase or slow or network or turtle)" datalad || die
-# # Full test suite takes for ever:
-# # ${EPYTHON} -m nose -s -v datalad || die
-#}
+python_test() {
+ local -x DATALAD_TESTS_NONETWORK=1
+ #export DATALAD_TESTS_NONETWORK=1
+ epytest -k "not turtle and not slow and not usecase"
+ #epytest -k "not turtle"
+ #${EPYTHON} -m nose -s -v -A "not(integration or usecase or slow or network or turtle)" datalad || die
+ # Full test suite takes for ever:
+ # ${EPYTHON} -m nose -s -v datalad || die
+}
diff --git a/dev-vcs/datalad/datalad-0.17.0.ebuild b/dev-vcs/datalad/datalad-0.17.2.ebuild
similarity index 81%
copy from dev-vcs/datalad/datalad-0.17.0.ebuild
copy to dev-vcs/datalad/datalad-0.17.2.ebuild
index 26c601617..753985ef6 100644
--- a/dev-vcs/datalad/datalad-0.17.0.ebuild
+++ b/dev-vcs/datalad/datalad-0.17.2.ebuild
@@ -58,16 +58,16 @@ DEPEND="
)
"
-# Noticed by upstream:
-# https://github.com/datalad/datalad/issues/6623
-#PATCHES=( "${FILESDIR}/${PN}-0.16.1-input.patch" )
+EPYTEST_DESELECT=(
+ # Reported upstream: https://github.com/datalad/datalad/issues/6870
+ datalad/distributed/tests/test_ria_basics.py::test_version_check
+ datalad/local/tests/test_gitcredential.py::test_datalad_credential_helper
+)
distutils_enable_tests pytest
-#python_test() {
-# export DATALAD_TESTS_NONETWORK=1
-# epytest
-# #${EPYTHON} -m nose -s -v -A "not(integration or usecase or slow or network or turtle)" datalad || die
-# # Full test suite takes for ever:
-# # ${EPYTHON} -m nose -s -v datalad || die
-#}
+python_test() {
+ local -x DATALAD_TESTS_NONETWORK=1
+ # see test groups in "tox.ini"
+ epytest -k "not turtle and not slow and not usecase"
+}
diff --git a/dev-vcs/datalad/files/datalad-0.17.0-skip.patch b/dev-vcs/datalad/files/datalad-0.17.0-skip.patch
new file mode 100644
index 000000000..33b2d6f63
--- /dev/null
+++ b/dev-vcs/datalad/files/datalad-0.17.0-skip.patch
@@ -0,0 +1,162 @@
+--- a/datalad/tests/utils_pytest.py 2022-07-08 01:32:06.000000000 -0400
++++ b/datalad/tests/utils_pytest.py 2022-07-21 05:07:09.341386460 -0400
+@@ -209,7 +209,7 @@
+ try:
+ imp = __import__(module)
+ except Exception as exc:
+- pytest.skip("Module %s fails to load" % module)
++ pytest.skip("Module %s fails to load" % module, allow_module_level=True)
+
+
+ def skip_if_scrapy_without_selector():
+@@ -220,7 +220,9 @@
+ except ImportError:
+ pytest.skip(
+ "scrapy misses Selector (too old? version: %s)"
+- % getattr(scrapy, '__version__'))
++ % getattr(scrapy, '__version__'),
++ allow_module_level=True,
++ )
+
+
+ def skip_if_url_is_not_available(url, regex=None):
+@@ -231,9 +233,11 @@
+ try:
+ content = providers.fetch(url)
+ if regex and re.search(regex, content):
+- pytest.skip("%s matched %r -- skipping the test" % (url, regex))
++ pytest.skip("%s matched %r -- skipping the test" % (url, regex),
++ allow_module_level=True,
++ )
+ except DownloadError:
+- pytest.skip("%s failed to download" % url)
++ pytest.skip("%s failed to download" % url, allow_module_level=True)
+
+
+ def check_not_generatorfunction(func):
+@@ -252,7 +256,9 @@
+
+ def check_and_raise():
+ if dl_cfg.get('datalad.tests.nonetwork'):
+- pytest.skip("Skipping since no network settings")
++ pytest.skip("Skipping since no network settings",
++ allow_module_level=True,
++ )
+
+ if func:
+ @wraps(func)
+@@ -273,7 +279,7 @@
+
+ def check_and_raise():
+ if on_windows:
+- pytest.skip("Skipping on Windows")
++ pytest.skip("Skipping on Windows", allow_module_level=True)
+
+ if func:
+ @wraps(func)
+@@ -296,7 +302,9 @@
+
+ def check_and_raise():
+ if hasattr(os, "geteuid") and os.geteuid() == 0:
+- pytest.skip("Skipping: test assumptions fail under root")
++ pytest.skip("Skipping: test assumptions fail under root",
++ allow_module_level=True,
++ )
+
+ if func:
+ @wraps(func)
+@@ -333,7 +341,9 @@
+ def _wrap_skip_if(*args, **kwargs):
+ if cond:
+ if method == 'raise':
+- pytest.skip(msg if msg else "condition was True")
++ pytest.skip(msg if msg else "condition was True",
++ allow_module_level=True,
++ )
+ elif method == 'pass':
+ print(msg if msg else "condition was True")
+ return
+@@ -375,7 +385,7 @@
+ @skip_ssh
+ def _wrap_skip_nomultiplex_ssh(*args, **kwargs):
+ if SSHManager is not MultiplexSSHManager:
+- pytest.skip("SSH without multiplexing is used")
++ pytest.skip("SSH without multiplexing is used", allow_module_level=True)
+ return func(*args, **kwargs)
+ return _wrap_skip_nomultiplex_ssh
+
+@@ -784,7 +794,7 @@
+ port = queue.get(timeout=300)
+ except multiprocessing.queues.Empty as e:
+ if self.use_ssl:
+- pytest.skip('No working SSL support')
++ pytest.skip('No working SSL support', allow_module_level=True)
+ else:
+ raise
+ self.url = 'http{}://{}:{}/'.format(
+@@ -822,7 +832,7 @@
+ #except requests.exceptions.SSLError as e:
+ except Exception as e:
+ self.stop()
+- pytest.skip('No working HTTPS setup')
++ pytest.skip('No working HTTPS setup', allow_module_level=True)
+ # now verify that the stdlib tooling also works
+ # if this fails, check datalad/tests/ca/prov.sh
+ # for info on deploying a datalad-root.crt
+@@ -843,7 +853,7 @@
+ #except URLError as e:
+ except Exception as e:
+ self.stop()
+- pytest.skip('No working HTTPS setup')
++ pytest.skip('No working HTTPS setup', allow_module_level=True)
+
+ def stop(self):
+ """Stop serving `path`.
+@@ -911,7 +921,7 @@
+ @attr('without_http_proxy')
+ def _wrap_without_http_proxy(*args, **kwargs):
+ if on_windows:
+- pytest.skip('Unclear why this is not working on windows')
++ pytest.skip('Unclear why this is not working on windows', allow_module_level=True)
+ # Such tests don't require real network so if http_proxy settings were
+ # provided, we remove them from the env for the duration of this run
+ env = os.environ.copy()
+@@ -1246,7 +1256,9 @@
+ assert(testrepos_uris)
+ else:
+ if not testrepos_uris:
+- pytest.skip("No non-networked repos to test on")
++ pytest.skip("No non-networked repos to test on",
++ allow_module_level=True,
++ )
+
+ fake_dates = dl_cfg.get("datalad.fake-dates")
+ ntested = 0
+@@ -1298,7 +1310,7 @@
+ # https://git-annex.branchable.com/bugs/Recent_hang_with_rsync_remote_with_older_systems___40__Xenial__44___Jessie__41__/
+ if external_versions['cmd:system-ssh'] < '7.4' and \
+ '8.20200522' < external_versions['cmd:annex'] < '8.20200720':
+- pytest.skip("Test known to hang")
++ pytest.skip("Test known to hang", allow_module_level=True)
+
+ sr_path, repo_path = args[-2:]
+ fn_args = args[:-2]
+@@ -2089,7 +2101,7 @@
+ _TESTS_ADJUSTED_TMPDIR = _check()
+
+ if _TESTS_ADJUSTED_TMPDIR:
+- pytest.skip("Test incompatible with adjusted branch default")
++ pytest.skip("Test incompatible with adjusted branch default", allow_module_level=True)
+ return func(*args, **kwargs)
+ return _wrap_skip_if_adjusted_branch
+
+@@ -2134,7 +2146,9 @@
+
+ if port is None:
+ pytest.skip("port for {} could not be determined: {}"
+- .format(host, err))
++ .format(host, err),
++ allow_module_level=True,
++ )
+ return port
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-12 12:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-12 12:18 [gentoo-commits] proj/sci:master commit in: dev-vcs/datalad/files/, dev-vcs/datalad/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2022-10-28 12:47 Horea Christian
2022-07-23 12:10 Horea Christian
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox