gentoo auto-resync : 15:12:2024 - 02:02:03

5 files changed, 2 insertions, 253 deletions

diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index a08143232e1e..dcaa28a67549 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,9 +1,4 @@
-AUX pypiserver-1.5.0-unbundle-bottle.patch 3428 BLAKE2B f30c9c5b7204b3efed6f6515ce11ca6921ad44a5af69af6ea19059daa9b07396bf7312d649b93492e3e1f98bcc3e0df16c9178aa0abda77b048634b0461ae194 SHA512 fca45138c22b8c12c5fe5fc1742f5a7034d9353e7a520a8870b4a0b4d113b915ed8a34dc9cc9f268ff8f9220425f1131db8ea13443ff9050852bcd9d362ac942
 AUX pypiserver-2.3.1-unbundle-bottle.patch 3335 BLAKE2B 7993059d0c2373bdffaa11719929c94418cc3348e817b16a1f8ead090bc4f36bd30f70db00adcbef5fafb7a635e2bff0e1eefd44bca8da7484c5fd2e675b45b1 SHA512 fc209684b649a052443ff77d30968d7282de6e75385ece6fece79f351508351a015bee6e462d18372fb71c3d6e487495f1c53b0e1239afcdab25e121727a412a
-DIST pypiserver-2.2.0.gh.tar.gz 158107 BLAKE2B 8c5e68201a4d376bc04ca8a5dc243c8c176f6a1bfd362fd5b0eb2875ca071cd124d15814312c2c14ded57c8476f72d41ccf1057eced2247d17f1cc6b7b12e86c SHA512 e1c313b52c852b90ee3efe07b754d91ac842483718fe30f0c59951aad9aa84bc36c9264956fd931a98aaad5ee151089a06472f19e4ae5e9eb1d20c72cc98f436
-DIST pypiserver-2.3.1.gh.tar.gz 165683 BLAKE2B 0a24b26a804f44bcd314595c4559fe7f41264910cd841e6ca7835e225fca2ec76073952ad9fb228c8e7f5d59045ad37578e676283499ab745fe204a7e353ee31 SHA512 c8a449e49daf2e3f149fbc87e01e40ad5cd5e33d1453b5d2bc97eefe10d7b8dcf74eda1008e62175de5f4f1429dec163774e19c92573ded1fe98f82293643e67
 DIST pypiserver-2.3.2.gh.tar.gz 164673 BLAKE2B 7982c3fdb4cdb159e7450476a9f845825ad1d3bd1327fa125f978f1848f3a15d4d6d5f8676c8c050e25d49dd4a83e806496c863dd7f4d3e9005764b33e4a9a5e SHA512 83e48cf55892affee04533e0e1bb17dfa79548cd3629d1a61dd8f84cad635eb220ebe4207d1ceebe939eea0953fa17ffe6e549a015a9d9d6f627c9041e5786d2
-EBUILD pypiserver-2.2.0.ebuild 1846 BLAKE2B 4dbdfdca43ca943601998e8f72b425666d03d3c5bbafbef18d09c050d4f5160e740f4655a3326b3a1efddd6351effafc8a4912f321a0ecc9191bf0fb32512889 SHA512 6d68c2224557fb15dfdcdf0e3f4e1693917acb296789c2d9e886e5093b13116ccdbd3d9b66f25c4f07c981f75925ff92d3d008b2dd519509c71faef57052a7f9
-EBUILD pypiserver-2.3.1.ebuild 1948 BLAKE2B 698dedf3052ff2d8e3eee7d9d304877de082d89a3d1ea7064991dad3d730ea812916bec4993a84ce6eaa36d07f6870c2ce3b044e01b79a315d685a48b03a048a SHA512 e67eb5f47edbd594fdfac758d90954e346b7fb4544fe443a1030dbf1aa98ecb8865bd6005d8b8bbcb4d0c1358a10f5991daf647483e01947e2b816c73a912488
-EBUILD pypiserver-2.3.2.ebuild 1842 BLAKE2B 1711642147a7bb322ab26651fa575a136a56d02f631fdb3becb64430fd95d87e0fa1056e1af2e1d06a99a7b02df7751ba6a6f785f49cbd0fb6a4090b140e23ae SHA512 84a5b6982b1d22adec854def8313f466c577350c96c68a87678050d7f130db867971027d85268a374ced9ee8846a31c8c5afb1577dd11739f40e881f96092300
+EBUILD pypiserver-2.3.2.ebuild 1834 BLAKE2B c1008220744f4f266928d9dc9f1507f168519be8fba5b191766c42136b2e6ac1210c0ba2583a31a4b26f3cdaecab6781faabc288cec2bb287791eee670495b17 SHA512 14b288cb59319862f08315ceefaff3356d065ff12a9951b28db62a8c0833a8aee875a6d6921fa48cf0f8484f3ac434160ba28c85de2880fc54efdd4d957f1416
 MISC metadata.xml 399 BLAKE2B e8726c9c4a494a64dd1490aa88f8bbca6536635af045364307d057d5dfa4762a1b0d59d3eacf7d84c9002ac38516eb7d2228ebd872db762a669bd6015139a4ec SHA512 a3d90eb11fc5bb2c78e53a4d64cffaf213a445c1677939c46fb400e01f4e74d1f206df2259ab348b61d27e3a9b3f03e94a49485be948b2e4106ba254154c7ada
