gentoo resync : 15.12.2019

4 files changed, 149 insertions, 0 deletions

diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
new file mode 100644
index 000000000000..1235ac718c21
--- /dev/null
+++ b/dev-python/pypiserver/Manifest
@@ -0,0 +1,4 @@
+AUX pypiserver-1.3.1-no-internet.patch 3125 BLAKE2B bf6d0891897d1a7cfea6151df1ad274cda77dde74d85e355a2fb00815513cd612c1af393b4397ce5fa946634397980127545fba3a657e5a9def9eb50136ed12f SHA512 7775abae4f70e45888450a4dce6f55858b7d48d4c7bdfc9f1653319a65608fdc26010040b0beb781a5aa9e0804f016fb56405290426b85724e29177a68658b06
+DIST pypiserver-1.3.1.tar.gz 504875 BLAKE2B 18089a1d18ace55038fb2b114a3402ce1352139a858a2e32399ad36ef0cbe5dfcf9bbdb865807ea84330405bdd4da1c00265e095b7299fe2b9f56150d573f7d9 SHA512 425a557eb74111fb07911cacd275dfa35b8e8ba5e9f230ca5f86500c10b2ab33235eb3376150c75972de3d8ebd85b03ecdf935753b0af46936a78311d5f174a7
+EBUILD pypiserver-1.3.1-r1.ebuild 985 BLAKE2B 7e75419c2d8bfe150bf2c5ba46eaab4e6bc895c8b30a7ee17bebd3b8b4b6900589e5b6a4c0e7886f0783b362422b683fb50973a0ca33b3d51f6e12409e3e91d4 SHA512 54d4c3b91b3dd6ce17b3b9ba6da4d2fbec22b9ca284dd12e8132e51293d5c69f9bb5447debe9c427f8eb2dbbd2ad7bae1d2115d23978b26ce17a6a2922de62b0
+MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pypiserver/files/pypiserver-1.3.1-no-internet.patch b/dev-python/pypiserver/files/pypiserver-1.3.1-no-internet.patch
new file mode 100644
index 000000000000..2df183f6404f
--- /dev/null
+++ b/dev-python/pypiserver/files/pypiserver-1.3.1-no-internet.patch
@@ -0,0 +1,90 @@
+diff --git a/tests/test_app.py b/tests/test_app.py
+index 52ce234..46cd23a 100644
+--- a/tests/test_app.py
++++ b/tests/test_app.py
+@@ -2,6 +2,7 @@
+ 
+ # Builtin imports
+ import logging
++import unittest
+ 
+ 
+ try:  # python 3
+@@ -177,6 +178,7 @@ def test_favicon(testapp):
+     testapp.get("/favicon.ico", status=404)
+ 
+ 
++@unittest.skip("Requires internet access")
+ def test_fallback(root, _app, testapp):
+     assert _app.config.redirect_to_fallback
+     resp = testapp.get("/simple/pypiserver/", status=302)
+diff --git a/tests/test_manage.py b/tests/test_manage.py
+index 9735ac6..bde267d 100755
+--- a/tests/test_manage.py
++++ b/tests/test_manage.py
+@@ -118,6 +118,7 @@ def test_pip_cmd_root(pip_ver, cmd_type):
+     assert tuple(PipCmd.update_root(pip_ver)) == exp_cmd
+ 
+ 
++@pytest.mark.skip(reason="Requires internet access")
+ def test_pip_cmd_update():
+     """Verify the correct determination of a pip command."""
+     index = 'https://pypi.org/simple'
+@@ -138,6 +139,7 @@ def test_pip_cmd_update():
+     )
+ 
+ 
++@pytest.mark.skip(reason="Requires internet access")
+ def test_pip_cmd_update_index_overridden():
+     """Verify the correct determination of a pip command."""
+     index = 'https://pypi.org/complex'
+@@ -156,6 +158,7 @@ def test_pip_cmd_update_index_overridden():
+     )
+ 
+ 
++@pytest.mark.skip(reason="Requires internet access")
+ def test_update_package(monkeypatch):
+     """Test generating an update command for a package."""
+     monkeypatch.setattr(manage, 'call', Mock())
+diff --git a/tests/test_server.py b/tests/test_server.py
+index 6cb4bc4..6325b6f 100644
+--- a/tests/test_server.py
++++ b/tests/test_server.py
+@@ -275,7 +275,6 @@ def twine_register(packages, repository='test', conf='pypirc',
+ # Tests
+ # ######################################################################
+ 
+-
+ def test_pipInstall_packageNotFound(empty_packdir, port, pipdir, package):
+     with new_server(empty_packdir, port):
+         cmd = "centodeps"
+@@ -283,18 +282,21 @@ def test_pipInstall_packageNotFound(empty_packdir, port, pipdir, package):
+         assert not pipdir.listdir()
+ 
+ 
++@pytest.mark.skip(reason="Needs internet")
+ def test_pipInstall_openOk(open_server, package, pipdir):
+     cmd = "centodeps"
+     assert _run_pip_install(cmd, open_server.port, pipdir) == 0
+     assert pipdir.join(package.basename).check()
+ 
+ 
++@pytest.mark.skip(reason="Needs internet")
+ def test_pipInstall_authedFails(protected_server, pipdir):
+     cmd = "centodeps"
+     assert _run_pip_install(cmd, protected_server.port, pipdir) != 0
+     assert not pipdir.listdir()
+ 
+ 
++@pytest.mark.skip(reason="Needs internet")
+ def test_pipInstall_authedOk(protected_server, package, pipdir):
+     cmd = "centodeps"
+     assert _run_pip_install(cmd, protected_server.port, pipdir,
+@@ -395,6 +397,7 @@ def test_twine_upload_open(empty_packdir, port, package):
+     assert len(empty_packdir.listdir()) == 1
+ 
+ 
++@pytest.mark.skip(reason="needs internet")
+ @pytest.mark.parametrize("hash_algo", ("md5", "sha256", "sha512"))
+ def test_hash_algos(empty_packdir, port, package, pipdir, hash_algo):
+     """Test twine upload with no authentication"""
diff --git a/dev-python/pypiserver/metadata.xml b/dev-python/pypiserver/metadata.xml
new file mode 100644
index 000000000000..e3205b37b69e
--- /dev/null
+++ b/dev-python/pypiserver/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-services</remote-id>
+		<remote-id type="github">pytest-dev/pytest-services</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..66f4301a9b69
--- /dev/null
+++ b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+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="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	test? (
+		dev-python/passlib[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.3[${PYTHON_USEDEP}]
+		dev-python/twine[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/pypiserver-1.3.1-no-internet.patch"
+)
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -r \
+		-e "s:[\"']tox[\"'](,|$)::" \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}