gentoo resync : 16.09.2020

3 files changed, 2 insertions, 93 deletions

diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index e3cee37aadd7..3f1c7f0f7a96 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,4 +1,3 @@
-AUX pypiserver-1.3.1-no-internet.patch 3125 BLAKE2B bf6d0891897d1a7cfea6151df1ad274cda77dde74d85e355a2fb00815513cd612c1af393b4397ce5fa946634397980127545fba3a657e5a9def9eb50136ed12f SHA512 7775abae4f70e45888450a4dce6f55858b7d48d4c7bdfc9f1653319a65608fdc26010040b0beb781a5aa9e0804f016fb56405290426b85724e29177a68658b06
 DIST pypiserver-1.3.2.tar.gz 505905 BLAKE2B 4e62d11cf280524d532e793d3ffc4dc59f1e72c6aba2ed6bd0d70f86104162dc60377b56e08676ab03326c33885acae698dc60b435426b195f13bf9f60bb7b8c SHA512 de823376f7711bfdaff3a1acefae37e1d7528802203929b8aeb8790c2b1c466badaf5a1d5084100bc37f41636d2cdfc2038cd3ad9805d15ca42c80834760b4da
-EBUILD pypiserver-1.3.2.ebuild 1210 BLAKE2B fce159dbde950c324a3a547e2f16bf8faa0e38c09aa219f60feb8262afe0bbfe287439a00c5d8f72a94dbe0d4095af4c5d8b5c6ed0ffa219f22b5992fd99791a SHA512 013d17c06d4d3ae3f78b093e4fce404726a0090cea4cb7346fd8fb5696df297f84bb1c295042ec6804389f68fb19543cceb080ca1fc3616c6d1d3e27a2063420
+EBUILD pypiserver-1.3.2.ebuild 1217 BLAKE2B 82709cfe793d656ac79e96bc04ee307a2599169dbb4bdb834d2f806d9644646f247639b251b4eb6a3bbb1d8fc4b7d055d2c1207c6d4adc2974aa678310255543 SHA512 17b339a073f45b18e8b21830684222de20b5d89d78d11f55dfdf630b0c71f6d1c1dfa4166470f4b305c19dadf24414c7f768466ca35d721245e6d0bc768d25f4
 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
deleted file mode 100644
index 2df183f6404f..000000000000
--- a/dev-python/pypiserver/files/pypiserver-1.3.1-no-internet.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-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/pypiserver-1.3.2.ebuild b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
index cb7e56092aea..13964332829d 100644
--- a/dev-python/pypiserver/pypiserver-1.3.2.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
@@ -13,7 +13,7 @@ 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 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 
 RDEPEND="