Updating liguros repo

5 files changed, 213 insertions, 0 deletions

diff --git a/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch b/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch
new file mode 100644
index 000000000000..5c14c3e22850
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch
@@ -0,0 +1,19 @@
+--- virtualenv-12.1.1/tests/test_virtualenv.py
++++ virtualenv-12.1.1/tests/test_virtualenv.py
+@@ -6,6 +6,7 @@
+ import tempfile
+ import pytest
+ import platform  # noqa
++import unittest
+ 
+ from mock import patch, Mock
+ 
+@@ -126,7 +127,7 @@
+         shutil.rmtree(tmp_virtualenv)
+ 
+ 
+-@pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
++@unittest.skip("Running create environment while testing is broken")
+ def test_always_copy_option():
+     """Should be no symlinks in directory tree"""
+     tmp_virtualenv = tempfile.mkdtemp()
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 000000000000..97baeb59c4eb
--- /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/files/virtualenv-16.7.7-tests.patch b/dev-python/virtualenv/files/virtualenv-16.7.7-tests.patch
new file mode 100644
index 000000000000..41d3240d47d3
--- /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/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()
diff --git a/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch b/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch
new file mode 100644
index 000000000000..221cc734d268
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch
@@ -0,0 +1,27 @@
+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)