gentoo auto-resync : 06:10:2024 - 04:27:04

4 files changed, 2 insertions, 117 deletions

diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index c6ba67672545..d4f7e606cc28 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,7 +1,4 @@
 AUX pypiserver-1.5.0-unbundle-bottle.patch 3428 BLAKE2B f30c9c5b7204b3efed6f6515ce11ca6921ad44a5af69af6ea19059daa9b07396bf7312d649b93492e3e1f98bcc3e0df16c9178aa0abda77b048634b0461ae194 SHA512 fca45138c22b8c12c5fe5fc1742f5a7034d9353e7a520a8870b4a0b4d113b915ed8a34dc9cc9f268ff8f9220425f1131db8ea13443ff9050852bcd9d362ac942
-AUX pypiserver-2.1.1-test-offline.patch 1431 BLAKE2B 0a96f83ab0d2850128abf92fbb6ba8e34fa97340a28f901c1579c1f06d8030d9011c25639aa6c57044dc838286e4aa02dcfe3f2448ab10e4a2b5a1521b7a52d8 SHA512 2e273ecd662a4471bff2bf1245ac94a5e610b0619ae1534dcd503132456c0f86c761103aac2bbf095e2ddbcdf8c287ae72fd180f37d22eb5ef336e5a79f1feb8
-DIST pypiserver-2.1.1.gh.tar.gz 157393 BLAKE2B e80c73b2422dc87bba09d8c9c2e1ffc72017ec58c5530d3debb95560b50a776e1603cb5641c7e4af1ed87d64750843ae025a6a47ab4cc28ce0de1051dd5b214f SHA512 d85afb0d2c85c76a62e393d7d7824e91ff052a04e985278db48010b6f71d12c7749139245e69932b78aefbf3152ba8a8b463bfcd21d1772d047d64f0b164681a
 DIST pypiserver-2.2.0.gh.tar.gz 158107 BLAKE2B 8c5e68201a4d376bc04ca8a5dc243c8c176f6a1bfd362fd5b0eb2875ca071cd124d15814312c2c14ded57c8476f72d41ccf1057eced2247d17f1cc6b7b12e86c SHA512 e1c313b52c852b90ee3efe07b754d91ac842483718fe30f0c59951aad9aa84bc36c9264956fd931a98aaad5ee151089a06472f19e4ae5e9eb1d20c72cc98f436
-EBUILD pypiserver-2.1.1.ebuild 1932 BLAKE2B b519465879cd65bc8a73dfd903e0ea1954934413dde8e3db54c2d5d2b71c4eb50010c237df7dd0223936b54657df5ed3592920cd274f4e80993a0fc6315b8434 SHA512 5e6b32555b731072f2e8d3032f445c5d73c913c157716396a3ed52b146ac8875b6dbceb5ea59bff93f0db85ca1ba074fc0bb316c58e9f695a8a22916c20d0a55
-EBUILD pypiserver-2.2.0.ebuild 1854 BLAKE2B 697e02ff88b6de77425dd88e0d1c430d948913cdaca1be69d0eec5c6cae22ba40d0e64d9e11ada545baa4cc0861798a5d5805c5eb4ea1922d4338a9de605688e SHA512 de8737969d69102b1421f41366bda224def2f9a8720ab7f54c1d788e8bc0bb4df9b741de16f134eda408379341ac8dbed7f6728f1dfab17fe4c843f955e773dd
+EBUILD pypiserver-2.2.0.ebuild 1846 BLAKE2B 4dbdfdca43ca943601998e8f72b425666d03d3c5bbafbef18d09c050d4f5160e740f4655a3326b3a1efddd6351effafc8a4912f321a0ecc9191bf0fb32512889 SHA512 6d68c2224557fb15dfdcdf0e3f4e1693917acb296789c2d9e886e5093b13116ccdbd3d9b66f25c4f07c981f75925ff92d3d008b2dd519509c71faef57052a7f9
 MISC metadata.xml 399 BLAKE2B e8726c9c4a494a64dd1490aa88f8bbca6536635af045364307d057d5dfa4762a1b0d59d3eacf7d84c9002ac38516eb7d2228ebd872db762a669bd6015139a4ec SHA512 a3d90eb11fc5bb2c78e53a4d64cffaf213a445c1677939c46fb400e01f4e74d1f206df2259ab348b61d27e3a9b3f03e94a49485be948b2e4106ba254154c7ada
