commit: 1497a5aac905a16396a68644c51b66c41f245116 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Feb 11 03:04:37 2026 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Feb 11 03:23:41 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1497a5aa
dev-python/pypiserver: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pypiserver/Manifest | 1 - .../files/pypiserver-2.3.1-unbundle-bottle.patch | 110 --------------------- dev-python/pypiserver/pypiserver-2.3.2-r1.ebuild | 78 --------------- 3 files changed, 189 deletions(-) diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest index 50d84639256a..ec254e269e2a 100644 --- a/dev-python/pypiserver/Manifest +++ b/dev-python/pypiserver/Manifest @@ -1,2 +1 @@ -DIST pypiserver-2.3.2.gh.tar.gz 164673 BLAKE2B 7982c3fdb4cdb159e7450476a9f845825ad1d3bd1327fa125f978f1848f3a15d4d6d5f8676c8c050e25d49dd4a83e806496c863dd7f4d3e9005764b33e4a9a5e SHA512 83e48cf55892affee04533e0e1bb17dfa79548cd3629d1a61dd8f84cad635eb220ebe4207d1ceebe939eea0953fa17ffe6e549a015a9d9d6f627c9041e5786d2 DIST pypiserver-2.4.0.gh.tar.gz 156766 BLAKE2B 99254c4cbc4290a80a2e272c1932f91e33aa7ee68a28463faf2dbad27fca505c52697aeaea812ae7aff6b0ee5e109d7c535f0d6c4bbe3af804de29a5ccabff53 SHA512 543f8bf98bface6a6db996c130be5acb19aa31ab85d5d37d9766e132b38713aed1eb0a46c67f767185409bf8c4eaef6fdfdcb5137af2651b5b6191032b5c5268 diff --git a/dev-python/pypiserver/files/pypiserver-2.3.1-unbundle-bottle.patch b/dev-python/pypiserver/files/pypiserver-2.3.1-unbundle-bottle.patch deleted file mode 100644 index c879e5291a88..000000000000 --- a/dev-python/pypiserver/files/pypiserver-2.3.1-unbundle-bottle.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 65c42e562500590d4e2377479ce23c4bcf4c325c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Sun, 24 Nov 2024 04:11:10 +0100 -Subject: [PATCH] unbundle pypiserver - ---- - pypiserver/__init__.py | 2 +- - pypiserver/__main__.py | 2 +- - pypiserver/_app.py | 2 +- - tests/test_app.py | 3 ++- - tests/test_main.py | 8 ++++---- - 5 files changed, 9 insertions(+), 8 deletions(-) - -diff --git a/pypiserver/__init__.py b/pypiserver/__init__.py -index 326a13f..42bbcd0 100644 ---- a/pypiserver/__init__.py -+++ b/pypiserver/__init__.py -@@ -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__ = "2.3.1" -diff --git a/pypiserver/__main__.py b/pypiserver/__main__.py -index a47418b..b433335 100644 ---- a/pypiserver/__main__.py -+++ b/pypiserver/__main__.py -@@ -160,7 +160,7 @@ def main(argv: t.Sequence[str] = None) -> 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 --git a/pypiserver/_app.py b/pypiserver/_app.py -index ed6ae20..2224619 100644 ---- a/pypiserver/_app.py -+++ b/pypiserver/_app.py -@@ -13,7 +13,7 @@ from urllib.parse import urljoin, urlparse, quote - - from pypiserver.config import RunConfig - from . import __version__ --from .bottle import ( -+from bottle import ( - static_file, - redirect, - request, -diff --git a/tests/test_app.py b/tests/test_app.py -index 230a03e..8bd3d75 100644 ---- a/tests/test_app.py -+++ b/tests/test_app.py -@@ -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, _app -+from pypiserver import __main__, core, Bottle, _app - from pypiserver.backend import CachingFileBackend, SimpleFileBackend - - # Enable logging to detect any problems with it -diff --git a/tests/test_main.py b/tests/test_main.py -index 5fcace7..5369c78 100644 ---- a/tests/test_main.py -+++ b/tests/test_main.py -@@ -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 -@@ -51,7 +51,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 -@@ -262,7 +262,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. --- -2.47.0 - diff --git a/dev-python/pypiserver/pypiserver-2.3.2-r1.ebuild b/dev-python/pypiserver/pypiserver-2.3.2-r1.ebuild deleted file mode 100644 index 0cee3902070f..000000000000 --- a/dev-python/pypiserver/pypiserver-2.3.2-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{11..14} pypy3_11 ) - -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.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 - - # remove bundled bottle - 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 -}
