dev-vcs/datalad: drop 0.17.0-r1, 0.17.2-r1, 0.17.7

Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>

7 files changed, 0 insertions, 547 deletions

diff --git a/dev-vcs/datalad/Manifest b/dev-vcs/datalad/Manifest
index 4c0ce5be1..22e5f985a 100644
--- a/dev-vcs/datalad/Manifest
+++ b/dev-vcs/datalad/Manifest
@@ -1,4 +1 @@
-DIST datalad-0.17.0.tar.gz 1510529 BLAKE2B 797a4d15139a88d20f03d1b81cf8b19088cf91925852a0a0d2079b3a64debfaa4945c31f21cc701ac507b00c1eabe10eb57653d8cbef1914d2c7babc48324458 SHA512 fea35a574f13b4957149f87553c80eceaebde064921e5fa28960b088e6d8f38a2eb2cbf797c9e031bd696bdca1400c2baa4c3e94c2b78bf8c1349a752928b09c
-DIST datalad-0.17.2.tar.gz 1512123 BLAKE2B 83f1d437f6a2d300c169710fd12c8e126e5ab89aee9f0ccda48325c13c26a7e895fc11d33e61a266d7e4f5ac976244950851080055639b679819f659286c3c57 SHA512 7eceaea6bd0f0e251f194d8c1846e5abfff46174c536a42c1c0f891ca06f9688f8d291dec706f4ca51128d6588ceaf28039d80e63ebc5a15417bca3c74f0d866
-DIST datalad-0.17.7.tar.gz 1534265 BLAKE2B daeee7a6ca66ac632b085ce1fed2a702f3189da195d50b3fe5bc63c568c2f6633dbcc6da91883f64dd8d2391d8cfdef9bdbcd28091b098fc9edde6ca743767c1 SHA512 b01442bdd672e6ab0ebfe7fc71721437e117df0ddbe68558b8c21d4f5d387de807870250eac83630e52d2bb5ecf69686b5679c2a1458edb13b7e2a940c4e1330
 DIST datalad-0.18.0.tar.gz 1425155 BLAKE2B 8d7cbf7f56b1de82c74fa823b2d4512112f1b4c4be106cac433c8db696b2e7f77da758c0bb62b7cb9fe0fbb08d49431dda2818d08d5c60b5052154895c335b33 SHA512 0df8276edc3872c73fee7286ea4e578648a6fb2a630fa49a4f8945e0d6ff88353d9b11d29d942c0ce22ed17a8223e71f99d8b519a6a8afbc2ac9e6da89d95ee5
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
-