From 99a46dbeb3de23eb0b211d9d763db55d9a22c2ee Mon Sep 17 00:00:00 2001 From: Joel Capitao Date: Nov 06 2024 13:14:56 +0000 Subject: Import python-virtualenv-20.21.1-1.el10~bootstrap in CloudSIG Epoxy --- diff --git a/.python-virtualenv.metadata b/.python-virtualenv.metadata index cb9bc0d..b1fdf0c 100644 --- a/.python-virtualenv.metadata +++ b/.python-virtualenv.metadata @@ -1 +1 @@ -3052925621f507a334dc357ddffda03bba3e729c SOURCES/virtualenv-20.26.6.tar.gz +ee10bef35332c6d7a9c9c82e11c5e5d081ddbdbd SOURCES/virtualenv-20.21.1.tar.gz diff --git a/SOURCES/3.12-support-and-no-setuptools-wheel-on-3.12-2558.patch b/SOURCES/3.12-support-and-no-setuptools-wheel-on-3.12-2558.patch new file mode 100644 index 0000000..f70a536 --- /dev/null +++ b/SOURCES/3.12-support-and-no-setuptools-wheel-on-3.12-2558.patch @@ -0,0 +1,339 @@ +From 42e0698087f061d1d7db6fcb9469302bda5d44ca Mon Sep 17 00:00:00 2001 +From: chrysle +Date: Fri, 28 Apr 2023 01:36:03 +0200 +Subject: [PATCH] 3.12 support and no setuptools/wheel on 3.12+ (#2558) + +Cherry-picked from fd93dd79be89b21e6e9d43ca2dd1b02b811f6d6f +--- + docs/changelog/2487.feature.rst | 6 +++++ + docs/changelog/2558.feature.rst | 1 + + docs/render_cli.py | 10 +------ + docs/user_guide.rst | 5 ++-- + src/virtualenv/activation/python/__init__.py | 3 ++- + src/virtualenv/seed/embed/base_embed.py | 11 +++++--- + src/virtualenv/util/path/_sync.py | 4 ++- + tests/unit/config/test___main__.py | 2 +- + tests/unit/create/test_creator.py | 26 ++++++++++++++++--- + tests/unit/discovery/py_info/test_py_info.py | 2 +- + tests/unit/discovery/windows/conftest.py | 2 +- + tests/unit/seed/embed/test_base_embed.py | 12 +++++++++ + .../embed/test_bootstrap_link_via_app_data.py | 4 +-- + .../unit/seed/wheels/test_periodic_update.py | 17 ++++++++++-- + 14 files changed, 79 insertions(+), 26 deletions(-) + create mode 100644 docs/changelog/2487.feature.rst + create mode 100644 docs/changelog/2558.feature.rst + +diff --git a/docs/changelog/2487.feature.rst b/docs/changelog/2487.feature.rst +new file mode 100644 +index 0000000..12cc896 +--- /dev/null ++++ b/docs/changelog/2487.feature.rst +@@ -0,0 +1,6 @@ ++Do not install ``wheel`` and ``setuptools`` seed packages for Python 3.12+. To restore the old behaviour use: ++ ++- for ``wheel`` use ``VIRTUALENV_WHEEL=bundle`` environment variable or ``--wheel=bundle`` CLI flag, ++- for ``setuptools`` use ``VIRTUALENV_SETUPTOOLS=bundle`` environment variable or ``--setuptools=bundle`` CLI flag. ++ ++By :user:`chrysle`. +diff --git a/docs/changelog/2558.feature.rst b/docs/changelog/2558.feature.rst +new file mode 100644 +index 0000000..58b627a +--- /dev/null ++++ b/docs/changelog/2558.feature.rst +@@ -0,0 +1 @@ ++3.12 support - by :user:`gaborbernat`. +diff --git a/src/virtualenv/activation/python/__init__.py b/src/virtualenv/activation/python/__init__.py +index eb83504..a49444b 100644 +--- a/src/virtualenv/activation/python/__init__.py ++++ b/src/virtualenv/activation/python/__init__.py +@@ -12,10 +12,11 @@ class PythonActivator(ViaTemplateActivator): + def replacements(self, creator, dest_folder): + replacements = super().replacements(creator, dest_folder) + lib_folders = OrderedDict((os.path.relpath(str(i), str(dest_folder)), None) for i in creator.libs) ++ lib_folders = os.pathsep.join(lib_folders.keys()).replace("\\", "\\\\") # escape Windows path characters + win_py2 = creator.interpreter.platform == "win32" and creator.interpreter.version_info.major == 2 + replacements.update( + { +- "__LIB_FOLDERS__": os.pathsep.join(lib_folders.keys()), ++ "__LIB_FOLDERS__": lib_folders, + "__DECODE_PATH__": ("yes" if win_py2 else ""), + }, + ) +diff --git a/src/virtualenv/seed/embed/base_embed.py b/src/virtualenv/seed/embed/base_embed.py +index f29110b..6782d6f 100644 +--- a/src/virtualenv/seed/embed/base_embed.py ++++ b/src/virtualenv/seed/embed/base_embed.py +@@ -39,7 +39,7 @@ class BaseEmbed(Seeder, metaclass=ABCMeta): + return { + distribution: getattr(self, f"{distribution}_version") + for distribution in self.distributions() +- if getattr(self, f"no_{distribution}") is False ++ if getattr(self, f"no_{distribution}") is False and getattr(self, f"{distribution}_version") != "none" + } + + @classmethod +@@ -69,11 +69,13 @@ class BaseEmbed(Seeder, metaclass=ABCMeta): + default=[], + ) + for distribution, default in cls.distributions().items(): ++ if interpreter.version_info[:2] >= (3, 12) and distribution in {"wheel", "setuptools"}: ++ default = "none" + parser.add_argument( + f"--{distribution}", + dest=distribution, + metavar="version", +- help=f"version of {distribution} to install as seed: embed, bundle or exact version", ++ help=f"version of {distribution} to install as seed: embed, bundle, none or exact version", + default=default, + ) + for distribution in cls.distributions(): +@@ -101,7 +103,10 @@ class BaseEmbed(Seeder, metaclass=ABCMeta): + for distribution in self.distributions(): + if getattr(self, f"no_{distribution}"): + continue +- ver = f"={getattr(self, f'{distribution}_version', None) or 'latest'}" ++ version = getattr(self, f"{distribution}_version", None) ++ if version == "none": ++ continue ++ ver = f"={version or 'latest'}" + result += f" {distribution}{ver}," + return result[:-1] + ")" + +diff --git a/src/virtualenv/util/path/_sync.py b/src/virtualenv/util/path/_sync.py +index 604379d..b0af1eb 100644 +--- a/src/virtualenv/util/path/_sync.py ++++ b/src/virtualenv/util/path/_sync.py +@@ -1,6 +1,7 @@ + import logging + import os + import shutil ++import sys + from stat import S_IWUSR + + +@@ -56,7 +57,8 @@ def safe_delete(dest): + else: + raise + +- shutil.rmtree(str(dest), ignore_errors=True, onerror=onerror) ++ kwargs = {"onexc" if sys.version_info >= (3, 12) else "onerror": onerror} ++ shutil.rmtree(str(dest), ignore_errors=True, **kwargs) + + + class _Debug: +diff --git a/tests/unit/config/test___main__.py b/tests/unit/config/test___main__.py +index 62228c9..d22ef7e 100644 +--- a/tests/unit/config/test___main__.py ++++ b/tests/unit/config/test___main__.py +@@ -58,7 +58,7 @@ def test_fail_with_traceback(raise_on_session_done, tmp_path, capsys): + + @pytest.mark.usefixtures("session_app_data") + def test_session_report_full(tmp_path, capsys): +- run_with_catch([str(tmp_path)]) ++ run_with_catch([str(tmp_path), "--setuptools", "bundle", "--wheel", "bundle"]) + out, err = capsys.readouterr() + assert err == "" + lines = out.splitlines() +diff --git a/tests/unit/create/test_creator.py b/tests/unit/create/test_creator.py +index 0ec6d62..8b9d688 100644 +--- a/tests/unit/create/test_creator.py ++++ b/tests/unit/create/test_creator.py +@@ -412,7 +412,19 @@ def test_create_long_path(tmp_path): + @pytest.mark.parametrize("creator", sorted(set(PythonInfo.current_system().creators().key_to_class) - {"builtin"})) + @pytest.mark.usefixtures("session_app_data") + def test_create_distutils_cfg(creator, tmp_path, monkeypatch): +- result = cli_run([str(tmp_path / "venv"), "--activators", "", "--creator", creator]) ++ result = cli_run( ++ [ ++ str(tmp_path / "venv"), ++ "--activators", ++ "", ++ "--creator", ++ creator, ++ "--setuptools", ++ "bundle", ++ "--wheel", ++ "bundle", ++ ], ++ ) + + app = Path(__file__).parent / "console_app" + dest = tmp_path / "console_app" +@@ -465,7 +477,9 @@ def list_files(path): + + def test_zip_importer_can_import_setuptools(tmp_path): + """We're patching the loaders so might fail on r/o loaders, such as zipimporter on CPython<3.8""" +- result = cli_run([str(tmp_path / "venv"), "--activators", "", "--no-pip", "--no-wheel", "--copies"]) ++ result = cli_run( ++ [str(tmp_path / "venv"), "--activators", "", "--no-pip", "--no-wheel", "--copies", "--setuptools", "bundle"], ++ ) + zip_path = tmp_path / "site-packages.zip" + with zipfile.ZipFile(str(zip_path), "w", zipfile.ZIP_DEFLATED) as zip_handler: + lib = str(result.creator.purelib) +@@ -499,6 +513,7 @@ def test_no_preimport_threading(tmp_path): + out = subprocess.check_output( + [str(session.creator.exe), "-c", r"import sys; print('\n'.join(sorted(sys.modules)))"], + text=True, ++ encoding="utf-8", + ) + imported = set(out.splitlines()) + assert "threading" not in imported +@@ -515,6 +530,7 @@ def test_pth_in_site_vs_python_path(tmp_path): + out = subprocess.check_output( + [str(session.creator.exe), "-c", r"import sys; print(sys.testpth)"], + text=True, ++ encoding="utf-8", + ) + assert out == "ok\n" + # same with $PYTHONPATH pointing to site_packages +@@ -527,6 +543,7 @@ def test_pth_in_site_vs_python_path(tmp_path): + [str(session.creator.exe), "-c", r"import sys; print(sys.testpth)"], + text=True, + env=env, ++ encoding="utf-8", + ) + assert out == "ok\n" + +@@ -540,6 +557,7 @@ def test_getsitepackages_system_site(tmp_path): + out = subprocess.check_output( + [str(session.creator.exe), "-c", r"import site; print(site.getsitepackages())"], + text=True, ++ encoding="utf-8", + ) + site_packages = ast.literal_eval(out) + +@@ -554,6 +572,7 @@ def test_getsitepackages_system_site(tmp_path): + out = subprocess.check_output( + [str(session.creator.exe), "-c", r"import site; print(site.getsitepackages())"], + text=True, ++ encoding="utf-8", + ) + site_packages = [str(Path(i).resolve()) for i in ast.literal_eval(out)] + +@@ -579,6 +598,7 @@ def test_get_site_packages(tmp_path): + out = subprocess.check_output( + [str(session.creator.exe), "-c", r"import site; print(site.getsitepackages())"], + text=True, ++ encoding="utf-8", + ) + site_packages = ast.literal_eval(out) + +@@ -617,7 +637,7 @@ def test_python_path(monkeypatch, tmp_path, python_path_on): + if flag: + cmd.append(flag) + cmd.extend(["-c", "import json; import sys; print(json.dumps(sys.path))"]) +- return [i if case_sensitive else i.lower() for i in json.loads(subprocess.check_output(cmd))] ++ return [i if case_sensitive else i.lower() for i in json.loads(subprocess.check_output(cmd, encoding="utf-8"))] + + monkeypatch.delenv("PYTHONPATH", raising=False) + base = _get_sys_path() +diff --git a/tests/unit/discovery/py_info/test_py_info.py b/tests/unit/discovery/py_info/test_py_info.py +index 24b129c..f3fdb7e 100644 +--- a/tests/unit/discovery/py_info/test_py_info.py ++++ b/tests/unit/discovery/py_info/test_py_info.py +@@ -289,7 +289,7 @@ def test_discover_exe_on_path_non_spec_name_not_match(mocker): + assert CURRENT.satisfies(spec, impl_must_match=True) is False + + +-@pytest.mark.skipif(IS_PYPY, reason="setuptools distutil1s patching does not work") ++@pytest.mark.skipif(IS_PYPY, reason="setuptools distutils patching does not work") + def test_py_info_setuptools(): + from setuptools.dist import Distribution + +diff --git a/tests/unit/discovery/windows/conftest.py b/tests/unit/discovery/windows/conftest.py +index 58da626..94f14da 100644 +--- a/tests/unit/discovery/windows/conftest.py ++++ b/tests/unit/discovery/windows/conftest.py +@@ -9,7 +9,7 @@ def _mock_registry(mocker): + from virtualenv.discovery.windows.pep514 import winreg + + loc, glob = {}, {} +- mock_value_str = (Path(__file__).parent / "winreg-mock-values.py").read_text() ++ mock_value_str = (Path(__file__).parent / "winreg-mock-values.py").read_text(encoding="utf-8") + exec(mock_value_str, glob, loc) + enum_collect = loc["enum_collect"] + value_collect = loc["value_collect"] +diff --git a/tests/unit/seed/embed/test_base_embed.py b/tests/unit/seed/embed/test_base_embed.py +index 3344c74..ef2f829 100644 +--- a/tests/unit/seed/embed/test_base_embed.py ++++ b/tests/unit/seed/embed/test_base_embed.py +@@ -1,3 +1,5 @@ ++import sys ++ + import pytest + + from virtualenv.run import session_via_cli +@@ -10,3 +12,13 @@ from virtualenv.run import session_via_cli + def test_download_cli_flag(args, download, tmp_path): + session = session_via_cli(args + [str(tmp_path)]) + assert session.seeder.download is download ++ ++ ++def test_embed_wheel_versions(tmp_path): ++ session = session_via_cli([str(tmp_path)]) ++ expected = ( ++ {"pip": "bundle"} ++ if sys.version_info[:2] >= (3, 12) ++ else {"pip": "bundle", "setuptools": "bundle", "wheel": "bundle"} ++ ) ++ assert session.seeder.distribution_to_versions() == expected +diff --git a/tests/unit/seed/embed/test_bootstrap_link_via_app_data.py b/tests/unit/seed/embed/test_bootstrap_link_via_app_data.py +index 2c8c3e8..015686d 100644 +--- a/tests/unit/seed/embed/test_bootstrap_link_via_app_data.py ++++ b/tests/unit/seed/embed/test_bootstrap_link_via_app_data.py +@@ -203,7 +203,7 @@ def test_populated_read_only_cache_and_copied_app_data(tmp_path, current_fastest + @pytest.mark.parametrize("pkg", ["pip", "setuptools", "wheel"]) + @pytest.mark.usefixtures("session_app_data", "current_fastest", "coverage_env") + def test_base_bootstrap_link_via_app_data_no(tmp_path, pkg): +- create_cmd = [str(tmp_path), "--seeder", "app-data", f"--no-{pkg}"] ++ create_cmd = [str(tmp_path), "--seeder", "app-data", f"--no-{pkg}", "--wheel", "bundle", "--setuptools", "bundle"] + result = cli_run(create_cmd) + assert not (result.creator.purelib / pkg).exists() + for key in {"pip", "setuptools", "wheel"} - {pkg}: +@@ -231,7 +231,7 @@ def _run_parallel_threads(tmp_path): + + def _run(name): + try: +- cli_run(["--seeder", "app-data", str(tmp_path / name), "--no-pip", "--no-setuptools"]) ++ cli_run(["--seeder", "app-data", str(tmp_path / name), "--no-pip", "--no-setuptools", "--wheel", "bundle"]) + except Exception as exception: + as_str = str(exception) + exceptions.append(as_str) +diff --git a/tests/unit/seed/wheels/test_periodic_update.py b/tests/unit/seed/wheels/test_periodic_update.py +index e7794f5..c36a983 100644 +--- a/tests/unit/seed/wheels/test_periodic_update.py ++++ b/tests/unit/seed/wheels/test_periodic_update.py +@@ -66,7 +66,7 @@ def test_manual_upgrade(session_app_data, caplog, mocker, for_py_version): + + @pytest.mark.usefixtures("session_app_data") + def test_pick_periodic_update(tmp_path, mocker, for_py_version): +- embed, current = get_embed_wheel("setuptools", "3.5"), get_embed_wheel("setuptools", for_py_version) ++ embed, current = get_embed_wheel("setuptools", "3.6"), get_embed_wheel("setuptools", for_py_version) + mocker.patch("virtualenv.seed.wheels.bundle.load_embed_wheel", return_value=embed) + completed = datetime.now() - timedelta(days=29) + u_log = UpdateLog( +@@ -77,7 +77,20 @@ def test_pick_periodic_update(tmp_path, mocker, for_py_version): + ) + read_dict = mocker.patch("virtualenv.app_data.via_disk_folder.JSONStoreDisk.read", return_value=u_log.to_dict()) + +- result = cli_run([str(tmp_path), "--activators", "", "--no-periodic-update", "--no-wheel", "--no-pip"]) ++ result = cli_run( ++ [ ++ str(tmp_path), ++ "--activators", ++ "", ++ "--no-periodic-update", ++ "--no-wheel", ++ "--no-pip", ++ "--setuptools", ++ "bundle", ++ "--wheel", ++ "bundle", ++ ], ++ ) + + assert read_dict.call_count == 1 + installed = [i.name for i in result.creator.purelib.iterdir() if i.suffix == ".dist-info"] +-- +2.40.0 + diff --git a/SOURCES/Fix-tests-with-pluggy-1.2.0.patch b/SOURCES/Fix-tests-with-pluggy-1.2.0.patch new file mode 100644 index 0000000..5b399b8 --- /dev/null +++ b/SOURCES/Fix-tests-with-pluggy-1.2.0.patch @@ -0,0 +1,26 @@ +From 1f7c3185124052740814fe5734e8c98f9c54f47c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= +Date: Wed, 30 Aug 2023 19:01:20 +0200 +Subject: [PATCH] Fix tests with pluggy 1.2.0+ + +Manually cherry-picked from 9f9dc6250fc88e92b1ca6206429966788846d696 +--- + tests/conftest.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/conftest.py b/tests/conftest.py +index 68924dc..d23b22e 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -23,7 +23,7 @@ def pytest_configure(config): + """Ensure randomly is called before we re-order""" + manager = config.pluginmanager + # noinspection PyProtectedMember +- order = manager.hook.pytest_collection_modifyitems._nonwrappers ++ order = manager.hook.pytest_collection_modifyitems._hookimpls + dest = next((i for i, p in enumerate(order) if p.plugin is manager.getplugin("randomly")), None) + if dest is not None: + from_pos = next(i for i, p in enumerate(order) if p.plugin is manager.getplugin(__file__)) +-- +2.40.1 + diff --git a/SOURCES/prevent-PermissionError-when-using-venv-creator-on-s.patch b/SOURCES/prevent-PermissionError-when-using-venv-creator-on-s.patch new file mode 100644 index 0000000..421c2b2 --- /dev/null +++ b/SOURCES/prevent-PermissionError-when-using-venv-creator-on-s.patch @@ -0,0 +1,70 @@ +From fc8e412fa8fe524ab3f112f02e865aa42608388b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= +Date: Thu, 27 Apr 2023 18:52:38 +0200 +Subject: [PATCH] prevent PermissionError when using venv creator on some + systems (#2543) + +Cherry-picked from 0597a2f8ab32705b86a25dbd1d42fd30c3033061 +--- + docs/changelog/2543.bugfix.rst | 2 ++ + src/virtualenv/activation/via_template.py | 4 ++++ + tests/unit/create/test_creator.py | 22 ++++++++++++++++++++++ + 3 files changed, 28 insertions(+) + create mode 100644 docs/changelog/2543.bugfix.rst + +diff --git a/docs/changelog/2543.bugfix.rst b/docs/changelog/2543.bugfix.rst +new file mode 100644 +index 0000000..5f0d6ca +--- /dev/null ++++ b/docs/changelog/2543.bugfix.rst +@@ -0,0 +1,2 @@ ++Prevent ``PermissionError`` when using venv creator on systems that deliver files without user write ++permission - by :user:`kulikjak`. +diff --git a/src/virtualenv/activation/via_template.py b/src/virtualenv/activation/via_template.py +index 069d52e..cc9dbda 100644 +--- a/src/virtualenv/activation/via_template.py ++++ b/src/virtualenv/activation/via_template.py +@@ -41,6 +41,10 @@ class ViaTemplateActivator(Activator, metaclass=ABCMeta): + for template in templates: + text = self.instantiate_template(replacements, template, creator) + dest = to_folder / self.as_name(template) ++ # remove the file if it already exists - this prevents permission ++ # errors when the dest is not writable ++ if dest.exists(): ++ dest.unlink() + # use write_bytes to avoid platform specific line normalization (\n -> \r\n) + dest.write_bytes(text.encode("utf-8")) + generated.append(dest) +diff --git a/tests/unit/create/test_creator.py b/tests/unit/create/test_creator.py +index ea61ed0..0ec6d62 100644 +--- a/tests/unit/create/test_creator.py ++++ b/tests/unit/create/test_creator.py +@@ -690,3 +690,25 @@ def test_py_pyc_missing(tmp_path, mocker, py, pyc): + + pyc_at = Python2.from_stdlib(Python2.mappings(CURRENT), "osc.py")[1](result.creator, Path("os.pyc")) + assert pyc_at.exists() is pyc ++ ++ ++# Make sure that the venv creator works on systems where vendor-delivered files ++# (specifically venv scripts delivered with Python itself) are not writable. ++# ++# https://github.com/pypa/virtualenv/issues/2419 ++@pytest.mark.skipif("venv" not in CURRENT_CREATORS, reason="test needs venv creator") ++def test_venv_creator_without_write_perms(tmp_path, mocker): ++ from virtualenv.run.session import Session ++ ++ prev = Session._create ++ ++ def func(self): ++ prev(self) ++ scripts_dir = self.creator.dest / "bin" ++ for script in scripts_dir.glob("*ctivate*"): ++ script.chmod(stat.S_IREAD | stat.S_IRGRP | stat.S_IROTH) ++ ++ mocker.patch("virtualenv.run.session.Session._create", side_effect=func, autospec=True) ++ ++ cmd = [str(tmp_path), "--seeder", "app-data", "--without-pip", "--creator", "venv"] ++ cli_run(cmd) +-- +2.40.0 + diff --git a/SOURCES/prevent_command_injection.patch b/SOURCES/prevent_command_injection.patch new file mode 100644 index 0000000..5855d10 --- /dev/null +++ b/SOURCES/prevent_command_injection.patch @@ -0,0 +1,445 @@ +From 82dbaffa36fe317e331b2d22c5efbb6a0b6c7b19 Mon Sep 17 00:00:00 2001 +From: Lumir Balhar +Date: Tue, 8 Oct 2024 09:15:09 +0200 +Subject: [PATCH] Prevent command injection + +--- + docs/changelog/2768.bugfix.rst | 2 ++ + src/virtualenv/activation/bash/activate.sh | 9 +++++---- + src/virtualenv/activation/batch/__init__.py | 4 ++++ + src/virtualenv/activation/cshell/activate.csh | 10 +++++----- + src/virtualenv/activation/fish/activate.fish | 8 ++++---- + src/virtualenv/activation/nushell/__init__.py | 19 ++++++++++++++++++ + src/virtualenv/activation/nushell/activate.nu | 8 ++++---- + .../activation/powershell/__init__.py | 12 +++++++++++ + .../activation/powershell/activate.ps1 | 6 +++--- + src/virtualenv/activation/python/__init__.py | 6 +++++- + .../activation/python/activate_this.py | 6 +++--- + src/virtualenv/activation/via_template.py | 15 ++++++++++++-- + tests/conftest.py | 6 +++++- + tests/unit/activation/conftest.py | 3 +-- + tests/unit/activation/test_batch.py | 10 +++++----- + tests/unit/activation/test_powershell.py | 20 ++++++++++++++----- + 16 files changed, 105 insertions(+), 39 deletions(-) + create mode 100644 docs/changelog/2768.bugfix.rst + +diff --git a/docs/changelog/2768.bugfix.rst b/docs/changelog/2768.bugfix.rst +new file mode 100644 +index 0000000..7651eb6 +--- /dev/null ++++ b/docs/changelog/2768.bugfix.rst +@@ -0,0 +1,2 @@ ++Properly quote string placeholders in activation script templates to mitigate ++potential command injection - by :user:`y5c4l3`. +diff --git a/src/virtualenv/activation/bash/activate.sh b/src/virtualenv/activation/bash/activate.sh +index fb40db6..d047ea4 100644 +--- a/src/virtualenv/activation/bash/activate.sh ++++ b/src/virtualenv/activation/bash/activate.sh +@@ -44,14 +44,14 @@ deactivate () { + # unset irrelevant variables + deactivate nondestructive + +-VIRTUAL_ENV='__VIRTUAL_ENV__' ++VIRTUAL_ENV=__VIRTUAL_ENV__ + if ([ "$OSTYPE" = "cygwin" ] || [ "$OSTYPE" = "msys" ]) && $(command -v cygpath &> /dev/null) ; then + VIRTUAL_ENV=$(cygpath -u "$VIRTUAL_ENV") + fi + export VIRTUAL_ENV + + _OLD_VIRTUAL_PATH="$PATH" +-PATH="$VIRTUAL_ENV/__BIN_NAME__:$PATH" ++PATH="$VIRTUAL_ENV/"__BIN_NAME__":$PATH" + export PATH + + # unset PYTHONHOME if set +@@ -62,8 +62,9 @@ fi + + if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT-}" ] ; then + _OLD_VIRTUAL_PS1="${PS1-}" +- if [ "x__VIRTUAL_PROMPT__" != x ] ; then +- PS1="(__VIRTUAL_PROMPT__) ${PS1-}" ++ if [ "x"__VIRTUAL_PROMPT__ != x ] ; then ++ PROMPT=__VIRTUAL_PROMPT__ ++ PS1="(${PROMPT}) ${PS1-}" + else + PS1="(`basename \"$VIRTUAL_ENV\"`) ${PS1-}" + fi +diff --git a/src/virtualenv/activation/batch/__init__.py b/src/virtualenv/activation/batch/__init__.py +index 13ba097..b3e8540 100644 +--- a/src/virtualenv/activation/batch/__init__.py ++++ b/src/virtualenv/activation/batch/__init__.py +@@ -13,6 +13,10 @@ class BatchActivator(ViaTemplateActivator): + yield "deactivate.bat" + yield "pydoc.bat" + ++ @staticmethod ++ def quote(string): ++ return string ++ + def instantiate_template(self, replacements, template, creator): + # ensure the text has all newlines as \r\n - required by batch + base = super().instantiate_template(replacements, template, creator) +diff --git a/src/virtualenv/activation/cshell/activate.csh b/src/virtualenv/activation/cshell/activate.csh +index 837dcda..fcec426 100644 +--- a/src/virtualenv/activation/cshell/activate.csh ++++ b/src/virtualenv/activation/cshell/activate.csh +@@ -10,15 +10,15 @@ alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PA + # Unset irrelevant variables. + deactivate nondestructive + +-setenv VIRTUAL_ENV '__VIRTUAL_ENV__' ++setenv VIRTUAL_ENV __VIRTUAL_ENV__ + + set _OLD_VIRTUAL_PATH="$PATH:q" +-setenv PATH "$VIRTUAL_ENV:q/__BIN_NAME__:$PATH:q" ++setenv PATH "$VIRTUAL_ENV:q/"__BIN_NAME__":$PATH:q" + + + +-if ('__VIRTUAL_PROMPT__' != "") then +- set env_name = '(__VIRTUAL_PROMPT__) ' ++if (__VIRTUAL_PROMPT__ != "") then ++ set env_name = __VIRTUAL_PROMPT__ + else + set env_name = '('"$VIRTUAL_ENV:t:q"') ' + endif +@@ -42,7 +42,7 @@ if ( $do_prompt == "1" ) then + if ( "$prompt:q" =~ *"$newline:q"* ) then + : + else +- set prompt = "$env_name:q$prompt:q" ++ set prompt = '('"$env_name:q"') '"$prompt:q" + endif + endif + endif +diff --git a/src/virtualenv/activation/fish/activate.fish b/src/virtualenv/activation/fish/activate.fish +index 62f631e..3637d55 100644 +--- a/src/virtualenv/activation/fish/activate.fish ++++ b/src/virtualenv/activation/fish/activate.fish +@@ -57,7 +57,7 @@ end + # Unset irrelevant variables. + deactivate nondestructive + +-set -gx VIRTUAL_ENV '__VIRTUAL_ENV__' ++set -gx VIRTUAL_ENV __VIRTUAL_ENV__ + + # https://github.com/fish-shell/fish-shell/issues/436 altered PATH handling + if test (echo $FISH_VERSION | head -c 1) -lt 3 +@@ -65,7 +65,7 @@ if test (echo $FISH_VERSION | head -c 1) -lt 3 + else + set -gx _OLD_VIRTUAL_PATH $PATH + end +-set -gx PATH "$VIRTUAL_ENV"'/__BIN_NAME__' $PATH ++set -gx PATH "$VIRTUAL_ENV"'/'__BIN_NAME__ $PATH + + # Unset `$PYTHONHOME` if set. + if set -q PYTHONHOME +@@ -87,8 +87,8 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" + + # Prompt override provided? + # If not, just prepend the environment name. +- if test -n '__VIRTUAL_PROMPT__' +- printf '(%s) ' '__VIRTUAL_PROMPT__' ++ if test -n __VIRTUAL_PROMPT__ ++ printf '(%s) ' __VIRTUAL_PROMPT__ + else + printf '(%s) ' (basename "$VIRTUAL_ENV") + end +diff --git a/src/virtualenv/activation/nushell/__init__.py b/src/virtualenv/activation/nushell/__init__.py +index 4e2ea77..c96af22 100644 +--- a/src/virtualenv/activation/nushell/__init__.py ++++ b/src/virtualenv/activation/nushell/__init__.py +@@ -5,6 +5,25 @@ class NushellActivator(ViaTemplateActivator): + def templates(self): + yield "activate.nu" + ++ @staticmethod ++ def quote(string): ++ """ ++ Nushell supports raw strings like: r###'this is a string'###. ++ ++ This method finds the maximum continuous sharps in the string and then ++ quote it with an extra sharp. ++ """ ++ max_sharps = 0 ++ current_sharps = 0 ++ for char in string: ++ if char == "#": ++ current_sharps += 1 ++ max_sharps = max(current_sharps, max_sharps) ++ else: ++ current_sharps = 0 ++ wrapping = "#" * (max_sharps + 1) ++ return f"r{wrapping}'{string}'{wrapping}" ++ + def replacements(self, creator, dest_folder): # noqa: U100 + return { + "__VIRTUAL_PROMPT__": "" if self.flag_prompt is None else self.flag_prompt, +diff --git a/src/virtualenv/activation/nushell/activate.nu b/src/virtualenv/activation/nushell/activate.nu +index 3da1519..569a8a1 100644 +--- a/src/virtualenv/activation/nushell/activate.nu ++++ b/src/virtualenv/activation/nushell/activate.nu +@@ -31,8 +31,8 @@ export-env { + } + + let is_windows = ($nu.os-info.name | str downcase) == 'windows' +- let virtual_env = '__VIRTUAL_ENV__' +- let bin = '__BIN_NAME__' ++ let virtual_env = __VIRTUAL_ENV__ ++ let bin = __BIN_NAME__ + let path_sep = (char esep) + let path_name = (if $is_windows { + if (has-env 'Path') { +@@ -73,10 +73,10 @@ export-env { + $new_env + } else { + # Creating the new prompt for the session +- let virtual_prompt = (if ('__VIRTUAL_PROMPT__' == '') { ++ let virtual_prompt = (if (__VIRTUAL_PROMPT__ == '') { + $'(char lparen)($virtual_env | path basename)(char rparen) ' + } else { +- '(__VIRTUAL_PROMPT__) ' ++ (__VIRTUAL_PROMPT__) + }) + + # Back up the old prompt builder +diff --git a/src/virtualenv/activation/powershell/__init__.py b/src/virtualenv/activation/powershell/__init__.py +index 4e74ecb..773d690 100644 +--- a/src/virtualenv/activation/powershell/__init__.py ++++ b/src/virtualenv/activation/powershell/__init__.py +@@ -5,6 +5,18 @@ class PowerShellActivator(ViaTemplateActivator): + def templates(self): + yield "activate.ps1" + ++ @staticmethod ++ def quote(string): ++ """ ++ This should satisfy PowerShell quoting rules [1], unless the quoted ++ string is passed directly to Windows native commands [2]. ++ ++ [1]: https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_quoting_rules ++ [2]: https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_parsing#passing-arguments-that-contain-quote-characters ++ """ # noqa: D205 ++ string = string.replace("'", "''") ++ return f"'{string}'" ++ + + __all__ = [ + "PowerShellActivator", +diff --git a/src/virtualenv/activation/powershell/activate.ps1 b/src/virtualenv/activation/powershell/activate.ps1 +index d524347..346980d 100644 +--- a/src/virtualenv/activation/powershell/activate.ps1 ++++ b/src/virtualenv/activation/powershell/activate.ps1 +@@ -35,18 +35,18 @@ $env:VIRTUAL_ENV = $VIRTUAL_ENV + + New-Variable -Scope global -Name _OLD_VIRTUAL_PATH -Value $env:PATH + +-$env:PATH = "$env:VIRTUAL_ENV/__BIN_NAME____PATH_SEP__" + $env:PATH ++$env:PATH = "$env:VIRTUAL_ENV/" + __BIN_NAME__ + __PATH_SEP__ + $env:PATH + if (!$env:VIRTUAL_ENV_DISABLE_PROMPT) { + function global:_old_virtual_prompt { + "" + } + $function:_old_virtual_prompt = $function:prompt + +- if ("__VIRTUAL_PROMPT__" -ne "") { ++ if (__VIRTUAL_PROMPT__ -ne "") { + function global:prompt { + # Add the custom prefix to the existing prompt + $previous_prompt_value = & $function:_old_virtual_prompt +- ("(__VIRTUAL_PROMPT__) " + $previous_prompt_value) ++ ((__VIRTUAL_PROMPT__) + $previous_prompt_value) + } + } + else { +diff --git a/src/virtualenv/activation/python/__init__.py b/src/virtualenv/activation/python/__init__.py +index a49444b..8f0971e 100644 +--- a/src/virtualenv/activation/python/__init__.py ++++ b/src/virtualenv/activation/python/__init__.py +@@ -9,10 +9,14 @@ class PythonActivator(ViaTemplateActivator): + def templates(self): + yield "activate_this.py" + ++ @staticmethod ++ def quote(string): ++ return repr(string) ++ + def replacements(self, creator, dest_folder): + replacements = super().replacements(creator, dest_folder) + lib_folders = OrderedDict((os.path.relpath(str(i), str(dest_folder)), None) for i in creator.libs) +- lib_folders = os.pathsep.join(lib_folders.keys()).replace("\\", "\\\\") # escape Windows path characters ++ lib_folders = os.pathsep.join(lib_folders.keys()) + win_py2 = creator.interpreter.platform == "win32" and creator.interpreter.version_info.major == 2 + replacements.update( + { +diff --git a/src/virtualenv/activation/python/activate_this.py b/src/virtualenv/activation/python/activate_this.py +index e8eeb84..976952e 100644 +--- a/src/virtualenv/activation/python/activate_this.py ++++ b/src/virtualenv/activation/python/activate_this.py +@@ -14,7 +14,7 @@ except NameError: + raise AssertionError("You must use exec(open(this_file).read(), {'__file__': this_file}))") + + bin_dir = os.path.dirname(abs_file) +-base = bin_dir[: -len("__BIN_NAME__") - 1] # strip away the bin part from the __file__, plus the path separator ++base = bin_dir[: -len(__BIN_NAME__) - 1] # strip away the bin part from the __file__, plus the path separator + + # prepend bin to PATH (this file is inside the bin directory) + os.environ["PATH"] = os.pathsep.join([bin_dir] + os.environ.get("PATH", "").split(os.pathsep)) +@@ -22,9 +22,9 @@ os.environ["VIRTUAL_ENV"] = base # virtual env is right above bin directory + + # add the virtual environments libraries to the host python import mechanism + prev_length = len(sys.path) +-for lib in "__LIB_FOLDERS__".split(os.pathsep): ++for lib in __LIB_FOLDERS__.split(os.pathsep): + path = os.path.realpath(os.path.join(bin_dir, lib)) +- site.addsitedir(path.decode("utf-8") if "__DECODE_PATH__" else path) ++ site.addsitedir(path.decode("utf-8") if __DECODE_PATH__ else path) + sys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length] + + sys.real_prefix = sys.prefix +diff --git a/src/virtualenv/activation/via_template.py b/src/virtualenv/activation/via_template.py +index cc9dbda..b1dfa6b 100644 +--- a/src/virtualenv/activation/via_template.py ++++ b/src/virtualenv/activation/via_template.py +@@ -1,4 +1,5 @@ + import os ++import shlex + import sys + from abc import ABCMeta, abstractmethod + +@@ -19,6 +20,16 @@ class ViaTemplateActivator(Activator, metaclass=ABCMeta): + def templates(self): + raise NotImplementedError + ++ @staticmethod ++ def quote(string): ++ """ ++ Quote strings in the activation script. ++ ++ :param string: the string to quote ++ :return: quoted string that works in the activation script ++ """ ++ return shlex.quote(string) ++ + def generate(self, creator): + dest_folder = creator.bin_dir + replacements = self.replacements(creator, dest_folder) +@@ -58,8 +69,8 @@ class ViaTemplateActivator(Activator, metaclass=ABCMeta): + binary = read_binary(self.__module__, template) + text = binary.decode("utf-8", errors="strict") + for key, value in replacements.items(): +- value = self._repr_unicode(creator, value) +- text = text.replace(key, value) ++ value_uni = self._repr_unicode(creator, value) ++ text = text.replace(key, self.quote(value_uni)) + return text + + @staticmethod +diff --git a/tests/conftest.py b/tests/conftest.py +index a7ec4e0..b2fae66 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -292,7 +292,11 @@ def is_inside_ci(): + + @pytest.fixture(scope="session") + def special_char_name(): +- base = "e-$ èрт🚒♞中片-j" ++ base = "'\";&&e-$ èрт🚒♞中片-j" ++ if IS_WIN: ++ # get rid of invalid characters on Windows ++ base = base.replace('"', "") ++ base = base.replace(";", "") + # workaround for pypy3 https://bitbucket.org/pypy/pypy/issues/3147/venv-non-ascii-support-windows + encoding = "ascii" if IS_WIN else sys.getfilesystemencoding() + # let's not include characters that the file system cannot encode) +diff --git a/tests/unit/activation/conftest.py b/tests/unit/activation/conftest.py +index e24a4fc..2d8b3ce 100644 +--- a/tests/unit/activation/conftest.py ++++ b/tests/unit/activation/conftest.py +@@ -4,7 +4,6 @@ import subprocess + import sys + from os.path import dirname, normcase + from pathlib import Path +-from shlex import quote + from subprocess import Popen + + import pytest +@@ -146,7 +145,7 @@ class ActivationTester: + assert out[-1] == "None", raw + + def quote(self, s): +- return quote(s) ++ return self.of_class.quote(s) + + def python_cmd(self, cmd): + return f"{os.path.basename(sys.executable)} -c {self.quote(cmd)}" +diff --git a/tests/unit/activation/test_batch.py b/tests/unit/activation/test_batch.py +index 9e6d6d6..e95f7ea 100644 +--- a/tests/unit/activation/test_batch.py ++++ b/tests/unit/activation/test_batch.py +@@ -1,5 +1,3 @@ +-from shlex import quote +- + import pytest + + from virtualenv.activation import BatchActivator +@@ -25,10 +23,12 @@ def test_batch(activation_tester_class, activation_tester, tmp_path): + return ["@echo off", "", "chcp 65001 1>NUL"] + super()._get_test_lines(activate_script) + + def quote(self, s): +- """double quotes needs to be single, and single need to be double""" +- return "".join(("'" if c == '"' else ('"' if c == "'" else c)) for c in quote(s)) ++ if '"' in s or " " in s: ++ text = s.replace('"', r"\"") ++ return f'"{text}"' ++ return s + + def print_prompt(self): +- return "echo %PROMPT%" ++ return 'echo "%PROMPT%"' + + activation_tester(Batch) +diff --git a/tests/unit/activation/test_powershell.py b/tests/unit/activation/test_powershell.py +index 761237f..f495353 100644 +--- a/tests/unit/activation/test_powershell.py ++++ b/tests/unit/activation/test_powershell.py +@@ -1,5 +1,4 @@ + import sys +-from shlex import quote + + import pytest + +@@ -19,10 +18,6 @@ def test_powershell(activation_tester_class, activation_tester, monkeypatch): + self.activate_cmd = "." + self.script_encoding = "utf-16" + +- def quote(self, s): +- """powershell double quote needed for quotes within single quotes""" +- return quote(s).replace('"', '""') +- + def _get_test_lines(self, activate_script): + # for BATCH utf-8 support need change the character code page to 650001 + return super()._get_test_lines(activate_script) +@@ -33,4 +28,19 @@ def test_powershell(activation_tester_class, activation_tester, monkeypatch): + def print_prompt(self): + return "prompt" + ++ def quote(self, s): ++ """ ++ Tester will pass strings to native commands on Windows so extra ++ parsing rules are used. Check `PowerShellActivator.quote` for more ++ details. ++ """ ++ text = PowerShellActivator.quote(s) ++ return text.replace('"', '""') if sys.platform == "win32" else text ++ ++ def activate_call(self, script): ++ # Commands are called without quotes in PowerShell ++ cmd = self.activate_cmd ++ scr = self.quote(str(script)) ++ return f"{cmd} {scr}".strip() ++ + activation_tester(PowerShell) +-- +2.46.2 + diff --git a/SOURCES/prs-2709-and-2712.patch b/SOURCES/prs-2709-and-2712.patch new file mode 100644 index 0000000..96d6dbf --- /dev/null +++ b/SOURCES/prs-2709-and-2712.patch @@ -0,0 +1,464 @@ +From 71de653a714958d6649501b874009bafec74d3f4 Mon Sep 17 00:00:00 2001 +From: Philipp A +Date: Tue, 23 Apr 2024 18:46:41 +0200 +Subject: [PATCH 1/2] Allow builtin interpreter discovery to find specific + Python versions given a general spec (#2709) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Co-authored-by: Bernát Gábor + +Backported to 20.21.1 (without typing improvements). +--- + docs/changelog/2709.bugfix.rst | 1 + + src/virtualenv/discovery/builtin.py | 78 +++++++++++++------------- + src/virtualenv/discovery/py_spec.py | 42 ++++++-------- + tests/unit/discovery/test_discovery.py | 15 ++++- + 4 files changed, 67 insertions(+), 69 deletions(-) + create mode 100644 docs/changelog/2709.bugfix.rst + +diff --git a/docs/changelog/2709.bugfix.rst b/docs/changelog/2709.bugfix.rst +new file mode 100644 +index 0000000..904da84 +--- /dev/null ++++ b/docs/changelog/2709.bugfix.rst +@@ -0,0 +1 @@ ++allow builtin discovery to discover specific interpreters (e.g. ``python3.12``) given an unspecific spec (e.g. ``python3``) - by :user:`flying-sheep`. +diff --git a/src/virtualenv/discovery/builtin.py b/src/virtualenv/discovery/builtin.py +index 40320d3..f79b5a5 100644 +--- a/src/virtualenv/discovery/builtin.py ++++ b/src/virtualenv/discovery/builtin.py +@@ -1,6 +1,7 @@ + import logging + import os + import sys ++from pathlib import Path + + from virtualenv.info import IS_WIN + +@@ -67,7 +68,7 @@ def get_interpreter(key, try_first_with, app_data=None, env=None): + proposed_paths.add(key) + + +-def propose_interpreters(spec, try_first_with, app_data, env=None): ++def propose_interpreters(spec, try_first_with, app_data=None, env=None): # noqa: C901, PLR0912 + # 0. try with first + env = os.environ if env is None else env + for py_exe in try_first_with: +@@ -101,20 +102,17 @@ def propose_interpreters(spec, try_first_with, app_data, env=None): + for interpreter in propose_interpreters(spec, app_data, env): + yield interpreter, True + # finally just find on path, the path order matters (as the candidates are less easy to control by end user) +- paths = get_paths(env) + tested_exes = set() +- for pos, path in enumerate(paths): +- path_str = str(path) +- logging.debug(LazyPathDump(pos, path_str, env)) +- for candidate, match in possible_specs(spec): +- found = check_path(candidate, path_str) +- if found is not None: +- exe = os.path.abspath(found) +- if exe not in tested_exes: +- tested_exes.add(exe) +- interpreter = PathPythonInfo.from_exe(exe, app_data, raise_on_error=False, env=env) +- if interpreter is not None: +- yield interpreter, match ++ find_candidates = path_exe_finder(spec) ++ for pos, path in enumerate(get_paths(env)): ++ logging.debug(LazyPathDump(pos, path, env)) ++ for exe, impl_must_match in find_candidates(path): ++ if exe in tested_exes: ++ continue ++ tested_exes.add(exe) ++ interpreter = PathPythonInfo.from_exe(str(exe), app_data, raise_on_error=False, env=env) ++ if interpreter is not None: ++ yield interpreter, impl_must_match + + + def get_paths(env): +@@ -125,14 +123,14 @@ def get_paths(env): + except (AttributeError, ValueError): + path = os.defpath + if not path: +- paths = [] +- else: +- paths = [p for p in path.split(os.pathsep) if os.path.exists(p)] +- return paths ++ return None ++ for p in map(Path, path.split(os.pathsep)): ++ if p.exists(): ++ yield p + + + class LazyPathDump: +- def __init__(self, pos, path, env): ++ def __init__(self, pos, path, env) -> None: + self.pos = pos + self.path = path + self.env = env +@@ -141,35 +139,35 @@ class LazyPathDump: + content = f"discover PATH[{self.pos}]={self.path}" + if self.env.get("_VIRTUALENV_DEBUG"): # this is the over the board debug + content += " with =>" +- for file_name in os.listdir(self.path): ++ for file_path in self.path.iterdir(): + try: +- file_path = os.path.join(self.path, file_name) +- if os.path.isdir(file_path) or not os.access(file_path, os.X_OK): ++ if file_path.is_dir() or not (file_path.stat().st_mode & os.X_OK): + continue + except OSError: + pass + content += " " +- content += file_name ++ content += file_path.name + return content + + +-def check_path(candidate, path): +- _, ext = os.path.splitext(candidate) +- if sys.platform == "win32" and ext != ".exe": +- candidate = candidate + ".exe" +- if os.path.isfile(candidate): +- return candidate +- candidate = os.path.join(path, candidate) +- if os.path.isfile(candidate): +- return candidate +- return None +- +- +-def possible_specs(spec): +- # 4. then maybe it's something exact on PATH - if it was direct lookup implementation no longer counts +- yield spec.str_spec, False +- # 5. or from the spec we can deduce a name on path that matches +- yield from spec.generate_names() ++def path_exe_finder(spec): ++ """Given a spec, return a function that can be called on a path to find all matching files in it.""" ++ pat = spec.generate_re(windows=sys.platform == "win32") ++ direct = spec.str_spec ++ if sys.platform == "win32": ++ direct = f"{direct}.exe" ++ ++ def path_exes(path): ++ # 4. then maybe it's something exact on PATH - if it was direct lookup implementation no longer counts ++ yield (path / direct), False ++ # 5. or from the spec we can deduce if a name on path matches ++ for exe in path.iterdir(): ++ match = pat.fullmatch(exe.name) ++ if match: ++ # the implementation must match when we find “python[ver]” ++ yield exe.absolute(), match["impl"] == "python" ++ ++ return path_exes + + + class PathPythonInfo(PythonInfo): +diff --git a/src/virtualenv/discovery/py_spec.py b/src/virtualenv/discovery/py_spec.py +index 103c7ae..cbfdfb8 100644 +--- a/src/virtualenv/discovery/py_spec.py ++++ b/src/virtualenv/discovery/py_spec.py +@@ -1,10 +1,9 @@ + """A Python specification is an abstract requirement definition of an interpreter""" + ++from __future__ import annotations ++ + import os + import re +-from collections import OrderedDict +- +-from virtualenv.info import fs_is_case_sensitive + + PATTERN = re.compile(r"^(?P[a-zA-Z]+)?(?P[0-9.]+)?(?:-(?P32|64))?$") + +@@ -12,7 +11,7 @@ PATTERN = re.compile(r"^(?P[a-zA-Z]+)?(?P[0-9.]+)?(?:-(?P32 + class PythonSpec: + """Contains specification about a Python Interpreter""" + +- def __init__(self, str_spec, implementation, major, minor, micro, architecture, path): ++ def __init__(self, str_spec, implementation, major, minor, micro, architecture, path) -> None: # noqa: PLR0913 + self.str_spec = str_spec + self.implementation = implementation + self.major = major +@@ -22,7 +21,7 @@ class PythonSpec: + self.path = path + + @classmethod +- def from_string_spec(cls, string_spec): ++ def from_string_spec(cls, string_spec): # noqa: C901, PLR0912 + impl, major, minor, micro, arch, path = None, None, None, None, None, None + if os.path.isabs(string_spec): + path = string_spec +@@ -64,27 +63,18 @@ class PythonSpec: + + return cls(string_spec, impl, major, minor, micro, arch, path) + +- def generate_names(self): +- impls = OrderedDict() +- if self.implementation: +- # first consider implementation as it is +- impls[self.implementation] = False +- if fs_is_case_sensitive(): +- # for case sensitive file systems consider lower and upper case versions too +- # trivia: MacBooks and all pre 2018 Windows-es were case insensitive by default +- impls[self.implementation.lower()] = False +- impls[self.implementation.upper()] = False +- impls["python"] = True # finally consider python as alias, implementation must match now +- version = self.major, self.minor, self.micro +- try: +- version = version[: version.index(None)] +- except ValueError: +- pass +- for impl, match in impls.items(): +- for at in range(len(version), -1, -1): +- cur_ver = version[0:at] +- spec = f"{impl}{'.'.join(str(i) for i in cur_ver)}" +- yield spec, match ++ def generate_re(self, *, windows): ++ """Generate a regular expression for matching against a filename.""" ++ version = r"{}(\.{}(\.{})?)?".format( ++ *(r"\d+" if v is None else v for v in (self.major, self.minor, self.micro)) ++ ) ++ impl = "python" if self.implementation is None else f"python|{re.escape(self.implementation)}" ++ suffix = r"\.exe" if windows else "" ++ # Try matching `direct` first, so the `direct` group is filled when possible. ++ return re.compile( ++ rf"(?P{impl})(?P{version}){suffix}$", ++ flags=re.IGNORECASE, ++ ) + + @property + def is_abs(self): +diff --git a/tests/unit/discovery/test_discovery.py b/tests/unit/discovery/test_discovery.py +index c4a2cc7..51bae24 100644 +--- a/tests/unit/discovery/test_discovery.py ++++ b/tests/unit/discovery/test_discovery.py +@@ -14,16 +14,25 @@ from virtualenv.info import fs_supports_symlink + + @pytest.mark.skipif(not fs_supports_symlink(), reason="symlink not supported") + @pytest.mark.parametrize("case", ["mixed", "lower", "upper"]) +-def test_discovery_via_path(monkeypatch, case, tmp_path, caplog, session_app_data): ++@pytest.mark.parametrize("specificity", ["more", "less"]) ++def test_discovery_via_path(monkeypatch, case, specificity, tmp_path, caplog, session_app_data): # noqa: PLR0913 + caplog.set_level(logging.DEBUG) + current = PythonInfo.current_system(session_app_data) +- core = f"somethingVeryCryptic{'.'.join(str(i) for i in current.version_info[0:3])}" + name = "somethingVeryCryptic" + if case == "lower": + name = name.lower() + elif case == "upper": + name = name.upper() +- exe_name = f"{name}{current.version_info.major}{'.exe' if sys.platform == 'win32' else ''}" ++ if specificity == "more": ++ # e.g. spec: python3, exe: /bin/python3.12 ++ core_ver = current.version_info.major ++ exe_ver = ".".join(str(i) for i in current.version_info[0:2]) ++ elif specificity == "less": ++ # e.g. spec: python3.12.1, exe: /bin/python3 ++ core_ver = ".".join(str(i) for i in current.version_info[0:3]) ++ exe_ver = current.version_info.major ++ core = f"somethingVeryCryptic{core_ver}" ++ exe_name = f"{name}{exe_ver}{'.exe' if sys.platform == 'win32' else ''}" + target = tmp_path / current.install_path("scripts") + target.mkdir(parents=True) + executable = target / exe_name +-- +2.45.2 + + +From 4bb73d175614aa6041b1e9e57d7302b9c253b5ef Mon Sep 17 00:00:00 2001 +From: Ofek Lev +Date: Sat, 27 Apr 2024 14:43:00 -0400 +Subject: [PATCH 2/2] Fix PATH-based Python discovery on Windows (#2712) + +--- + docs/changelog/2712.bugfix.rst | 1 + + src/virtualenv/discovery/builtin.py | 44 ++++++++++++++++++++------ + src/virtualenv/discovery/py_spec.py | 10 +++++- + src/virtualenv/info.py | 5 +++ + tests/unit/discovery/test_discovery.py | 8 +++-- + 5 files changed, 55 insertions(+), 13 deletions(-) + create mode 100644 docs/changelog/2712.bugfix.rst + +diff --git a/docs/changelog/2712.bugfix.rst b/docs/changelog/2712.bugfix.rst +new file mode 100644 +index 0000000..fee5436 +--- /dev/null ++++ b/docs/changelog/2712.bugfix.rst +@@ -0,0 +1 @@ ++fix PATH-based Python discovery on Windows - by :user:`ofek`. +diff --git a/src/virtualenv/discovery/builtin.py b/src/virtualenv/discovery/builtin.py +index f79b5a5..456c68b 100644 +--- a/src/virtualenv/discovery/builtin.py ++++ b/src/virtualenv/discovery/builtin.py +@@ -3,7 +3,7 @@ import os + import sys + from pathlib import Path + +-from virtualenv.info import IS_WIN ++from virtualenv.info import IS_WIN, fs_path_id + + from .discover import Discover + from .py_info import PythonInfo +@@ -68,9 +68,10 @@ def get_interpreter(key, try_first_with, app_data=None, env=None): + proposed_paths.add(key) + + +-def propose_interpreters(spec, try_first_with, app_data=None, env=None): # noqa: C901, PLR0912 ++def propose_interpreters(spec, try_first_with, app_data=None, env=None): # noqa: C901, PLR0912, PLR0915 + # 0. try with first + env = os.environ if env is None else env ++ tested_exes: set[str] = set() + for py_exe in try_first_with: + path = os.path.abspath(py_exe) + try: +@@ -78,7 +79,12 @@ def propose_interpreters(spec, try_first_with, app_data=None, env=None): # noqa + except OSError: + pass + else: +- yield PythonInfo.from_exe(os.path.abspath(path), app_data, env=env), True ++ exe_raw = os.path.abspath(path) ++ exe_id = fs_path_id(exe_raw) ++ if exe_id in tested_exes: ++ continue ++ tested_exes.add(exe_id) ++ yield PythonInfo.from_exe(exe_raw, app_data, env=env), True + + # 1. if it's a path and exists + if spec.path is not None: +@@ -88,29 +94,44 @@ def propose_interpreters(spec, try_first_with, app_data=None, env=None): # noqa + if spec.is_abs: + raise + else: +- yield PythonInfo.from_exe(os.path.abspath(spec.path), app_data, env=env), True ++ exe_raw = os.path.abspath(spec.path) ++ exe_id = fs_path_id(exe_raw) ++ if exe_id not in tested_exes: ++ tested_exes.add(exe_id) ++ yield PythonInfo.from_exe(exe_raw, app_data, env=env), True + if spec.is_abs: + return + else: + # 2. otherwise try with the current +- yield PythonInfo.current_system(app_data), True ++ current_python = PythonInfo.current_system(app_data) ++ exe_raw = str(current_python.executable) ++ exe_id = fs_path_id(exe_raw) ++ if exe_id not in tested_exes: ++ tested_exes.add(exe_id) ++ yield current_python, True + + # 3. otherwise fallback to platform default logic + if IS_WIN: + from .windows import propose_interpreters + + for interpreter in propose_interpreters(spec, app_data, env): ++ exe_raw = str(interpreter.executable) ++ exe_id = fs_path_id(exe_raw) ++ if exe_id in tested_exes: ++ continue ++ tested_exes.add(exe_id) + yield interpreter, True + # finally just find on path, the path order matters (as the candidates are less easy to control by end user) +- tested_exes = set() + find_candidates = path_exe_finder(spec) + for pos, path in enumerate(get_paths(env)): + logging.debug(LazyPathDump(pos, path, env)) + for exe, impl_must_match in find_candidates(path): +- if exe in tested_exes: ++ exe_raw = str(exe) ++ exe_id = fs_path_id(exe_raw) ++ if exe_id in tested_exes: + continue +- tested_exes.add(exe) +- interpreter = PathPythonInfo.from_exe(str(exe), app_data, raise_on_error=False, env=env) ++ tested_exes.add(exe_id) ++ interpreter = PathPythonInfo.from_exe(exe_raw, app_data, raise_on_error=False, env=env) + if interpreter is not None: + yield interpreter, impl_must_match + +@@ -159,7 +180,10 @@ def path_exe_finder(spec): + + def path_exes(path): + # 4. then maybe it's something exact on PATH - if it was direct lookup implementation no longer counts +- yield (path / direct), False ++ direct_path = path / direct ++ if direct_path.exists(): ++ yield direct_path, False ++ + # 5. or from the spec we can deduce if a name on path matches + for exe in path.iterdir(): + match = pat.fullmatch(exe.name) +diff --git a/src/virtualenv/discovery/py_spec.py b/src/virtualenv/discovery/py_spec.py +index cbfdfb8..04b63b8 100644 +--- a/src/virtualenv/discovery/py_spec.py ++++ b/src/virtualenv/discovery/py_spec.py +@@ -70,9 +70,17 @@ class PythonSpec: + ) + impl = "python" if self.implementation is None else f"python|{re.escape(self.implementation)}" + suffix = r"\.exe" if windows else "" ++ version_conditional = ( ++ "?" ++ # Windows Python executables are almost always unversioned ++ if windows ++ # Spec is an empty string ++ or self.major is None ++ else "" ++ ) + # Try matching `direct` first, so the `direct` group is filled when possible. + return re.compile( +- rf"(?P{impl})(?P{version}){suffix}$", ++ rf"(?P{impl})(?P{version}){version_conditional}{suffix}$", + flags=re.IGNORECASE, + ) + +diff --git a/src/virtualenv/info.py b/src/virtualenv/info.py +index a4fc4bf..dd96f10 100644 +--- a/src/virtualenv/info.py ++++ b/src/virtualenv/info.py +@@ -47,11 +47,16 @@ def fs_supports_symlink(): + return _CAN_SYMLINK + + ++def fs_path_id(path: str) -> str: ++ return path.casefold() if fs_is_case_sensitive() else path ++ ++ + __all__ = ( + "IS_PYPY", + "IS_CPYTHON", + "IS_WIN", + "fs_is_case_sensitive", ++ "fs_path_id", + "fs_supports_symlink", + "ROOT", + "IS_ZIPAPP", +diff --git a/tests/unit/discovery/test_discovery.py b/tests/unit/discovery/test_discovery.py +index 51bae24..6c64b40 100644 +--- a/tests/unit/discovery/test_discovery.py ++++ b/tests/unit/discovery/test_discovery.py +@@ -14,7 +14,7 @@ from virtualenv.info import fs_supports_symlink + + @pytest.mark.skipif(not fs_supports_symlink(), reason="symlink not supported") + @pytest.mark.parametrize("case", ["mixed", "lower", "upper"]) +-@pytest.mark.parametrize("specificity", ["more", "less"]) ++@pytest.mark.parametrize("specificity", ["more", "less", "none"]) + def test_discovery_via_path(monkeypatch, case, specificity, tmp_path, caplog, session_app_data): # noqa: PLR0913 + caplog.set_level(logging.DEBUG) + current = PythonInfo.current_system(session_app_data) +@@ -31,7 +31,11 @@ def test_discovery_via_path(monkeypatch, case, specificity, tmp_path, caplog, se + # e.g. spec: python3.12.1, exe: /bin/python3 + core_ver = ".".join(str(i) for i in current.version_info[0:3]) + exe_ver = current.version_info.major +- core = f"somethingVeryCryptic{core_ver}" ++ elif specificity == "none": ++ # e.g. spec: python3.12.1, exe: /bin/python ++ core_ver = ".".join(str(i) for i in current.version_info[0:3]) ++ exe_ver = "" ++ core = "" if specificity == "none" else f"{name}{core_ver}" + exe_name = f"{name}{exe_ver}{'.exe' if sys.platform == 'win32' else ''}" + target = tmp_path / current.install_path("scripts") + target.mkdir(parents=True) +-- +2.45.2 + diff --git a/SOURCES/py3.13.patch b/SOURCES/py3.13.patch new file mode 100644 index 0000000..4921d77 --- /dev/null +++ b/SOURCES/py3.13.patch @@ -0,0 +1,60 @@ +From 11c30f6c69c4516b406c1c62f472d37898c58b93 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Mon, 4 Dec 2023 14:26:52 +0100 +Subject: [PATCH] Run CI tests on Python 3.13, fix tests (#2673) + +--- + docs/changelog/2673.feature.rst | 1 + + tests/unit/create/test_creator.py | 6 +++++- + tests/unit/create/via_global_ref/builtin/testing/path.py | 6 +++++- + 3 files changed, 11 insertions(+), 2 deletions(-) + create mode 100644 docs/changelog/2673.feature.rst + +diff --git a/docs/changelog/2673.feature.rst b/docs/changelog/2673.feature.rst +new file mode 100644 +index 0000000..0adf4a0 +--- /dev/null ++++ b/docs/changelog/2673.feature.rst +@@ -0,0 +1 @@ ++The tests now pass on the CI with Python 3.13.0a2 - by :user:`hroncok`. +diff --git a/tests/unit/create/test_creator.py b/tests/unit/create/test_creator.py +index 8b9d688..fc21ad8 100644 +--- a/tests/unit/create/test_creator.py ++++ b/tests/unit/create/test_creator.py +@@ -231,7 +231,11 @@ def test_create_no_seed(python, creator, isolated, system, coverage_env, special + assert os.path.exists(make_file) + + git_ignore = (dest / ".gitignore").read_text(encoding="utf-8") +- assert git_ignore.splitlines() == ["# created by virtualenv automatically", "*"] ++ if creator_key == "venv" and sys.version_info >= (3, 13): ++ comment = "# Created by venv; see https://docs.python.org/3/library/venv.html" ++ else: ++ comment = "# created by virtualenv automatically" ++ assert git_ignore.splitlines() == [comment, "*"] + + + def test_create_vcs_ignore_exists(tmp_path): +diff --git a/tests/unit/create/via_global_ref/builtin/testing/path.py b/tests/unit/create/via_global_ref/builtin/testing/path.py +index b2e1b85..d833de6 100644 +--- a/tests/unit/create/via_global_ref/builtin/testing/path.py ++++ b/tests/unit/create/via_global_ref/builtin/testing/path.py +@@ -44,11 +44,15 @@ class PathMockABC(FakeDataABC, Path): + """Mocks the behavior of `Path`""" + + _flavour = getattr(Path(), "_flavour", None) +- + if hasattr(_flavour, "altsep"): + # Allows to pass some tests for Windows via PosixPath. + _flavour.altsep = _flavour.altsep or "\\" + ++ # Python 3.13 renamed _flavour to parser ++ parser = getattr(Path(), "parser", None) ++ if hasattr(parser, "altsep"): ++ parser.altsep = parser.altsep or "\\" ++ + def exists(self): + return self.is_file() or self.is_dir() + +-- +2.43.0 + diff --git a/SOURCES/rpm-wheels.patch b/SOURCES/rpm-wheels.patch index fd257fe..72f569f 100644 --- a/SOURCES/rpm-wheels.patch +++ b/SOURCES/rpm-wheels.patch @@ -1,4 +1,4 @@ -From da9ce1c9d7d422e310d79d58a8b7ed07cbc781d1 Mon Sep 17 00:00:00 2001 +From 57ddc4814e921021ed95e9f21cc3f8f9bf06a1f2 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Thu, 9 Feb 2023 15:13:36 +0100 Subject: [PATCH] RPM wheels @@ -19,10 +19,10 @@ Co-Authored-By: Miro Hrončok create mode 100644 src/virtualenv/util/path/_system_wheels.py diff --git a/src/virtualenv/run/__init__.py b/src/virtualenv/run/__init__.py -index 48647ec..80c9d4a 100644 +index 6d22b71..19d1791 100644 --- a/src/virtualenv/run/__init__.py +++ b/src/virtualenv/run/__init__.py -@@ -97,8 +97,9 @@ def build_parser_only(args=None): +@@ -87,8 +87,9 @@ def build_parser_only(args=None): def handle_extra_commands(options): if options.upgrade_embed_wheels: @@ -35,25 +35,24 @@ index 48647ec..80c9d4a 100644 def load_app_data(args, parser, options): diff --git a/src/virtualenv/seed/embed/base_embed.py b/src/virtualenv/seed/embed/base_embed.py -index 864cc49..4586f40 100644 +index f29110b..07649c2 100644 --- a/src/virtualenv/seed/embed/base_embed.py +++ b/src/virtualenv/seed/embed/base_embed.py -@@ -5,8 +5,9 @@ from pathlib import Path +@@ -3,8 +3,9 @@ from pathlib import Path - from virtualenv.seed.seeder import Seeder - from virtualenv.seed.wheels import Version + from ..seeder import Seeder + from ..wheels import Version +from virtualenv.util.path._system_wheels import get_system_wheels_paths -PERIODIC_UPDATE_ON_BY_DEFAULT = True +PERIODIC_UPDATE_ON_BY_DEFAULT = False - class BaseEmbed(Seeder, ABC): -@@ -28,6 +29,15 @@ class BaseEmbed(Seeder, ABC): - + class BaseEmbed(Seeder, metaclass=ABCMeta): +@@ -27,6 +28,15 @@ class BaseEmbed(Seeder, metaclass=ABCMeta): if not self.distribution_to_versions(): self.enabled = False -+ + + if "embed" in (self.pip_version, self.setuptools_version, self.wheel_version): + raise RuntimeError( + "Embedded wheels are not available if virtualenv " @@ -62,10 +61,11 @@ index 864cc49..4586f40 100644 + "version which uses the system-wide pip, setuptools " + "and wheel wheels provided also by RPM packages." + ) - ++ @classmethod - def distributions(cls) -> dict[str, Version]: -@@ -112,6 +122,10 @@ class BaseEmbed(Seeder, ABC): + def distributions(cls): + return { +@@ -105,6 +115,10 @@ class BaseEmbed(Seeder, metaclass=ABCMeta): result += f" {distribution}{ver}," return result[:-1] + ")" @@ -77,10 +77,10 @@ index 864cc49..4586f40 100644 __all__ = [ "BaseEmbed", diff --git a/src/virtualenv/seed/embed/pip_invoke.py b/src/virtualenv/seed/embed/pip_invoke.py -index 815753c..5423c9f 100644 +index 2ca9438..339295f 100644 --- a/src/virtualenv/seed/embed/pip_invoke.py +++ b/src/virtualenv/seed/embed/pip_invoke.py -@@ -16,6 +16,7 @@ class PipInvoke(BaseEmbed): +@@ -15,6 +15,7 @@ class PipInvoke(BaseEmbed): def run(self, creator): if not self.enabled: return @@ -89,10 +89,10 @@ index 815753c..5423c9f 100644 with self.get_pip_install_cmd(creator.exe, for_py_version) as cmd: env = pip_wheel_env_run(self.extra_search_dir, self.app_data, self.env) diff --git a/src/virtualenv/seed/embed/via_app_data/via_app_data.py b/src/virtualenv/seed/embed/via_app_data/via_app_data.py -index 7e58bfc..e236319 100644 +index f31ecf6..d7a0f5a 100644 --- a/src/virtualenv/seed/embed/via_app_data/via_app_data.py +++ b/src/virtualenv/seed/embed/via_app_data/via_app_data.py -@@ -39,6 +39,7 @@ class FromAppData(BaseEmbed): +@@ -37,6 +37,7 @@ class FromAppData(BaseEmbed): def run(self, creator): if not self.enabled: return @@ -101,10 +101,10 @@ index 7e58bfc..e236319 100644 pip_version = name_to_whl["pip"].version_tuple if "pip" in name_to_whl else None installer_class = self.installer_class(pip_version) diff --git a/src/virtualenv/seed/wheels/acquire.py b/src/virtualenv/seed/wheels/acquire.py -index 8b3ddd8..7a2a4e5 100644 +index 21fde34..d6ae171 100644 --- a/src/virtualenv/seed/wheels/acquire.py +++ b/src/virtualenv/seed/wheels/acquire.py -@@ -106,13 +106,14 @@ def find_compatible_in_house(distribution, version_spec, for_py_version, in_fold +@@ -97,13 +97,14 @@ def find_compatible_in_house(distribution, version_spec, for_py_version, in_fold def pip_wheel_env_run(search_dirs, app_data, env): @@ -121,11 +121,11 @@ index 8b3ddd8..7a2a4e5 100644 app_data=app_data, do_periodic_update=False, diff --git a/src/virtualenv/seed/wheels/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py -index f068efc..fc044f1 100644 +index 782051a..38dece9 100644 --- a/src/virtualenv/seed/wheels/embed/__init__.py +++ b/src/virtualenv/seed/wheels/embed/__init__.py -@@ -50,7 +50,11 @@ BUNDLE_SUPPORT = { - MAX = "3.7" +@@ -53,7 +53,11 @@ BUNDLE_SUPPORT = { + MAX = "3.12" +# Redefined here because bundled wheels are removed in RPM build @@ -165,5 +165,5 @@ index 0000000..f3fd9b1 + if wheels_dir.exists(): + yield wheels_dir -- -2.46.2 +2.44.0 diff --git a/SPECS/python-virtualenv.spec b/SPECS/python-virtualenv.spec index 1d10126..0032f12 100644 --- a/SPECS/python-virtualenv.spec +++ b/SPECS/python-virtualenv.spec @@ -1,17 +1,51 @@ -%bcond bootstrap 0 +%bcond bootstrap 1 %bcond tests %{without bootstrap} Name: python-virtualenv -Version: 20.26.6 +Version: 20.21.1 Release: %autorelease Summary: Tool to create isolated Python environments License: MIT URL: http://pypi.python.org/pypi/virtualenv -Source: %{pypi_source virtualenv} +Source0: %{pypi_source virtualenv} # Add /usr/share/python-wheels to extra_search_dir -Patch: rpm-wheels.patch +Patch1: rpm-wheels.patch + +## Backports from virtualenv 20.22+ +## We cannot update yet as we want to preserve support for Python 2.7 and 3.6 environments +## Patches in https://github.com/fedora-python/virtualenv/commits/20.21.x +# (20.23.0) prevent PermissionError when using venv creator on some systems +# https://github.com/pypa/virtualenv/pull/2543 +Patch2: prevent-PermissionError-when-using-venv-creator-on-s.patch +# (20.23.0) 3.12 support and no setuptools/wheel on 3.12+ +# freezgun and typing changes stripped +# files missing in sdist removed from the path file +# https://github.com/pypa/virtualenv/pull/2558 +Patch3: 3.12-support-and-no-setuptools-wheel-on-3.12-2558.patch +# (20.24.0) Fix tests with pluggy 1.2.0+ +# Manually cherry-picked from https://github.com/pypa/virtualenv/pull/2593 +Patch4: Fix-tests-with-pluggy-1.2.0.patch +# Fix compatibility with Python 3.13 +# https://github.com/pypa/virtualenv/pull/2673 +# https://github.com/pypa/virtualenv/pull/2702 +Patch5: py3.13.patch +# Allow builtin interpreter discovery to find specific Python versions given a +# general spec +# https://github.com/pypa/virtualenv/pull/2709 +# which contains regressions (mostly but perhaps not exclusively on Windows) +# that are fixed by: +# Fix PATH-based Python discovery on Windows +# https://github.com/pypa/virtualenv/pull/2712 +# +# Backported to 20.21.1. +Patch6: prs-2709-and-2712.patch +# Quote template strings in activation scripts +# to prevent possible command injection. +# https://github.com/pypa/virtualenv/issues/2768 +# Backported from 20.26.6 +Patch7: prevent_command_injection.patch BuildArch: noarch @@ -21,17 +55,20 @@ BuildRequires: python3-devel BuildRequires: fish BuildRequires: tcsh BuildRequires: gcc -# from the [test] extra, but manually filtered, version bounds removed BuildRequires: python3-flaky BuildRequires: python3-packaging BuildRequires: python3-pytest -BuildRequires: python3-pytest-env -#BuildRequires: python3-pytest-freezer -- not available, tests skipped BuildRequires: python3-pytest-mock BuildRequires: python3-pytest-randomly BuildRequires: python3-pytest-timeout -BuildRequires: python3-setuptools -BuildRequires: python3-time-machine + +# The .dist-info folder generated by +# %%pyproject_buildrequires confuses +# importlib.metadata entry points and +# that leads to failed tests where +# virtualenv is run via subprocess. +# The .dist-info is removed since: +BuildRequires: pyproject-rpm-macros >= 1.6.3 %endif # RPM installed wheels @@ -39,38 +76,44 @@ BuildRequires: %{python_wheel_pkg_prefix}-pip-wheel BuildRequires: %{python_wheel_pkg_prefix}-setuptools-wheel BuildRequires: %{python_wheel_pkg_prefix}-wheel-wheel -%global _description %{expand: -virtualenv is a tool to create isolated Python environments. -A subset of it has been integrated into the Python standard library under -the venv module. The venv module does not offer all features of this library, -to name just a few more prominent: - -- is slower (by not having the app-data seed method), -- is not as extendable, -- cannot create virtual environments for arbitrarily installed Python versions - (and automatically discover these), -- does not have as rich programmatic API (describe virtual environments - without creating them).} - -%description %_description +%description +virtualenv is a tool to create isolated Python environments. virtualenv +is a successor to workingenv, and an extension of virtual-python. It is +written by Ian Bicking, and sponsored by the Open Planning Project. It is +licensed under an MIT-style permissive license. %package -n python3-virtualenv Summary: Tool to create isolated Python environments +# This virtualenv requires the "venv" install scheme on Pythons +# where we patch "posix_prefix". +# Explicitly conflict with Pythons where we don't have it yet. +Conflicts: python3.11 < 3.11.0~a2 +%if 0%{?fedora} >= 36 +Conflicts: python3.10 < 3.10.0-3 +%endif + +Obsoletes: python3-virtualenv-python26 < 16.6 +%{?python_provide:%python_provide python3-virtualenv} + # Provide "virtualenv" for convenience Provides: virtualenv = %{version}-%{release} # RPM installed wheels Requires: %{python_wheel_pkg_prefix}-pip-wheel -# Python 3.12 virtualenvs are created without setuptools/wheel, -# but the users can still do --wheel=bundle --setuptools=bundle to force them: Requires: %{python_wheel_pkg_prefix}-setuptools-wheel Requires: %{python_wheel_pkg_prefix}-wheel-wheel -# This was a requirement for Python 3.6+2.7 virtual environments -Obsoletes: %{python_wheel_pkg_prefix}-wheel0.37-wheel < 0.37.1-20 +# Pythons < 3.7 need an older version of wheel: +Requires: (%{python_wheel_pkg_prefix}-wheel0.37-wheel if python2.7) +Requires: (%{python_wheel_pkg_prefix}-wheel0.37-wheel if pypy2.7) +Requires: (%{python_wheel_pkg_prefix}-wheel0.37-wheel if python3.6) -%description -n python3-virtualenv %_description +%description -n python3-virtualenv +virtualenv is a tool to create isolated Python environments. virtualenv +is a successor to workingenv, and an extension of virtual-python. It is +written by Ian Bicking, and sponsored by the Open Planning Project. It is +licensed under an MIT-style permissive license %prep @@ -87,6 +130,15 @@ test ! -f src/virtualenv/seed/embed/wheels/*.whl # On Fedora, this should change nothing, but when building for RHEL9+, it will sed -i "s|/usr/share/python-wheels|%{python_wheel_dir}|" src/virtualenv/util/path/_system_wheels.py +# Allow platformdirs version 4 +# Backported from release 20.24.7 +# https://github.com/pypa/virtualenv/commit/55650340d9c9415bf035596266f245a8d59c6993 +sed -i "s/platformdirs<4/platformdirs<5/" pyproject.toml + +# Fix compatibility with pytest 8 +# Fixed upstream in: https://github.com/pypa/virtualenv/commit/16a6af7760c0806c2071956435b1822bb8424595 +sed -i "/pytest.skip/s/msg=/reason=/" tests/unit/activation/conftest.py tests/conftest.py + %generate_buildrequires %pyproject_buildrequires @@ -95,15 +147,14 @@ sed -i "s|/usr/share/python-wheels|%{python_wheel_dir}|" src/virtualenv/util/pat %install %pyproject_install -%pyproject_save_files -l virtualenv +%pyproject_save_files virtualenv -%check -%pyproject_check_import -e '*activate_this' -e '*windows*' %if %{with tests} +%check # Skip tests which requires internet or some extra dependencies # Requires internet: # - test_download_* -# - test_can_build_c_extensions +# - test_can_build_c_extensions (on Python 3.12+) # Uses disabled functionalities around bundled wheels: # - test_wheel_* # - test_seed_link_via_app_data @@ -112,15 +163,20 @@ sed -i "s|/usr/share/python-wheels|%{python_wheel_dir}|" src/virtualenv/util/pat # - test_bundle.py (whole file) # Uses disabled functionalities around automatic updates: # - test_periodic_update.py (whole file) +# Requires Python 2: +# - test_py_pyc_missing PIP_CERT=/etc/pki/tls/certs/ca-bundle.crt \ %pytest -vv -k "not test_bundle and \ not test_acquire and \ not test_periodic_update and \ not test_wheel_ and \ not test_download_ and \ +%if v"%{python3_version}" >= v"3.12" not test_can_build_c_extensions and \ +%endif not test_base_bootstrap_via_pip_invoke and \ - not test_seed_link_via_app_data" + not test_seed_link_via_app_data and \ + not test_py_pyc_missing" %endif %files -n python3-virtualenv -f %{pyproject_files}