gentoo resync : 15.06.2021

5 files changed, 241 insertions, 19 deletions

diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index c17132b950f4..7b5abfce2fbe 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,9 +1,12 @@
 AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
 AUX pip-21.1-no-coverage.patch 1905 BLAKE2B d09ebb459bd3f0d7d1f5194c635489aa162d5ed4f3fb75e1352eb80f96a49aef51e7d5e72859321f1558b6a6df9bd0000acdf653dd301a839891078e4a26dd16 SHA512 46afc9f5f290e3547bc18f104fae515a06163f622fd43f7b1e49ae47c720e4aa4fd01c97f171cab24305eddd71f5083ba1d3109a67f2f84e46e5320f4ab7f0bf
+AUX virtualenv-16.7.10-py310.patch 2829 BLAKE2B 3fe4387bd4a9bb4182e002643339692e63e98d0613c3cbec6b633699b2a1688652e00d6f31ec82eb399c7c87e0e80e8f8ff48dc0dbe38f84a7c6f74124e76950 SHA512 46074b0705048de5c7e0be2c6a3fb88f15553dbf44bf92d6e0f23fd18510f4d6a2689277299d748bfc3f44a6ba7eb9a32a5554052b391fe69714ce6ffc217ae9
 DIST pip-21.1.1.tar.gz 8771867 BLAKE2B 1cb920ab52510e816a7c3b8b6d1b47576a27cf1b208ab8fefa102ff36c09eb4e99b34f213a043550a9e6fb37bb8b6306f9e939371661ff7f23ba03f21b4a643b SHA512 05157ed586597f16948afdad43d98cc095803d2d22b1427ac1028ca2a73a26d65e597446808194343ed36f9eb7cb910ac89e73a6a9a90ee868ec822fdbe641c5
 DIST pip-21.1.2.tar.gz 8772481 BLAKE2B 23dbcc5dd7e7f66934282b9c93958267eb367d418b6c814032b7b89e0d94c73c143626781b8df081394019d2e575030b7a2fd61bb5221992ce2060cf069e8b04 SHA512 54a2b6074fcb2640868dedcabb5087b79a53a8ad57ec4ab5acf2862b8037403d8f156c2853ab60c2f10c6af999a0a90774f0bc3eca2978a82590935d37af167f
 DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4
+DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
-EBUILD pip-21.1.1.ebuild 3866 BLAKE2B 1a7e1ebbf174d15f7fc734b8da623457d9d0d73816a31a215be8d379e0d456d051d097c4a970fcf4e1fbc929ec15704f2fab961df0facc67b79143b1ed0f72db SHA512 854a70b497255438d54310a9283c2cbcc99b8f7b5fc53bf4171a29600bbb43343d2e9941e43c9909654c0ff7dd5fd9a667b848c92817f3ab513a1dae50552f66
-EBUILD pip-21.1.2.ebuild 3841 BLAKE2B e4d61f31d5555e59be6c660220355d3d5270abf1a0f9bce65ced34b198c1f5099d140b2de9a4fa86de324a6954308256b5caa44dbf30cfea137457efac5ca6d9 SHA512 96753c898c2353f70bd2e5fd692620bc86ecb6e01de4a576c6865af0eda91c319ff8cd63f7f7862a6b6434e5c05d7a073f34d812cde1a55898483de4f08d937b
+EBUILD pip-21.1.1.ebuild 3754 BLAKE2B 979669f7889a5d82a403fd6cf0178b63fb8b43a5f19fc371639a890f59ec0c86d5bbe42bb482633a528377208e85bc55c4c6d7e21c35d7cec9238586f44960a8 SHA512 668fdd1bda3539eb16880ddbd328eb9f99bba874418ea27a354eae0cdf7bf4b949b7c828ad833209b8fe8e371fb3355b5424abdc5e35e29bd9509df3374ea223
+EBUILD pip-21.1.2-r1.ebuild 4405 BLAKE2B 5c61b37de4c8be7f2bffaf54d6168f79d65ae088d9c9fc1f8f0a0f60b11fafbdee889037bbe47354b74a5d14d449870ffc8e2666695903dd159d7d7047427321 SHA512 424fdab07a6e752b2d577928399fd5fb150f214b9689a41bec6422c005638d4948d0ecf4d40ccf19e10893f08c3775a5d2f756c001f3b5d0317c87bf777af082
+EBUILD pip-21.1.2.ebuild 3994 BLAKE2B 16a6bf8f16ed81043c5eed3c87e3509ee9519a722e20c22d14656da3ff2a73fc2d7afca29bb2865535bf64cd80117cb53b3c72bb828a740707d90b6fc5a3e588 SHA512 d47c5f2d4b7a0b191b00aca13b5db55b893d3507420e220b69f8b01c06495eed6237587268a469b1dd9fb777fa0139296d0093bf518467fda5320712fb5da236
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/files/virtualenv-16.7.10-py310.patch b/dev-python/pip/files/virtualenv-16.7.10-py310.patch
new file mode 100644
index 000000000000..27c17a07445f
--- /dev/null
+++ b/dev-python/pip/files/virtualenv-16.7.10-py310.patch
@@ -0,0 +1,84 @@
+From b4aef0a53ba63c34e45413754705af4e438ef5df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Wed, 5 May 2021 10:59:02 +0200
+Subject: [PATCH] Legacy: Use sysconfig.get_default_scheme() where available
+ (#2109)
+
+---
+ .pre-commit-config.yaml      | 43 ------------------------------------
+ docs/changelog/2109.misc.rst |  1 +
+ virtualenv.py                |  3 ++-
+ 3 files changed, 3 insertions(+), 44 deletions(-)
+ delete mode 100644 .pre-commit-config.yaml
+ create mode 100644 docs/changelog/2109.misc.rst
+
+diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
+deleted file mode 100644
+index 0b8234b7d..000000000
+--- a/.pre-commit-config.yaml
++++ /dev/null
+@@ -1,43 +0,0 @@
+-repos:
+--   repo: https://github.com/ambv/black
+-    rev: 19.10b0
+-    hooks:
+-    -   id: black
+-        args: [--safe]
+-        language_version: python3.8
+--   repo: https://github.com/asottile/blacken-docs
+-    rev: v1.3.0
+-    hooks:
+-    -   id: blacken-docs
+-        additional_dependencies: [black==19.3b0]
+-        language_version: python3.8
+--   repo: https://github.com/asottile/seed-isort-config
+-    rev: v1.9.3
+-    hooks:
+-    -   id: seed-isort-config
+-        args: [--application-directories, '.']
+--   repo: https://github.com/pre-commit/mirrors-isort
+-    rev: v4.3.21
+-    hooks:
+-    -   id: isort
+--   repo: https://github.com/pre-commit/pre-commit-hooks
+-    rev: v2.4.0
+-    hooks:
+-    -   id: trailing-whitespace
+-    -   id: end-of-file-fixer
+-    -   id: check-yaml
+-    -   id: debug-statements
+-    -   id: check-merge-conflict
+-    -   id: trailing-whitespace
+-    -   id: check-docstring-first
+-    -   id: flake8
+-        additional_dependencies: ["flake8-bugbear == 19.8.0"]
+-        language_version: python3.8
+--   repo: https://github.com/asottile/pyupgrade
+-    rev: v1.25.1
+-    hooks:
+-    -   id: pyupgrade
+--   repo: https://github.com/pre-commit/pygrep-hooks
+-    rev: v1.4.2
+-    hooks:
+-    -   id: rst-backticks
+diff --git a/docs/changelog/2109.misc.rst b/docs/changelog/2109.misc.rst
+new file mode 100644
+index 000000000..985f955df
+--- /dev/null
++++ b/docs/changelog/2109.misc.rst
+@@ -0,0 +1 @@
++Preserve compatibility with Python 3.10 - by ``hroncok``
+diff --git a/virtualenv.py b/virtualenv.py
+index 3085d1d18..86aa65674 100755
+--- a/virtualenv.py
++++ b/virtualenv.py
+@@ -1809,7 +1809,8 @@ def fix_local_scheme(home_dir, symlink=True):
+         pass
+     else:
+         # noinspection PyProtectedMember
+-        if sysconfig._get_default_scheme() == "posix_local":
++        get_scheme = getattr(sysconfig, "get_default_scheme", None) or sysconfig._get_default_scheme
++        if get_scheme() == "posix_local":
+             local_path = os.path.join(home_dir, "local")
+             if not os.path.exists(local_path):
+                 os.mkdir(local_path)
diff --git a/dev-python/pip/pip-21.1.1.ebuild b/dev-python/pip/pip-21.1.1.ebuild
index e9149813910e..461915435ffe 100644
--- a/dev-python/pip/pip-21.1.1.ebuild
+++ b/dev-python/pip/pip-21.1.1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 LICENSE="MIT"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
-IUSE="test -vanilla"
+IUSE="test vanilla"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -40,12 +40,9 @@ BDEPEND="
 	${RDEPEND}
 	test? (
 		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/csv23[${PYTHON_USEDEP}]
 		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pretend[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/scripttest[${PYTHON_USEDEP}]
 		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
 		dev-python/werkzeug[${PYTHON_USEDEP}]
diff --git a/dev-python/pip/pip-21.1.2-r1.ebuild b/dev-python/pip/pip-21.1.2-r1.ebuild
new file mode 100644
index 000000000000..6dddd21d4f6a
--- /dev/null
+++ b/dev-python/pip/pip-21.1.2-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1
+
+# setuptools & wheel .whl files are required for testing,
+# the exact version is not very important.
+SETUPTOOLS_WHL="setuptools-56.0.0-py3-none-any.whl"
+WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
+# upstream still requires virtualenv-16 for testing, we are now fetching
+# it directly to avoid blockers with virtualenv-20
+VENV_PV=16.7.10
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/"
+SRC_URI="
+	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
+		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
+		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
+			-> virtualenv-${VENV_PV}.tar.gz
+	)
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="test vanilla"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/scripttest[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-21.1-no-coverage.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
+	fi
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/ || die
+		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
+			tests/data/common_wheels/ || die
+
+		pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
+		eapply "${FILESDIR}/virtualenv-${VENV_PV}-py310.patch"
+		popd >/dev/null || die
+	fi
+}
+
+python_test() {
+	if [[ ${EPYTHON} == pypy* ]]; then
+		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
+		return 0
+	fi
+
+	local deselect=(
+		tests/functional/test_install.py::test_double_install_fail
+		tests/functional/test_list.py::test_multiple_exclude_and_normalization
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
+		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
+		# Internet
+		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
+	)
+
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		tests/lib/test_lib.py::test_correct_pip_version
+		# uses vendored packaging that uses deprecated distutils
+		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
+	)
+
+	distutils_install_for_testing
+	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	local -x GENTOO_PIP_TESTING=1 \
+		PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
+	epytest ${deselect[@]/#/--deselect } -m "not network"
+}
+
+python_install_all() {
+	# Prevent dbus auto-launch
+	# https://bugs.gentoo.org/692178
+	export DBUS_SESSION_BUS_ADDRESS="disabled:"
+
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())'
+
+	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
+	insinto /usr/share/zsh/site-functions
+	newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pip/pip-21.1.2.ebuild b/dev-python/pip/pip-21.1.2.ebuild
index 5aaeef43de3e..7ca3bf655d51 100644
--- a/dev-python/pip/pip-21.1.2.ebuild
+++ b/dev-python/pip/pip-21.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit bash-completion-r1 distutils-r1
@@ -29,7 +29,7 @@ SRC_URI="
 LICENSE="MIT"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 SLOT="0"
-IUSE="test -vanilla"
+IUSE="test vanilla"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -38,17 +38,16 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/csv23[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/cryptography[${PYTHON_USEDEP}]
+			dev-python/freezegun[${PYTHON_USEDEP}]
+			dev-python/pretend[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/scripttest[${PYTHON_USEDEP}]
+			<dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/werkzeug[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{7..9})
 	)
 "
 
@@ -75,6 +74,12 @@ python_test() {
 		return 0
 	fi
 
+	# virtualenv-16 doesn't support python3_10 yet is still required by pip test suite
+	if [[ ${EPYTHON} == "python3.10" ]]; then
+		ewarn "Skipping tests on ${EPYTHON} due to missing dependencies"
+		return 0
+	fi
+
 	local deselect=(
 		tests/functional/test_install.py::test_double_install_fail
 		tests/functional/test_list.py::test_multiple_exclude_and_normalization