diff --git a/dev-python/pypiserver/files/pypiserver-2.1.1-test-offline.patch b/dev-python/pypiserver/files/pypiserver-2.1.1-test-offline.patch
deleted file mode 100644
index 121677beb1b8..000000000000
--- a/dev-python/pypiserver/files/pypiserver-2.1.1-test-offline.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 749ad0f641ac14cc6e8485ed0b4fdf6aacb6f015 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 25 Apr 2024 14:44:16 +0200
-Subject: [PATCH] test: Fix running `build` in offline test environment
-
-Fix the `build` calls to use `--no-isolation`, in order to fix
-regression in running tests in an offline environment.
-
-Unlike the previous `setup.py` calls, `build` defaults to creating a new
-virtual environment to perform the build.  This, in turn, requires
-fetching the build dependencies from the Internet, effectively making
-the tests error out in an offline environment.  Passing `--no-isolation`
-makes `build` use the already-installed host dependencies instead.
----
- tests/test_server.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_server.py b/tests/test_server.py
-index 92ecdda3..99da611c 100644
---- a/tests/test_server.py
-+++ b/tests/test_server.py
-@@ -148,7 +148,10 @@ def wheel_file(project, tmp_path_factory):
-     if re.match("^3\.7", sys.version):
-         assert run_setup_py(project, f"bdist_wheel -d {distdir}") == 0
-     else:
--        assert run_py_build(project, f"--wheel --outdir {distdir}") == 0
-+        assert (
-+            run_py_build(project, f"--wheel --no-isolation --outdir {distdir}")
-+            == 0
-+        )
-     wheels = list(distdir.glob("centodeps*.whl"))
-     assert len(wheels) > 0
-     return wheels[0]
diff --git a/dev-python/pypiserver/pypiserver-2.1.1.ebuild b/dev-python/pypiserver/pypiserver-2.1.1.ebuild
deleted file mode 100644
index 9683d7a48f57..000000000000
--- a/dev-python/pypiserver/pypiserver-2.1.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Minimal PyPI server"
-HOMEPAGE="
-	https://github.com/pypiserver/pypiserver/
-	https://pypi.org/project/pypiserver/
-"
-SRC_URI="
-	https://github.com/pypiserver/pypiserver/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/bottle[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.2[${PYTHON_USEDEP}]
-	>=dev-python/pip-7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib-resources[${PYTHON_USEDEP}]
-	' 3.{10..11})
-"
-# NB: many test deps are optional/specific to tests we skip
-BDEPEND="
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/passlib-1.6[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES.rst README.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.0-unbundle-bottle.patch"
-	# https://github.com/pypiserver/pypiserver/pull/571
-	"${FILESDIR}/${P}-test-offline.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove bundled bottle (sic!)
-	rm pypiserver/bottle.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_server.py::test_hash_algos
-		tests/test_server.py::test_pip_install_open_succeeds
-		tests/test_server.py::test_pip_install_authed_succeeds
-		# seems to rely on internal bottle details
-		tests/test_main.py::test_auto_servers
-	)
-
-	if ! has_version "dev-python/twine[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_server.py::test_twine_upload
-			tests/test_server.py::test_twine_register
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests
-}
diff --git a/dev-python/pypiserver/pypiserver-2.2.0.ebuild b/dev-python/pypiserver/pypiserver-2.2.0.ebuild
index f44e272eb10a..d48c2e03b2c3 100644
--- a/dev-python/pypiserver/pypiserver-2.2.0.ebuild
+++ b/dev-python/pypiserver/pypiserver-2.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/bottle-0.13[${PYTHON_USEDEP}]