diff --git a/dev-python/pypiserver/files/pypiserver-1.5.0-unbundle-bottle.patch b/dev-python/pypiserver/files/pypiserver-1.5.0-unbundle-bottle.patch
deleted file mode 100644
index 69e1764e3f2a..000000000000
--- a/dev-python/pypiserver/files/pypiserver-1.5.0-unbundle-bottle.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -dupr pypiserver-1.5.0.orig/pypiserver/_app.py pypiserver-1.5.0/pypiserver/_app.py
---- pypiserver-1.5.0.orig/pypiserver/_app.py	2022-05-24 07:32:24.710366623 +0200
-+++ pypiserver-1.5.0/pypiserver/_app.py	2022-05-24 07:37:16.147456086 +0200
-@@ -13,7 +13,7 @@ from json import dumps
- from pypiserver.config import RunConfig
- from . import __version__
- from . import core
--from .bottle import (
-+from bottle import (
-     static_file,
-     redirect,
-     request,
-diff -dupr pypiserver-1.5.0.orig/pypiserver/__init__.py pypiserver-1.5.0/pypiserver/__init__.py
---- pypiserver-1.5.0.orig/pypiserver/__init__.py	2022-05-24 07:32:24.710366623 +0200
-+++ pypiserver-1.5.0/pypiserver/__init__.py	2022-05-24 07:36:54.633769799 +0200
-@@ -4,7 +4,7 @@ import re as _re
- import sys
- import typing as t
- 
--from pypiserver.bottle import Bottle
-+from bottle import Bottle
- from pypiserver.config import Config, RunConfig, strtobool
- 
- version = __version__ = "1.5.0"
-diff -dupr pypiserver-1.5.0.orig/pypiserver/__main__.py pypiserver-1.5.0/pypiserver/__main__.py
---- pypiserver-1.5.0.orig/pypiserver/__main__.py	2022-05-24 07:32:24.710366623 +0200
-+++ pypiserver-1.5.0/pypiserver/__main__.py	2022-05-24 07:34:05.608054452 +0200
-@@ -159,7 +159,7 @@ def main(argv: t.Sequence[str] = None) -
- 
-         gevent.monkey.patch_all()
- 
--    from pypiserver import bottle
-+    import bottle
- 
-     bottle.debug(config.verbosity > 1)
-     bottle._stderr = ft.partial(  # pylint: disable=protected-access
-diff -dupr pypiserver-1.5.0.orig/tests/test_app.py pypiserver-1.5.0/tests/test_app.py
---- pypiserver-1.5.0.orig/tests/test_app.py	2022-05-24 07:32:24.710366623 +0200
-+++ pypiserver-1.5.0/tests/test_app.py	2022-05-24 07:33:23.470919728 +0200
-@@ -8,12 +8,13 @@ import xmlrpc.client as xmlrpclib
- from html import unescape
- 
- # Third party imports
-+import bottle
- import pytest
- import webtest
- 
- # Local Imports
- from tests.test_pkg_helpers import files, invalid_files
--from pypiserver import __main__, bottle, core, Bottle
-+from pypiserver import __main__, core, Bottle
- from pypiserver.backend import CachingFileBackend, SimpleFileBackend
- 
- # Enable logging to detect any problems with it
-diff -dupr pypiserver-1.5.0.orig/tests/test_main.py pypiserver-1.5.0/tests/test_main.py
---- pypiserver-1.5.0.orig/tests/test_main.py	2022-05-24 07:32:24.710366623 +0200
-+++ pypiserver-1.5.0/tests/test_main.py	2022-05-24 07:33:33.441025326 +0200
-@@ -5,11 +5,11 @@ import sys
- import typing as t
- from unittest import mock
- 
-+import bottle
- import pytest
- 
--import pypiserver.bottle
-+from bottle import Bottle
- from pypiserver import __main__
--from pypiserver.bottle import Bottle
- 
- 
- THIS_DIR = pathlib.Path(__file__).parent
-@@ -52,7 +52,7 @@ def main(monkeypatch):
-         main.update_args = args
-         main.update_kwargs = kwargs
- 
--    monkeypatch.setattr("pypiserver.bottle.run", run)
-+    monkeypatch.setattr("bottle.run", run)
-     monkeypatch.setattr("pypiserver.manage.update_all_packages", update)
- 
-     return main
-@@ -263,7 +263,7 @@ def test_auto_servers() -> None:
-     """Test auto servers."""
-     # A list of bottle ServerAdapters
-     bottle_adapters = tuple(
--        a.__name__.lower() for a in pypiserver.bottle.AutoServer.adapters
-+        a.__name__.lower() for a in bottle.AutoServer.adapters
-     )
-     # We are going to expect that our AutoServer enum names must match those
-     # at least closely enough to be recognizable.
diff --git a/dev-python/pypiserver/pypiserver-2.2.0.ebuild b/dev-python/pypiserver/pypiserver-2.2.0.ebuild
deleted file mode 100644
index d48c2e03b2c3..000000000000
--- a/dev-python/pypiserver/pypiserver-2.2.0.ebuild
+++ /dev/null
@@ -1,77 +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-0.13[${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"
-)
-
-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.3.1.ebuild b/dev-python/pypiserver/pypiserver-2.3.1.ebuild
deleted file mode 100644
index e17ff4ee134b..000000000000
--- a/dev-python/pypiserver/pypiserver-2.3.1.ebuild
+++ /dev/null
@@ -1,80 +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}-2.3.1-unbundle-bottle.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# stray unconditional importlib-resources dep
-	sed -i -e '/importlib_resources/d' setup.py || die
-	# remove bundled bottle (sic!)
-	rm pypiserver/bottle.py || die
-}
-
-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.3.2.ebuild b/dev-python/pypiserver/pypiserver-2.3.2.ebuild
index 343c763ed9da..7bbe51443bbb 100644
--- a/dev-python/pypiserver/pypiserver-2.3.2.ebuild
+++ b/dev-python/pypiserver/pypiserver-2.3.2.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[${PYTHON_USEDEP}]