diff options
author | Patrick McLean <patrick.mclean@sony.com> | 2019-12-04 16:41:24 -0800 |
---|---|---|
committer | Patrick McLean <chutzpah@gentoo.org> | 2019-12-04 16:41:24 -0800 |
commit | 4f8ccb3aa4e73f79846c18431e9bcc182580eaf4 (patch) | |
tree | 07aa49c36e50ed346f5c2e5e2cff02befc17cdf8 /dev-python/virtualenv/files | |
parent | dev-python/twine-3.1.1: Version bump (diff) | |
download | gentoo-4f8ccb3aa4e73f79846c18431e9bcc182580eaf4.tar.gz gentoo-4f8ccb3aa4e73f79846c18431e9bcc182580eaf4.tar.bz2 gentoo-4f8ccb3aa4e73f79846c18431e9bcc182580eaf4.zip |
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@gentoo.org>
Diffstat (limited to 'dev-python/virtualenv/files')
-rw-r--r-- | dev-python/virtualenv/files/virtualenv-16.7.8-tests-pypy.patch | 64 |
1 files changed, 64 insertions, 0 deletions
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 000000000000..1e9268a5f976 --- /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() |