gentoo resync : 25.08.2020

5 files changed, 28 insertions, 102 deletions

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 105b614cbbba..7bb44b61d47d 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,6 +1,3 @@
-AUX pipenv-2020.4.1_beta1-disable-networked-tests.patch 1326 BLAKE2B 35d6850eaff8346016fb8ad2d847466185e92a6cd1879a8bcc8cfed6cfbb97b43ff976b0bb400891287720e2cce3df9cf19472acd5df85d2df6b331046ea01f7 SHA512 1a19a0c19e2cc6bf4c017a17c588a8d3685003a01f2621d9ddf87938935fd76a8f9d8ffd36efc70dbfc3323c739561a67941e10b22f032f4c2020f3ba8cfaf10
-DIST pipenv-2018.11.26.tar.gz 6560580 BLAKE2B a3846de696733b5f3f393163999d7f333b52accdcebadfd800507defd1108ac4ccb288b39fb805ecf03e417cfe0d1a8b2fc714a95e8ee4485f8622ff8fe4a1ca SHA512 59582ad4a0730083ea58867f7a5d9714290d62947f56bec80e154d4359fe1dff16e44974a7fba3841e5f2516f2ce9709baf9954c9fc40fd66ebc46c3060d4dea
-DIST pipenv-2020.4.1_beta1.tar.gz 11331009 BLAKE2B 55ac81238b885bdf0293199ca1caf44a78f3cdbec75c9df259411b949dec8b385161e7ef46160ca099ef51041410d8c5d1274ad200eba5c2a9d06c8a5f61c5f1 SHA512 a5de90ae9910a30666ac7323ccf83b78ee11d8993aef1a2108a44f4256d365d0c1abfff72c83748ef82215914931090c670a10eeb511cb48483762b54c80e5c7
-EBUILD pipenv-2018.11.26.ebuild 975 BLAKE2B 8fa22f7dd1b7408096ae96ce93051e3b5ddc72438a1e398ef6c7df11447fa7998b633c3df52ba75ce15fb4623aa0f69fdc48c9b5a199429eb56b9dc8a419b6f2 SHA512 55feb0ce1250ca45e4aa63a0a4c88d410f8ac219c1db07f51ad6ccc1279b8c3267d4f2f0cea586539da55bdb7935509ea505da243d1d7dac71ed9715e2138efc
-EBUILD pipenv-2020.4.1_beta1.ebuild 1192 BLAKE2B 65a48723db56713ecdfd3b1f9f2474aded7d188bb3c2ee56353d6a041b1ab132b38d530a5db73eb6c6b3d31358152a83d9542995ef5006725208e0621dd01b9a SHA512 e152dc3cc59d1deef7ef10e8499ac610607e238af6dfd400dbc710f8b23abdffd23995c2adc8d59b22a11fbeaba7ec7e15e31d43791ad0efa78685d14a4cd3d9
-MISC metadata.xml 365 BLAKE2B 9be07839eb6a0126b586877cbe691e906850e5310535e7d3ce91bfad2ebcb4c28d9071a6b131d99310b6802ba6ebe026c90d1e94ac3f2f189d775181aea5b997 SHA512 dd94c56de88065dca0d2f49493b25b5fec1d9eb19e3dd8475b4213f6f3af3f7163535430fd6098dca78ba00c2deae2db454774797b4babe3d72ded3a1258cd0a
+DIST pipenv-2020.6.2.tar.gz 11571734 BLAKE2B bc50535f215b11d284eeec546722a144cfdfeeab6abab8eae51c727c054865f274ac970dc61c23cce7db19ac28a77e44a84453743ba2dc75068feb3a47a19190 SHA512 671765b9e77a18039668eb500989de45c8bd4f15948ee914eb241985098562ebd382168a535a449ac5d216f07327b6787eb8f828b5a6499ef6e77fe5a036441e
+EBUILD pipenv-2020.6.2.ebuild 1346 BLAKE2B c546dcb33a2b6d51054c9f79473bf4f141ab4d07e78663871baba96811cf93dc9db48793e542cf63932258bb10d180bd42aa6bb28573d9f67486d968d674e0b6 SHA512 4ac51e70b7e9c2ca15c2623b19d46de8c74fb198ceb7d8bb7ccd1ab9dc07ca0ebc5a095a7997888e80ec8569de5a5abd3055d92eb83db0c7683ad04275ee5b45
+MISC metadata.xml 587 BLAKE2B 1e496afc6cd4106ead561a0becf969fb53c85b1b874f161e94c4292b4a749ee412333ad3f148d1fd490b71ad5ac23dee363ed8533f72df4444b9928e725a8aa9 SHA512 61da4c2a68ea2727787337ba59a0a1029dec322336c174bbc1697d033ae79f67ea1f3cf694acc18c50d40e5d9807245847d92dc6c9adca1d9b80d23894af9620
diff --git a/dev-python/pipenv/files/pipenv-2020.4.1_beta1-disable-networked-tests.patch b/dev-python/pipenv/files/pipenv-2020.4.1_beta1-disable-networked-tests.patch
deleted file mode 100644
index f3ba4ff6502f..000000000000
--- a/dev-python/pipenv/files/pipenv-2020.4.1_beta1-disable-networked-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7cf8c7ee7eaba1b5a11562a7ef656b0606383fe8 Mon Sep 17 00:00:00 2001
-From: Oz Tiram <oz.tiram@gmail.com>
-Date: Mon, 4 May 2020 21:52:09 +0000
-Subject: [PATCH] Disable test cases that requires network
-
----
- tests/unit/test_utils.py | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
-
-diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
-index 4b9cd75c..1c73964b 100644
---- a/tests/unit/test_utils.py
-+++ b/tests/unit/test_utils.py
-@@ -47,16 +47,6 @@ DEP_PIP_PAIRS = [
-         },
-         "-e svn+svn://svn.myproject.org/svn/MyProject#egg=MyProject",
-     ),
--    (
--        # Extras in url
--        {
--            "discord.py": {
--                "file": "https://github.com/Rapptz/discord.py/archive/async.zip",
--                "extras": ["voice"],
--            }
--        },
--        "https://github.com/Rapptz/discord.py/archive/async.zip#egg=discord.py[voice]",
--    ),
-     (
-         {
-             "requests": {
-@@ -222,6 +212,7 @@ class TestUtils:
-         assert pipenv.utils.is_valid_url(url)
-         assert pipenv.utils.is_valid_url(not_url) is False
- 
-+    @pytest.mark.skip("Network required. Gentoo tests run in a sendbox without network")
-     @pytest.mark.utils
-     def test_download_file(self):
-         url = "https://github.com/pypa/pipenv/blob/master/README.md"
--- 
-2.26.2
-
diff --git a/dev-python/pipenv/metadata.xml b/dev-python/pipenv/metadata.xml
index e34e2c7e0ac9..912ba1f0a50b 100644
--- a/dev-python/pipenv/metadata.xml
+++ b/dev-python/pipenv/metadata.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
+  <maintainer type="person">
+    <email>oz.tiram@gmail.com</email>
+    <name>Oz Tiram</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pipenv</remote-id>
-    <maintainer status="unknown">
-      <email>me@kennethreitz.org</email>
-      <name>Kenneth Reitz</name>
+    <maintainer status="active">
+      <email>distutils-sig@python.org</email>
+      <name>Python Packaging Authority</name>
     </maintainer>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pipenv/pipenv-2018.11.26.ebuild b/dev-python/pipenv/pipenv-2018.11.26.ebuild
deleted file mode 100644
index 9e1ef31da4a4..000000000000
--- a/dev-python/pipenv/pipenv-2018.11.26.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
-	>dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	>=dev-python/parver-0.2[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# not completely packed
-# requires networking
-RESTRICT="test"
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/pipenv/pipenv-2020.4.1_beta1.ebuild b/dev-python/pipenv/pipenv-2020.6.2.ebuild
index 8182443641be..49b5811f9f01 100644
--- a/dev-python/pipenv/pipenv-2020.4.1_beta1.ebuild
+++ b/dev-python/pipenv/pipenv-2020.6.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
@@ -11,19 +12,23 @@ MY_PV=${PV/_beta/b}
 DESCRIPTION="Python Development Workflow for Humans"
 HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
 SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
 	>=dev-python/pip-18.0[${PYTHON_USEDEP}]
 	dev-python/virtualenv[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-36.2.1[${PYTHON_USEDEP}]"
-DEPEND="test? (
+	"
+
+BDEPEND="
+	test? (
 		${RDEPEND}
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
@@ -33,14 +38,13 @@ DEPEND="test? (
 		dev-python/pytz[${PYTHON_USEDEP}]
 	)"
 
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2020.4.1_beta1-disable-networked-tests.patch"
-)
+src_prepare() {
+	# remove vendored version of PyYAML that is backported to Python2
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/patched/yaml2/" || die
+	distutils-r1_src_prepare
+}
 
 python_test() {
-	pytest -m "not cli" -vv tests/unit || die
+	pytest -m "not cli and not needs_internet" -vv tests/unit || die
 }