From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- dev-python/pypiserver/Manifest | 5 +- .../files/pypiserver-1.5.0-unbundle-bottle.patch | 89 ++++++++++++++++++++++ dev-python/pypiserver/pypiserver-1.4.2.ebuild | 58 -------------- dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild | 68 +++++++++++++++++ dev-python/pypiserver/pypiserver-1.5.0.ebuild | 57 -------------- 5 files changed, 159 insertions(+), 118 deletions(-) create mode 100644 dev-python/pypiserver/files/pypiserver-1.5.0-unbundle-bottle.patch delete mode 100644 dev-python/pypiserver/pypiserver-1.4.2.ebuild create mode 100644 dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild delete mode 100644 dev-python/pypiserver/pypiserver-1.5.0.ebuild (limited to 'dev-python/pypiserver') diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest index 4c3e813db429..7490d35f4b91 100644 --- a/dev-python/pypiserver/Manifest +++ b/dev-python/pypiserver/Manifest @@ -1,5 +1,4 @@ -DIST pypiserver-1.4.2.tar.gz 511019 BLAKE2B fe9a41c35d601ee20f2cfe0773ce341b8c8fe387a2b825d1e6d669d5f358846b436158beb8a1222fa33cf1841cad5aceacc0f5063f899445ad15ca9eb5b8efd7 SHA512 8597a6a7e83cb3f5ead3418ee91167e1764c123b244c05397fa892c8ebe84b58569f27ce85cd9849d6a41d20342de21cf9cc46e00b233d9d94d0540470e1c49b +AUX pypiserver-1.5.0-unbundle-bottle.patch 3428 BLAKE2B f30c9c5b7204b3efed6f6515ce11ca6921ad44a5af69af6ea19059daa9b07396bf7312d649b93492e3e1f98bcc3e0df16c9178aa0abda77b048634b0461ae194 SHA512 fca45138c22b8c12c5fe5fc1742f5a7034d9353e7a520a8870b4a0b4d113b915ed8a34dc9cc9f268ff8f9220425f1131db8ea13443ff9050852bcd9d362ac942 DIST pypiserver-1.5.0.gh.tar.gz 149963 BLAKE2B bfc0760982f97e93357702342eb5b1776f72c43e66742a8741ee2ba3109839006e99e49b65e04380097500c400e09bce77b74fc5f9072c7670349817ae3a73cb SHA512 c93e724a3aa6ec265d483c2989129292a05132d3d52db6d9b9c1429610ee23b56e106c9389bdfaad142f34071ee258bdd4291668c11f8bb412df043bf4555611 -EBUILD pypiserver-1.4.2.ebuild 1504 BLAKE2B 9ad37a5cb54089a36e1e0d7e37babbc98dd3eb07e37e1d6663efaf8218e338ad70a4e1a739b124f7ea77ba2c85718f24313070b0b77f6f34d93de1e5bee8f830 SHA512 78b40757eec87cd464d7fe8ce9b3eb27a57323f86fcd2fb9950b856087233c69202a19db4c3157096411590eef1c112bb1ff40924edf4c2bfe4b6e284b336d1c -EBUILD pypiserver-1.5.0.ebuild 1372 BLAKE2B 3b55bef90fbbb71c1839354def790c729f39bfc4efaab0ab389a46fcf2203d1f3db09f5348c09e7fbfd591e3003bc8549984c0e6c87f2aa4260772bd59384de8 SHA512 42c013974601737eba3369fa72cd84bf476d384d469305b22709ec83341c0892605fa3984cd08a3f297840d1a3b15bbfd9d26211670257fa8cf1bfebfa28cb88 +EBUILD pypiserver-1.5.0-r2.ebuild 1561 BLAKE2B 61d5d4a478c7efc167cfe32c8eeaa09041f3b900308afda96ff0fb9040d5d7ca6c0c7d852a7007f11fd6a18949631228d597bde7f8511bfdf35506a74c7311dc SHA512 b43d71061cc96bd465fa26d370bd3dc94f4ef07e95b4b960fed39c0001ebdfc3852655d88ffb5b7a3cae0c40e401b31ac63d82d97a9e53c77a363438adb6d05d 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 new file mode 100644 index 000000000000..69e1764e3f2a --- /dev/null +++ b/dev-python/pypiserver/files/pypiserver-1.5.0-unbundle-bottle.patch @@ -0,0 +1,89 @@ +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-1.4.2.ebuild b/dev-python/pypiserver/pypiserver-1.4.2.ebuild deleted file mode 100644 index 55e9043f8868..000000000000 --- a/dev-python/pypiserver/pypiserver-1.4.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -inherit distutils-r1 - -DESCRIPTION="Minimal PyPI server" -HOMEPAGE="https://github.com/pypiserver/pypiserver" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" -IUSE="test" - -RDEPEND=" - dev-python/pip[${PYTHON_USEDEP}] - >=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]" -BDEPEND=" - dev-python/setuptools-git[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/passlib[${PYTHON_USEDEP}] - >=dev-python/pytest-2.3[${PYTHON_USEDEP}] - dev-python/webtest[${PYTHON_USEDEP}] - !alpha? ( !hppa? ( !ia64? ( - dev-python/twine[${PYTHON_USEDEP}] - ) ) ) - )" - -DOCS=( README.rst ) - -distutils_enable_tests pytest - -python_test() { - local EPYTEST_DESELECT=( - # Internet - tests/test_server.py::test_hash_algos - tests/test_server.py::test_pipInstall_openOk - tests/test_server.py::test_pipInstall_authedOk - # TODO - tests/test_app.py::test_root_count - ) - - if ! has_version "dev-python/twine[${PYTHON_USEDEP}]"; then - EPYTEST_DESELECT+=( - tests/test_server.py::test_twine_register_authed_ok - tests/test_server.py::test_twine_register_open - tests/test_server.py::test_twine_upload_authed - tests/test_server.py::test_twine_upload_open - tests/test_server.py::test_twine_upload_partial_authed - ) - fi - - epytest -} diff --git a/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild b/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild new file mode 100644 index 000000000000..e8a875327309 --- /dev/null +++ b/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild @@ -0,0 +1,68 @@ +# 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_{8..11} 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 ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" + +RDEPEND=" + dev-python/bottle[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/wheel-0.25.0[${PYTHON_USEDEP}] +" +# NB: many test deps are optional/specific to tests we skip +BDEPEND=" + dev-python/setuptools-git[${PYTHON_USEDEP}] + test? ( + >=dev-python/passlib-1.6[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/twine[${PYTHON_USEDEP}] + dev-python/webtest[${PYTHON_USEDEP}] + ) +" + +DOCS=( README.rst ) + +PATCHES=( + "${FILESDIR}/${P}-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_pipInstall_openOk + tests/test_server.py::test_pipInstall_authedOk + # TODO + tests/test_app.py::test_root_count + tests/test_server.py::test_pip_install_open_succeeds + tests/test_server.py::test_pip_install_authed_succeeds + ) + + epytest tests +} diff --git a/dev-python/pypiserver/pypiserver-1.5.0.ebuild b/dev-python/pypiserver/pypiserver-1.5.0.ebuild deleted file mode 100644 index e6ba0228e52a..000000000000 --- a/dev-python/pypiserver/pypiserver-1.5.0.ebuild +++ /dev/null @@ -1,57 +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_{8..10} 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 MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" - -RDEPEND=" - dev-python/pip[${PYTHON_USEDEP}] - >=dev-python/wheel-0.25.0[${PYTHON_USEDEP}] -" -# NB: many test deps are optional/specific to tests we skip -BDEPEND=" - dev-python/setuptools-git[${PYTHON_USEDEP}] - test? ( - >=dev-python/passlib-1.6[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/twine[${PYTHON_USEDEP}] - dev-python/webtest[${PYTHON_USEDEP}] - ) -" - -DOCS=( README.rst ) - -distutils_enable_tests pytest - -python_test() { - local EPYTEST_DESELECT=( - # Internet - tests/test_server.py::test_hash_algos - tests/test_server.py::test_pipInstall_openOk - tests/test_server.py::test_pipInstall_authedOk - # TODO - tests/test_app.py::test_root_count - tests/test_server.py::test_pip_install_open_succeeds - tests/test_server.py::test_pip_install_authed_succeeds - ) - - epytest tests -} -- cgit v1.2.3