diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest index 5957446c3a7ac..87ce67e8eaba9 100644 --- a/dev-python/pypiserver/Manifest +++ b/dev-python/pypiserver/Manifest @@ -1,3 +1 @@ -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 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 69e1764e3f2a6..0000000000000 --- 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 d48c2e03b2c35..0000000000000 --- 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/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 e17ff4ee134bc..0000000000000 --- 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 -}