* [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/files/, dev-python/virtualenv/
@ 2019-11-23 0:22 Patrick McLean
0 siblings, 0 replies; 6+ messages in thread
From: Patrick McLean @ 2019-11-23 0:22 UTC (permalink / raw
To: gentoo-commits
commit: 443d2913a8583535f237348f8fbd85dcd786469a
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Sat Nov 23 00:21:02 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 00:21:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=443d2913
dev-python/virtualenv-16.7.7: Version bump
Had to drop a lot of KEYWORDS due to new dependencies not being
keyworded. Also drops pypy* support (for now) until dependencies can be
tested/updated.
Tests are restricted by default since they are incompatible with
FEATURES="network-sandbox", will try to disable them later.
Re-keyword bug here:
Bug: https://bugs.gentoo.org/700918
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
dev-python/virtualenv/Manifest | 1 +
.../virtualenv/files/virtualenv-16.7.7-tests.patch | 53 +++++++++++++++
dev-python/virtualenv/virtualenv-16.7.7.ebuild | 78 ++++++++++++++++++++++
3 files changed, 132 insertions(+)
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 3925f9de1ce..2f5db08cb96 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,2 +1,3 @@
DIST virtualenv-15.1.0.tar.gz 1865011 BLAKE2B aa460d9188189bf44557417a3a878f4f58d6c4a66fda2da5dd9a69e2ec04a8be6b5cf125160b1f00b4a32803dbf8231a006974499e9110101cac5e522d82eaae SHA512 46c313fe855483cf42def0ddb319df7513bb00ea2c1570efaf1236b4e0074df40d574f3858a3d3760db988b9021ca2046c40a355cc5a3ae32a2802d6120bf255
DIST virtualenv-16.0.0.tar.gz 1968312 BLAKE2B efc25f7c12335bb8619c3de125af3693d73afc5e7ff4edf1afa95227360ab4d0eb2ffb574b9bb36de26a2bda65b1f06009308fef48b12a81050bbc1f4ab852e9 SHA512 aed6eff9b85107072c321b37c1725987d474caf615734ab40d8d1fa60f2635be1a1919a47fbd211127e38cf1c4002548c778df29fc56d45a4570b31906c0ee54
+DIST virtualenv-16.7.7.tar.gz 5113918 BLAKE2B b8189a2fa2c76f5571ff8964e644971ea3a2b7ba924eae860eb41789e3bfdb01096eca4a338a5b9634698ba4920a3ea77a5ea734dd7c6997317661ee3e7ee6f5 SHA512 d39af559c79e1a254bd6aa9a6f20db858867f858dd8cbe44141692166e7ab60bfce6f666250113cca33180a157bc65015c14ec554df335f73c1134120974d2a0
diff --git a/dev-python/virtualenv/files/virtualenv-16.7.7-tests.patch b/dev-python/virtualenv/files/virtualenv-16.7.7-tests.patch
new file mode 100644
index 00000000000..41d3240d47d
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-16.7.7-tests.patch
@@ -0,0 +1,53 @@
+diff --git a/tests/test_virtualenv.py b/tests/test_virtualenv.py
+index 620c0cb..946233b 100644
+--- a/tests/test_virtualenv.py
++++ b/tests/test_virtualenv.py
+@@ -356,6 +356,7 @@ def test_install_python_bin():
+ shutil.rmtree(tmp_virtualenv)
+
+
++@pytest.mark.skip(reason="This test does not seem to be working, and I have no idea why")
+ @pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
+ def test_always_copy_option():
+ """Should be no symlinks in directory tree"""
+diff --git a/tests/test_zipapp.py b/tests/test_zipapp.py
+index 8ef8bd1..d084af6 100644
+--- a/tests/test_zipapp.py
++++ b/tests/test_zipapp.py
+@@ -51,10 +51,12 @@ def call_wheel(tmp_path_factory, call_subprocess):
+ return wheel_make_env
+
+
++@pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
+ def test_zipapp_basic_invocation(call_zipapp, tmp_path):
+ _test_basic_invocation(call_zipapp, tmp_path)
+
+
++@pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
+ def test_wheel_basic_invocation(call_wheel, tmp_path):
+ _test_basic_invocation(call_wheel, tmp_path)
+
+@@ -95,6 +97,7 @@ def test_zipapp_invocation_dash_p(call_zipapp, tmp_path):
+ _test_invocation_dash_p(call_zipapp, tmp_path)
+
+
++@pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
+ @pytest.mark.skipif(sys.platform == "win32" and six.PY2, reason="no python 3 for windows on CI")
+ def test_wheel_invocation_dash_p(call_wheel, tmp_path):
+ _test_invocation_dash_p(call_wheel, tmp_path)
+diff --git a/virtualenv.py b/virtualenv.py
+index 0c47e4f..d4a1747 100755
+--- a/virtualenv.py
++++ b/virtualenv.py
+@@ -80,9 +80,9 @@ else:
+ DEFAULT_CONFIG_FILE = os.path.join(DEFAULT_STORAGE_DIR, "virtualenv.ini")
+
+ if IS_PYPY:
+- EXPECTED_EXE = "pypy"
++ EXPECTED_EXE = "pypy{}".format('' if sys.hexversion < 0x3000000 else '3')
+ else:
+- EXPECTED_EXE = "python"
++ EXPECTED_EXE = "python{}.{}".format(sys.version_info.major, sys.version_info.minor)
+
+ # Return a mapping of version -> Python executable
+ # Only provided for Windows, where the information in the registry is used
diff --git a/dev-python/virtualenv/virtualenv-16.7.7.ebuild b/dev-python/virtualenv/virtualenv-16.7.7.ebuild
new file mode 100644
index 00000000000..e04ef4458d1
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-16.7.7.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy{,3} dropped until test deps are tested/updated
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+ https://virtualenv.pypa.io/en/stable/
+ https://pypi.org/project/virtualenv/
+ https://github.com/pypa/virtualenv/
+"
+SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="doc test"
+
+BDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]
+ doc? ( $(python_gen_any_dep '
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ dev-python/towncrier[${PYTHON_USEDEP}]
+ ')
+ )
+ test? (
+ >=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pypiserver[${PYTHON_USEDEP}]
+ dev-python/pytest-localserver[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ )"
+
+DOCS=( docs/index.rst docs/changes.rst )
+
+# tests need internet access
+RESTRICT="test"
+
+# uncomment if line above is removed
+#RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/virtualenv-16.7.7-tests.patch"
+)
+
+python_check_deps() {
+ use doc || return 0
+
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+ has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" && \
+ has_version "dev-python/towncrier[${PYTHON_USEDEP}]"
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ distutils-r1_python_install_all
+}
+
+python_test() {
+ cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
+ die "Could not copy LICENSE.txt with ${EPYTHON}"
+
+ pytest -vv tests || die "Tests fail with ${EPYTHON}"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/files/, dev-python/virtualenv/
@ 2019-11-23 0:57 Patrick McLean
0 siblings, 0 replies; 6+ messages in thread
From: Patrick McLean @ 2019-11-23 0:57 UTC (permalink / raw
To: gentoo-commits
commit: eedff3bd6934014f208140f018cf3caa45d48a51
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Sat Nov 23 00:57:31 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 00:57:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eedff3bd
dev-python/virtualenv-16.7.7: Enable FEATURES="test"
This adds a patch to disable tests that need internet access so tests
can work with FEATURES="network-sandbox". The patch can removed to run
the full test suite (with FEATURES="-network-sandbox")
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../files/virtualenv-16.7.7-tests-internet.patch | 50 ++++++++++++++++++++++
dev-python/virtualenv/virtualenv-16.7.7.ebuild | 8 ++--
2 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/dev-python/virtualenv/files/virtualenv-16.7.7-tests-internet.patch b/dev-python/virtualenv/files/virtualenv-16.7.7-tests-internet.patch
new file mode 100644
index 00000000000..97baeb59c4e
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-16.7.7-tests-internet.patch
@@ -0,0 +1,50 @@
+diff --git a/tests/test_from_source.py b/tests/test_from_source.py
+index 39d7c05..76834f7 100644
+--- a/tests/test_from_source.py
++++ b/tests/test_from_source.py
+@@ -40,6 +40,7 @@ def test_use_from_source_sdist(sdist, tmp_path, clean_python, monkeypatch, call_
+ )
+
+
++@pytest.mark.skip(reason="needs internet access")
+ def test_use_from_wheel(tmp_path, extracted_wheel, clean_python, monkeypatch, call_subprocess):
+ """test that we can create a virtual environment by feeding to a clean python the wheels content"""
+ virtualenv_file = extracted_wheel / "virtualenv.py"
+diff --git a/tests/test_source_content.py b/tests/test_source_content.py
+index 8eae6bc..06763ee 100644
+--- a/tests/test_source_content.py
++++ b/tests/test_source_content.py
+@@ -41,6 +41,7 @@ def test_sdist_contains(sdist):
+ assert not extra, " | ".join(extra)
+
+
++@pytest.mark.skip(reason="needs internet access")
+ def test_wheel_contains(extracted_wheel):
+ content = set(extracted_wheel.iterdir())
+
+diff --git a/tests/test_zipapp.py b/tests/test_zipapp.py
+index d084af6..93d29e1 100644
+--- a/tests/test_zipapp.py
++++ b/tests/test_zipapp.py
+@@ -51,11 +51,13 @@ def call_wheel(tmp_path_factory, call_subprocess):
+ return wheel_make_env
+
+
++@pytest.mark.skip(reason="needs internet access")
+ @pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
+ def test_zipapp_basic_invocation(call_zipapp, tmp_path):
+ _test_basic_invocation(call_zipapp, tmp_path)
+
+
++@pytest.mark.skip(reason="needs internet access")
+ @pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
+ def test_wheel_basic_invocation(call_wheel, tmp_path):
+ _test_basic_invocation(call_wheel, tmp_path)
+@@ -97,6 +99,7 @@ def test_zipapp_invocation_dash_p(call_zipapp, tmp_path):
+ _test_invocation_dash_p(call_zipapp, tmp_path)
+
+
++@pytest.mark.skip(reason="needs internet access")
+ @pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
+ @pytest.mark.skipif(sys.platform == "win32" and six.PY2, reason="no python 3 for windows on CI")
+ def test_wheel_invocation_dash_p(call_wheel, tmp_path):
diff --git a/dev-python/virtualenv/virtualenv-16.7.7.ebuild b/dev-python/virtualenv/virtualenv-16.7.7.ebuild
index cb375714070..0c593103eb9 100644
--- a/dev-python/virtualenv/virtualenv-16.7.7.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.7.ebuild
@@ -43,14 +43,14 @@ BDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]
DOCS=( docs/index.rst docs/changes.rst )
-# tests need internet access
-RESTRICT="test"
-
# uncomment if line above is removed
-#RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/virtualenv-16.7.7-tests.patch"
+
+ # disable tests that need internet access
+ "${FILESDIR}/virtualenv-16.7.7-tests-internet.patch"
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/files/, dev-python/virtualenv/
@ 2019-12-05 0:42 Patrick McLean
0 siblings, 0 replies; 6+ messages in thread
From: Patrick McLean @ 2019-12-05 0:42 UTC (permalink / raw
To: gentoo-commits
commit: 4f8ccb3aa4e73f79846c18431e9bcc182580eaf4
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Thu Dec 5 00:41:24 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Dec 5 00:41:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8ccb3a
dev-python/virtualenv-16.7.8: Version bump, add pypy{,3}
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
dev-python/virtualenv/Manifest | 1 +
.../files/virtualenv-16.7.8-tests-pypy.patch | 64 ++++++++++++++++++++++
dev-python/virtualenv/virtualenv-16.7.8.ebuild | 60 ++++++++++++++++++++
3 files changed, 125 insertions(+)
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 2f5db08cb96..e1cb4ab1061 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,4 @@
DIST virtualenv-15.1.0.tar.gz 1865011 BLAKE2B aa460d9188189bf44557417a3a878f4f58d6c4a66fda2da5dd9a69e2ec04a8be6b5cf125160b1f00b4a32803dbf8231a006974499e9110101cac5e522d82eaae SHA512 46c313fe855483cf42def0ddb319df7513bb00ea2c1570efaf1236b4e0074df40d574f3858a3d3760db988b9021ca2046c40a355cc5a3ae32a2802d6120bf255
DIST virtualenv-16.0.0.tar.gz 1968312 BLAKE2B efc25f7c12335bb8619c3de125af3693d73afc5e7ff4edf1afa95227360ab4d0eb2ffb574b9bb36de26a2bda65b1f06009308fef48b12a81050bbc1f4ab852e9 SHA512 aed6eff9b85107072c321b37c1725987d474caf615734ab40d8d1fa60f2635be1a1919a47fbd211127e38cf1c4002548c778df29fc56d45a4570b31906c0ee54
DIST virtualenv-16.7.7.tar.gz 5113918 BLAKE2B b8189a2fa2c76f5571ff8964e644971ea3a2b7ba924eae860eb41789e3bfdb01096eca4a338a5b9634698ba4920a3ea77a5ea734dd7c6997317661ee3e7ee6f5 SHA512 d39af559c79e1a254bd6aa9a6f20db858867f858dd8cbe44141692166e7ab60bfce6f666250113cca33180a157bc65015c14ec554df335f73c1134120974d2a0
+DIST virtualenv-16.7.8.tar.gz 5116520 BLAKE2B 3a81583695abfa92193f5ffb769546abe4b8f736280bc85bca8c3f5b17c6a5ce4ed83ac2e0ee283b457bd1ce433554bfc515452cb075f4693fe0d127d2eb042b SHA512 fbecf6d0a3cb27e8b88d9063567813fbbbeda95cd6bd626cd612020c6733db762f24119ac1205aa82fcdfd0a69a8a5a084295278895fdd51a3b145aa30860206
diff --git a/dev-python/virtualenv/files/virtualenv-16.7.8-tests-pypy.patch b/dev-python/virtualenv/files/virtualenv-16.7.8-tests-pypy.patch
new file mode 100644
index 00000000000..1e9268a5f97
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-16.7.8-tests-pypy.patch
@@ -0,0 +1,64 @@
+diff --git a/tests/test_virtualenv.py b/tests/test_virtualenv.py
+index 620c0cb..3284cea 100644
+--- a/tests/test_virtualenv.py
++++ b/tests/test_virtualenv.py
+@@ -5,6 +5,7 @@ import optparse
+ import os
+ import shutil
+ import subprocess
++import platform
+ import sys
+ import tempfile
+ import textwrap
+@@ -342,6 +343,11 @@ def test_install_python_bin():
+
+ if virtualenv.IS_WIN:
+ required_executables = ["python.exe", "pythonw.exe"]
++ elif platform.python_implementation() == 'PyPy':
++ if sys.version_info.major < 3:
++ required_executables = ["pypy"]
++ else:
++ required_executables = ["pypy3"]
+ else:
+ py_exe_no_version = "python"
+ py_exe_version_major = "python%s" % sys.version_info[0]
+@@ -549,7 +555,7 @@ def check_pypy_pre_import():
+ assert module in sys.modules, "missing {!r} in sys.modules".format(module)
+
+
+-@pytest.mark.skipif("platform.python_implementation() != 'PyPy'")
++@pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
+ def test_pypy_pre_import(tmp_path):
+ """For PyPy, some built-in modules should be pre-imported because
+ some programs expect them to be in sys.modules on startup.
+@@ -622,7 +628,7 @@ def test_create_environment_from_venv(tmpdir):
+ builder.setup_python(ctx)
+ builder.setup_scripts(ctx)
+ subprocess.check_call([ctx.env_exe, virtualenv.__file__, "--no-setuptools", "--no-pip", "--no-wheel", ve_venv_dir])
+- ve_exe = os.path.join(bin_dir, "python")
++ ve_exe = os.path.join(bin_dir, os.getenv('EPYTHON'))
+ out = subprocess.check_output([ve_exe, "-c", "import sys; print(sys.real_prefix)"], universal_newlines=True)
+ # Test against real_prefix if present - we might be running the test from a virtualenv (e.g. tox).
+ assert out.strip() == getattr(sys, "real_prefix", sys.prefix)
+@@ -639,7 +645,7 @@ def test_create_environment_from_venv_no_pip(tmpdir):
+ builder.setup_python(ctx)
+ builder.setup_scripts(ctx)
+ subprocess.check_call([ctx.env_exe, virtualenv.__file__, "--no-pip", ve_venv_dir])
+- ve_exe = os.path.join(bin_dir, "python")
++ ve_exe = os.path.join(bin_dir, os.getenv('EPYTHON'))
+ out = subprocess.check_output([ve_exe, "-c", "import sys; print(sys.real_prefix)"], universal_newlines=True)
+ # Test against real_prefix if present - we might be running the test from a virtualenv (e.g. tox).
+ assert out.strip() == getattr(sys, "real_prefix", sys.prefix)
+@@ -657,10 +663,11 @@ def test_create_environment_with_old_pip(tmpdir):
+ virtualenv.create_environment(venvdir, search_dirs=[support_dir], no_wheel=True)
+
+
++@pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
+ def test_license_builtin(clean_python):
+ _, bin_dir, _ = clean_python
+ proc = subprocess.Popen(
+- (os.path.join(bin_dir, "python"), "-c", "license()"), stdin=subprocess.PIPE, stdout=subprocess.PIPE
++ (os.path.join(bin_dir, os.getenv('EPYTHON')), "-c", "license()"), stdin=subprocess.PIPE, stdout=subprocess.PIPE
+ )
+ out_b, _ = proc.communicate(b"q\n")
+ out = out_b.decode()
diff --git a/dev-python/virtualenv/virtualenv-16.7.8.ebuild b/dev-python/virtualenv/virtualenv-16.7.8.ebuild
new file mode 100644
index 00000000000..5916c8f457e
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-16.7.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy{,3} dropped until test deps are tested/updated
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+ https://virtualenv.pypa.io/en/stable/
+ https://pypi.org/project/virtualenv/
+ https://github.com/pypa/virtualenv/
+"
+SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pypiserver[${PYTHON_USEDEP}]
+ dev-python/pytest-localserver[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ )"
+
+DOCS=( docs/index.rst docs/changes.rst )
+
+PATCHES=(
+ "${FILESDIR}/virtualenv-16.7.7-tests.patch"
+
+ # disable tests that need internet access
+ "${FILESDIR}/virtualenv-16.7.7-tests-internet.patch"
+
+ # test fixes for pypy
+ "${FILESDIR}/virtualenv-16.7.8-tests-pypy.patch"
+)
+
+distutils_enable_sphinx docs \
+ dev-python/sphinx_rtd_theme \
+ dev-python/towncrier
+
+python_test() {
+ cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
+ die "Could not copy LICENSE.txt with ${EPYTHON}"
+
+ pytest -vv tests || die "Tests fail with ${EPYTHON}"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/files/, dev-python/virtualenv/
@ 2020-07-12 16:57 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2020-07-12 16:57 UTC (permalink / raw
To: gentoo-commits
commit: 8c9371a2bf35d75ce4e7d89d60384fe872252bec
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 16:45:57 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 16:56:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c9371a2
dev-python/virtualenv: Remove redundant versions
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/virtualenv/Manifest | 2 -
.../virtualenv/files/virtualenv-20.0.21-py39.patch | 27 -------
dev-python/virtualenv/virtualenv-20.0.18.ebuild | 85 -------------------
dev-python/virtualenv/virtualenv-20.0.21.ebuild | 94 ----------------------
4 files changed, 208 deletions(-)
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index b78a266d9c8..b78e3181d6a 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,7 +1,5 @@
DIST virtualenv-16.0.0.tar.gz 1968312 BLAKE2B efc25f7c12335bb8619c3de125af3693d73afc5e7ff4edf1afa95227360ab4d0eb2ffb574b9bb36de26a2bda65b1f06009308fef48b12a81050bbc1f4ab852e9 SHA512 aed6eff9b85107072c321b37c1725987d474caf615734ab40d8d1fa60f2635be1a1919a47fbd211127e38cf1c4002548c778df29fc56d45a4570b31906c0ee54
DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b48274893777313d7151350df1d8a7d86d7cbd299c6c04734cbad134512e2ea05f5bc694648b6e9307019ffd9b91f7d0cdaf5 SHA512 d7379941e299c44beba30eaab68d5f1a6650f767b24f95d5e8abd05c1529dca4c1423113a41ff42690bb2b2bd4fe05c3e47a8fed4f9df0972188f6c77034436b
-DIST virtualenv-20.0.18.tar.gz 7982748 BLAKE2B f759ff1c42aaf9229e3f8dedd7b50df12e3a7616f979e18a5a91d58afd190beea86c67e0f7c530ba327427f3a4967ab27d7b922723c9ce92cba844946f8eb8ff SHA512 9295acb4d21da13c93fcf2a73244137a6fd8384313cf2685b67295f3be8cf33aaf6d22fc9ba4fa93dbfd81429eeaf4eb46d752fb717f0f74c172a754b92d41e6
-DIST virtualenv-20.0.21.tar.gz 8036935 BLAKE2B 63519368c951989a4112abd77bc8dbdb3548872ccd2da8c8fb8ed0d8dd2b99271df4b666dc5618eb4ccb650ecefff07d57e47ba6ce56c770de432e79f5eb1931 SHA512 168bd977bfecf98b76a20c6059fa372a3a9681e778539d962c7062a19ffdf3387c89eca50e03a4fe83ff2ae8affaf8ec3f87141d0c94240ea205df329a113651
DIST virtualenv-20.0.23.tar.gz 8038565 BLAKE2B e11a7e36c33848fc9c8ad12fed369e6804c11a89e11cb66ff105b4e4e5758dcab15809932f88d9ddbc229d1bb862d29dead9ff2e4da655603e627887a1a2cd1d SHA512 01a56564ac09abca25cd163e7b425d8dbf1f57d6771b57e1f5fe4182f86197009e7ebdcb6f4a8640c8b8f0cdfcfdcd843f7be33848c66b0b5877cc7a8fe6ee0e
DIST virtualenv-20.0.26.tar.gz 8264088 BLAKE2B 0d5bfbae10fa7de73ec3766863415a5a8f6680b168ef4ef25984b91a9291645189b987bfc63b96897b6f421fd692b4a388eee7a36995b0b65fe52d3019813da4 SHA512 d81fa8f25b7752fbb76494cea62f76d5f40e1397853ef71c1eb8078ffe8748fb365f275cc34ef04f64a001e3300a6f26f872542f68c047bee1eeb74cd49180a7
diff --git a/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch b/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch
deleted file mode 100644
index 221cc734d26..00000000000
--- a/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a8717bf6ac3375d7f26738189c32e3bae04d280a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= <bgabor8@bloomberg.net>
-Date: Fri, 22 May 2020 12:41:32 +0100
-Subject: [PATCH] Add 3.9 on Linux to the test suite (#1839)
-
----
- azure-pipelines.yml | 10 ++++++----
- setup.cfg | 3 ++-
- tests/integration/test_zipapp.py | 2 ++
- tests/unit/activation/test_xonsh.py | 3 +++
- tests/unit/discovery/test_py_spec.py | 2 ++
- tox.ini | 2 +-
- 6 files changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/tests/unit/discovery/test_py_spec.py b/tests/unit/discovery/test_py_spec.py
-index 445412773..52154f14c 100644
---- a/tests/unit/discovery/test_py_spec.py
-+++ b/tests/unit/discovery/test_py_spec.py
-@@ -95,6 +95,8 @@ def _version_not_satisfies_pairs():
- for o in [1, -1]:
- temp = copy(sat_ver)
- temp[patch] += o
-+ if temp[patch] < 0:
-+ continue
- sat = ".".join(str(i) for i in temp)
- target.add((req, sat))
- return sorted(target)
diff --git a/dev-python/virtualenv/virtualenv-20.0.18.ebuild b/dev-python/virtualenv/virtualenv-20.0.18.ebuild
deleted file mode 100644
index 85130547d14..00000000000
--- a/dev-python/virtualenv/virtualenv-20.0.18.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/virtualenv/
- https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
- >=dev-python/distlib-0.3.0[${PYTHON_USEDEP}]
- >=dev-python/filelock-3[${PYTHON_USEDEP}]
- >=dev-python/setuptools-41[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
- ' -2)
- $(python_gen_cond_dep '
- >=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
- ' -2 python3_{6,7} pypy3)
- $(python_gen_cond_dep '
- >=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
- ' -2 python3_6 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="${RDEPEND}
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/coverage[${PYTHON_USEDEP}]
- >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
- ' -3)
- )"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx_rtd_theme \
- dev-python/towncrier
-distutils_enable_tests pytest
-
-src_prepare() {
- # we don't have xonsh
- rm tests/unit/activation/test_xonsh.py || die
- # TODO: investigate
- sed -e 's:test_cross_major:_&:' \
- -i tests/unit/create/test_creator.py || die
-
- distutils-r1_src_prepare
-}
-
-src_configure() {
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
- # TODO: fix/skip with more granularity tests on pypy3
- if has "${EPYTHON}" pypy3 python2.7; then
- einfo "Skipping broken tests on pypy3"
- continue
- fi
-
- distutils_install_for_testing
-
- pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.0.21.ebuild b/dev-python/virtualenv/virtualenv-20.0.21.ebuild
deleted file mode 100644
index 2f37b45989c..00000000000
--- a/dev-python/virtualenv/virtualenv-20.0.21.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/virtualenv/
- https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
- >=dev-python/distlib-0.3.0[${PYTHON_USEDEP}]
- >=dev-python/filelock-3[${PYTHON_USEDEP}]
- >=dev-python/setuptools-41[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
- ' -2)
- $(python_gen_cond_dep '
- >=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
- ' -2 python3_{6,7} pypy3)
- $(python_gen_cond_dep '
- >=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
- ' -2 python3_6 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="${RDEPEND}
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/coverage[${PYTHON_USEDEP}]
- >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
- ' -3)
- )"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx_rtd_theme \
- dev-python/towncrier
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-py39.patch
-)
-
-src_prepare() {
- # we don't have xonsh
- rm tests/unit/activation/test_xonsh.py || die
- # require internet
- sed -e 's:test_seed_link_via_app_data:_&:' \
- -i tests/unit/seed/test_boostrap_link_via_app_data.py || die
- # TODO: investigate
- sed -e 's:test_cross_major:_&:' \
- -i tests/unit/create/test_creator.py || die
- sed -e 's:test_py_info_to_system_raises:_&:' \
- -i tests/unit/discovery/py_info/test_py_info.py || die
-
- distutils-r1_src_prepare
-}
-
-src_configure() {
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
- # TODO: fix/skip with more granularity tests on pypy3
- if has "${EPYTHON}" pypy3 python2.7; then
- einfo "Skipping broken tests on pypy3"
- continue
- fi
-
- distutils_install_for_testing
-
- pytest -vv || die "Tests fail with ${EPYTHON}"
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/files/, dev-python/virtualenv/
@ 2021-07-03 6:21 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2021-07-03 6:21 UTC (permalink / raw
To: gentoo-commits
commit: dee418093fc8386988748c254285662108b13f5b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 3 06:20:16 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 3 06:21:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee41809
dev-python/virtualenv: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/virtualenv/Manifest | 2 -
.../files/virtualenv-16.7.7-tests-internet.patch | 50 -----------
.../virtualenv/files/virtualenv-16.7.7-tests.patch | 53 ------------
.../files/virtualenv-16.7.8-tests-pypy.patch | 64 --------------
dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild | 66 ---------------
dev-python/virtualenv/virtualenv-20.4.4.ebuild | 99 ----------------------
6 files changed, 334 deletions(-)
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 33a5d2a2571..25331c19f09 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1 @@
-DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
-DIST virtualenv-20.4.4.tar.gz 10579531 BLAKE2B 9e10c07bd191d745d6904f304787a3913c0c574bb4453549796052f27329cbc2e3700fbc6f40ff02f4e94b8f1c21458c8fbd706b05ae458c033722d3eaf04f2e SHA512 acc528cccfc80aeed2fcd7209cab7ff0f1a7d1dc01a59fdb6a07703c7905904ab68d3f4ff312e108c687d03495e82ed8d26ecc15c2b17b9e771605a46164b4bd
DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c5444e5fcb617b1d7cd34cdac097ee15566b7f4c841d444393723ed369193f33bef90ea7caa5b3c20aaf65fbde2f865abf7 SHA512 a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
diff --git a/dev-python/virtualenv/files/virtualenv-16.7.7-tests-internet.patch b/dev-python/virtualenv/files/virtualenv-16.7.7-tests-internet.patch
deleted file mode 100644
index 97baeb59c4e..00000000000
--- a/dev-python/virtualenv/files/virtualenv-16.7.7-tests-internet.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/tests/test_from_source.py b/tests/test_from_source.py
-index 39d7c05..76834f7 100644
---- a/tests/test_from_source.py
-+++ b/tests/test_from_source.py
-@@ -40,6 +40,7 @@ def test_use_from_source_sdist(sdist, tmp_path, clean_python, monkeypatch, call_
- )
-
-
-+@pytest.mark.skip(reason="needs internet access")
- def test_use_from_wheel(tmp_path, extracted_wheel, clean_python, monkeypatch, call_subprocess):
- """test that we can create a virtual environment by feeding to a clean python the wheels content"""
- virtualenv_file = extracted_wheel / "virtualenv.py"
-diff --git a/tests/test_source_content.py b/tests/test_source_content.py
-index 8eae6bc..06763ee 100644
---- a/tests/test_source_content.py
-+++ b/tests/test_source_content.py
-@@ -41,6 +41,7 @@ def test_sdist_contains(sdist):
- assert not extra, " | ".join(extra)
-
-
-+@pytest.mark.skip(reason="needs internet access")
- def test_wheel_contains(extracted_wheel):
- content = set(extracted_wheel.iterdir())
-
-diff --git a/tests/test_zipapp.py b/tests/test_zipapp.py
-index d084af6..93d29e1 100644
---- a/tests/test_zipapp.py
-+++ b/tests/test_zipapp.py
-@@ -51,11 +51,13 @@ def call_wheel(tmp_path_factory, call_subprocess):
- return wheel_make_env
-
-
-+@pytest.mark.skip(reason="needs internet access")
- @pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
- def test_zipapp_basic_invocation(call_zipapp, tmp_path):
- _test_basic_invocation(call_zipapp, tmp_path)
-
-
-+@pytest.mark.skip(reason="needs internet access")
- @pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
- def test_wheel_basic_invocation(call_wheel, tmp_path):
- _test_basic_invocation(call_wheel, tmp_path)
-@@ -97,6 +99,7 @@ def test_zipapp_invocation_dash_p(call_zipapp, tmp_path):
- _test_invocation_dash_p(call_zipapp, tmp_path)
-
-
-+@pytest.mark.skip(reason="needs internet access")
- @pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
- @pytest.mark.skipif(sys.platform == "win32" and six.PY2, reason="no python 3 for windows on CI")
- def test_wheel_invocation_dash_p(call_wheel, tmp_path):
diff --git a/dev-python/virtualenv/files/virtualenv-16.7.7-tests.patch b/dev-python/virtualenv/files/virtualenv-16.7.7-tests.patch
deleted file mode 100644
index 41d3240d47d..00000000000
--- a/dev-python/virtualenv/files/virtualenv-16.7.7-tests.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/tests/test_virtualenv.py b/tests/test_virtualenv.py
-index 620c0cb..946233b 100644
---- a/tests/test_virtualenv.py
-+++ b/tests/test_virtualenv.py
-@@ -356,6 +356,7 @@ def test_install_python_bin():
- shutil.rmtree(tmp_virtualenv)
-
-
-+@pytest.mark.skip(reason="This test does not seem to be working, and I have no idea why")
- @pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
- def test_always_copy_option():
- """Should be no symlinks in directory tree"""
-diff --git a/tests/test_zipapp.py b/tests/test_zipapp.py
-index 8ef8bd1..d084af6 100644
---- a/tests/test_zipapp.py
-+++ b/tests/test_zipapp.py
-@@ -51,10 +51,12 @@ def call_wheel(tmp_path_factory, call_subprocess):
- return wheel_make_env
-
-
-+@pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
- def test_zipapp_basic_invocation(call_zipapp, tmp_path):
- _test_basic_invocation(call_zipapp, tmp_path)
-
-
-+@pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
- def test_wheel_basic_invocation(call_wheel, tmp_path):
- _test_basic_invocation(call_wheel, tmp_path)
-
-@@ -95,6 +97,7 @@ def test_zipapp_invocation_dash_p(call_zipapp, tmp_path):
- _test_invocation_dash_p(call_zipapp, tmp_path)
-
-
-+@pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
- @pytest.mark.skipif(sys.platform == "win32" and six.PY2, reason="no python 3 for windows on CI")
- def test_wheel_invocation_dash_p(call_wheel, tmp_path):
- _test_invocation_dash_p(call_wheel, tmp_path)
-diff --git a/virtualenv.py b/virtualenv.py
-index 0c47e4f..d4a1747 100755
---- a/virtualenv.py
-+++ b/virtualenv.py
-@@ -80,9 +80,9 @@ else:
- DEFAULT_CONFIG_FILE = os.path.join(DEFAULT_STORAGE_DIR, "virtualenv.ini")
-
- if IS_PYPY:
-- EXPECTED_EXE = "pypy"
-+ EXPECTED_EXE = "pypy{}".format('' if sys.hexversion < 0x3000000 else '3')
- else:
-- EXPECTED_EXE = "python"
-+ EXPECTED_EXE = "python{}.{}".format(sys.version_info.major, sys.version_info.minor)
-
- # Return a mapping of version -> Python executable
- # Only provided for Windows, where the information in the registry is used
diff --git a/dev-python/virtualenv/files/virtualenv-16.7.8-tests-pypy.patch b/dev-python/virtualenv/files/virtualenv-16.7.8-tests-pypy.patch
deleted file mode 100644
index 1e9268a5f97..00000000000
--- a/dev-python/virtualenv/files/virtualenv-16.7.8-tests-pypy.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/tests/test_virtualenv.py b/tests/test_virtualenv.py
-index 620c0cb..3284cea 100644
---- a/tests/test_virtualenv.py
-+++ b/tests/test_virtualenv.py
-@@ -5,6 +5,7 @@ import optparse
- import os
- import shutil
- import subprocess
-+import platform
- import sys
- import tempfile
- import textwrap
-@@ -342,6 +343,11 @@ def test_install_python_bin():
-
- if virtualenv.IS_WIN:
- required_executables = ["python.exe", "pythonw.exe"]
-+ elif platform.python_implementation() == 'PyPy':
-+ if sys.version_info.major < 3:
-+ required_executables = ["pypy"]
-+ else:
-+ required_executables = ["pypy3"]
- else:
- py_exe_no_version = "python"
- py_exe_version_major = "python%s" % sys.version_info[0]
-@@ -549,7 +555,7 @@ def check_pypy_pre_import():
- assert module in sys.modules, "missing {!r} in sys.modules".format(module)
-
-
--@pytest.mark.skipif("platform.python_implementation() != 'PyPy'")
-+@pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
- def test_pypy_pre_import(tmp_path):
- """For PyPy, some built-in modules should be pre-imported because
- some programs expect them to be in sys.modules on startup.
-@@ -622,7 +628,7 @@ def test_create_environment_from_venv(tmpdir):
- builder.setup_python(ctx)
- builder.setup_scripts(ctx)
- subprocess.check_call([ctx.env_exe, virtualenv.__file__, "--no-setuptools", "--no-pip", "--no-wheel", ve_venv_dir])
-- ve_exe = os.path.join(bin_dir, "python")
-+ ve_exe = os.path.join(bin_dir, os.getenv('EPYTHON'))
- out = subprocess.check_output([ve_exe, "-c", "import sys; print(sys.real_prefix)"], universal_newlines=True)
- # Test against real_prefix if present - we might be running the test from a virtualenv (e.g. tox).
- assert out.strip() == getattr(sys, "real_prefix", sys.prefix)
-@@ -639,7 +645,7 @@ def test_create_environment_from_venv_no_pip(tmpdir):
- builder.setup_python(ctx)
- builder.setup_scripts(ctx)
- subprocess.check_call([ctx.env_exe, virtualenv.__file__, "--no-pip", ve_venv_dir])
-- ve_exe = os.path.join(bin_dir, "python")
-+ ve_exe = os.path.join(bin_dir, os.getenv('EPYTHON'))
- out = subprocess.check_output([ve_exe, "-c", "import sys; print(sys.real_prefix)"], universal_newlines=True)
- # Test against real_prefix if present - we might be running the test from a virtualenv (e.g. tox).
- assert out.strip() == getattr(sys, "real_prefix", sys.prefix)
-@@ -657,10 +663,11 @@ def test_create_environment_with_old_pip(tmpdir):
- virtualenv.create_environment(venvdir, search_dirs=[support_dir], no_wheel=True)
-
-
-+@pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
- def test_license_builtin(clean_python):
- _, bin_dir, _ = clean_python
- proc = subprocess.Popen(
-- (os.path.join(bin_dir, "python"), "-c", "license()"), stdin=subprocess.PIPE, stdout=subprocess.PIPE
-+ (os.path.join(bin_dir, os.getenv('EPYTHON')), "-c", "license()"), stdin=subprocess.PIPE, stdout=subprocess.PIPE
- )
- out_b, _ = proc.communicate(b"q\n")
- out = out_b.decode()
diff --git a/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild b/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild
deleted file mode 100644
index 1699ef11452..00000000000
--- a/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/virtualenv/
- https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
- test? (
- >=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pypiserver[${PYTHON_USEDEP}]
- dev-python/pytest-localserver[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- )"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
- "${FILESDIR}/virtualenv-16.7.7-tests.patch"
-
- # disable tests that need internet access
- "${FILESDIR}/virtualenv-16.7.7-tests-internet.patch"
-
- # test fixes for pypy
- "${FILESDIR}/virtualenv-16.7.8-tests-pypy.patch"
-)
-
-distutils_enable_sphinx docs \
- dev-python/sphinx_rtd_theme \
- dev-python/towncrier
-
-python_test() {
- cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
- die "Could not copy LICENSE.txt with ${EPYTHON}"
-
- pytest -vv tests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
- elog "Please note that while virtualenv package no longer supports"
- elog "Python 2.7, you can still create py2.7 virtualenvs via:"
- elog " $ virtualenv -p /usr/bin/python2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.4.4.ebuild b/dev-python/virtualenv/virtualenv-20.4.4.ebuild
deleted file mode 100644
index 5de5c2f6118..00000000000
--- a/dev-python/virtualenv/virtualenv-20.4.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
- https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/virtualenv/
- https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
- >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
- >=dev-python/filelock-3[${PYTHON_USEDEP}]
- >=dev-python/setuptools-41[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
- ' python3_{6,7} pypy3)
- $(python_gen_cond_dep '
- >=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
- ' python3_6 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- $(python_gen_cond_dep '
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
- >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
- ' 'python3*')
- )"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx_rtd_theme \
- dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
- local deselect=(
- tests/unit/activation/test_xonsh.py
- tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
- tests/unit/create/test_creator.py::test_cross_major
- )
- [[ ${EPYTHON} == pypy3 ]] && deselect+=(
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
- 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
- 'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
- 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
- )
-
- distutils_install_for_testing
- epytest ${deselect[@]/#/--deselect }
-}
-
-pkg_postinst() {
- elog "Please note that while virtualenv package no longer supports"
- elog "Python 2.7, you can still create py2.7 virtualenvs via:"
- elog " $ virtualenv -p 2.7 ..."
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/files/, dev-python/virtualenv/
@ 2024-06-22 12:44 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2024-06-22 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 45ad79bd0148f4e7f70d2f1b94512f10aa2d4c87
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 12:39:09 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 12:43:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ad79bd
dev-python/virtualenv: Use ensurepip instead of bundled wheels
Closes: https://bugs.gentoo.org/807643
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/virtualenv-20.26.3-ensurepip.patch | 37 +++++++
dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild | 118 +++++++++++++++++++++
2 files changed, 155 insertions(+)
diff --git a/dev-python/virtualenv/files/virtualenv-20.26.3-ensurepip.patch b/dev-python/virtualenv/files/virtualenv-20.26.3-ensurepip.patch
new file mode 100644
index 000000000000..c4b631e5a2b6
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-20.26.3-ensurepip.patch
@@ -0,0 +1,37 @@
+From 468118fcf55abf1fd4927ad0ab0b48bbb25c0a3c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 22 Jun 2024 14:28:23 +0200
+Subject: [PATCH] [Gentoo] Use ensurepip wheels instead of local bundle
+
+---
+ src/virtualenv/seed/wheels/embed/__init__.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/virtualenv/seed/wheels/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py
+index 102ed8e..66ba52b 100644
+--- a/src/virtualenv/seed/wheels/embed/__init__.py
++++ b/src/virtualenv/seed/wheels/embed/__init__.py
+@@ -1,5 +1,6 @@
+ from __future__ import annotations
+
++import sysconfig
+ from pathlib import Path
+
+ from virtualenv.seed.wheels.util import Wheel
+@@ -51,6 +52,13 @@ MAX = "3.7"
+
+
+ def get_embed_wheel(distribution, for_py_version):
++ # Gentoo hack: get wheel from ensurepip directory
++ bundle_dir = Path(sysconfig.get_config_var("WHEEL_PKG_DIR"))
++ try:
++ return Wheel.from_path(next(bundle_dir.glob(f"{distribution}-*.whl")))
++ except StopIteration:
++ return None
++
+ path = BUNDLE_FOLDER / (BUNDLE_SUPPORT.get(for_py_version, {}) or BUNDLE_SUPPORT[MAX]).get(distribution)
+ return Wheel.from_path(path)
+
+--
+2.45.2
+
diff --git a/dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild b/dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild
new file mode 100644
index 000000000000..ad9030250af1
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+ https://virtualenv.pypa.io/en/stable/
+ https://pypi.org/project/virtualenv/
+ https://github.com/pypa/virtualenv/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
+ >=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
+ >=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
+
+ dev-python/ensurepip-pip
+ dev-python/ensurepip-setuptools
+ dev-python/ensurepip-wheel
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+ dev-python/hatch-vcs[${PYTHON_USEDEP}]
+ test? (
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}]
+ >=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
+ ' pypy3)
+ >=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ >=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/time-machine[${PYTHON_USEDEP}]
+ ' 'python3*')
+ dev-python/wheel[${PYTHON_USEDEP}]
+ >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+ )
+"
+
+EPYTEST_TIMEOUT=180
+distutils_enable_tests pytest
+
+src_prepare() {
+ local PATCHES=(
+ # use wheels from ensurepip bundle
+ "${FILESDIR}/${PN}-20.26.3-ensurepip.patch"
+ )
+
+ distutils-r1_src_prepare
+
+ # workaround test failures due to warnings from setuptools-scm, sigh
+ echo '[tool.setuptools_scm]' >> pyproject.toml || die
+
+ # remove useless pins
+ sed -i -e 's:<[0-9.]*,::' pyproject.toml || die
+
+ # remove bundled wheels
+ rm src/virtualenv/seed/wheels/embed/*.whl || die
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+ # tests for old wheels with py3.7 support
+ tests/unit/seed/embed/test_pip_invoke.py::test_base_bootstrap_via_pip_invoke
+ tests/unit/seed/wheels/test_wheels_util.py::test_wheel_not_support
+ # broken by different wheel versions in ensurepip
+ tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_string
+ tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_exact
+ tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_none
+ tests/unit/seed/wheels/test_acquire.py::test_download_wheel_bad_output
+ # hangs on a busy system, sigh
+ tests/unit/test_util.py::test_reentrant_file_lock_is_thread_safe
+ )
+ case ${EPYTHON} in
+ python3.1[23])
+ EPYTEST_DESELECT+=(
+ tests/unit/create/via_global_ref/test_build_c_ext.py
+ )
+ ;&
+ python3.11)
+ EPYTEST_DESELECT+=(
+ # TODO
+ tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
+ )
+ ;;
+ esac
+
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ local -x TZ=UTC
+ local plugins=( -p flaky -p pytest_mock )
+ if [[ ${EPYTHON} == pypy3 ]]; then
+ plugins+=( -p freezer )
+ else
+ plugins+=( -p time_machine )
+ fi
+ epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ # remove bundled wheels, we're using ensurepip bundle instead
+ find "${ED}" -name '*.whl' -delete || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-22 12:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-12 16:57 [gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/files/, dev-python/virtualenv/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-06-22 12:44 Michał Górny
2021-07-03 6:21 Michał Górny
2019-12-05 0:42 Patrick McLean
2019-11-23 0:57 Patrick McLean
2019-11-23 0:22 Patrick McLean
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox