Merge branch 'main' into fix/2935-too-many-open-files

Author: esafak

.github/ISSUE_TEMPLATE/bug-report.md

@@ -15,6 +15,8 @@ Describe what's the expected behavior and what you're observing.
 Provide at least:
 
 - OS:
+- Shell:
+- Python version and path:
 - `pip list` of the host python where `virtualenv` is installed:
 
   ```console

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
       - id: codespell
         args: ["--write-changes"]
   - repo: https://github.com/tox-dev/tox-ini-fmt
-    rev: "1.5.0"
+    rev: "1.6.0"
     hooks:
       - id: tox-ini-fmt
         args: ["-p", "fix"]
@@ -24,7 +24,7 @@ repos:
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.12.5"
+    rev: "v0.12.7"
     hooks:
       - id: ruff-format
       - id: ruff

docs/changelog.rst

@@ -5,6 +5,16 @@ Release History
 
 .. towncrier release notes start
 
+v20.33.1 (2025-08-05)
+---------------------
+
+Bugfixes - 20.33.1
+~~~~~~~~~~~~~~~~~~
+- Correctly unpack _get_tcl_tk_libs() response in PythonInfo.
+  Contributed by :user:`esafak`. (:issue:`2930`)
+- Restore `py_info.py` timestamp in `test_py_info_cache_invalidation_on_py_info_change`
+  Contributed by :user:`esafak`. (:issue:`2933`)
+
 v20.33.0 (2025-08-03)
 ---------------------
 

src/virtualenv/activation/bash/__init__.py

@@ -12,6 +12,14 @@ def templates(self):
     def as_name(self, template):
         return Path(template).stem
 
+    def replacements(self, creator, dest):
+        data = super().replacements(creator, dest)
+        data.update({
+            "__TCL_LIBRARY__": creator.interpreter.tcl_lib or "",
+            "__TK_LIBRARY__": creator.interpreter.tk_lib or "",
+        })
+        return data
+
 
 __all__ = [
     "BashActivator",

src/virtualenv/activation/bash/activate.sh

@@ -79,15 +79,15 @@ if ! [ -z "${PYTHONHOME+_}" ] ; then
     unset PYTHONHOME
 fi
 
-if [ __TCL_LIBRARY__ != "''" ]; then
+if [ __TCL_LIBRARY__ != "" ]; then
     if ! [ -z "${TCL_LIBRARY+_}" ] ; then
         _OLD_VIRTUAL_TCL_LIBRARY="$TCL_LIBRARY"
     fi
     TCL_LIBRARY=__TCL_LIBRARY__
     export TCL_LIBRARY
 fi
 
-if [ __TK_LIBRARY__ != "''" ]; then
+if [ __TK_LIBRARY__ != "" ]; then
     if ! [ -z "${TK_LIBRARY+_}" ] ; then
         _OLD_VIRTUAL_TK_LIBRARY="$TK_LIBRARY"
     fi

src/virtualenv/discovery/py_info.py

@@ -123,7 +123,10 @@ def abs_path(v):
 
         self.sysconfig_vars = {i: sysconfig.get_config_var(i or "") for i in config_var_keys}
 
-        self.tcl_lib, self.tk_lib = self._get_tcl_tk_libs() if "TCL_LIBRARY" in os.environ else None, None
+        if "TCL_LIBRARY" in os.environ:
+            self.tcl_lib, self.tk_lib = self._get_tcl_tk_libs()
+        else:
+            self.tcl_lib, self.tk_lib = None, None
 
         confs = {
             k: (self.system_prefix if v is not None and v.startswith(self.prefix) else v)

tests/unit/activation/test_bash.py

@@ -48,16 +48,16 @@ def __init__(self, dest):
     assert "unset _OLD_VIRTUAL_TK_LIBRARY" in content
 
     if present:
-        assert "if [ /path/to/tcl != \"''\" ]; then" in content
+        assert 'if [ /path/to/tcl != "" ]; then' in content
         assert "TCL_LIBRARY=/path/to/tcl" in content
         assert "export TCL_LIBRARY" in content
 
-        assert "if [ /path/to/tk != \"''\" ]; then" in content
+        assert 'if [ /path/to/tk != "" ]; then' in content
         assert "TK_LIBRARY=/path/to/tk" in content
         assert "export TK_LIBRARY" in content
     else:
         # When not present, the if condition is false, so the block is not executed
-        assert "if [ '' != \"''\" ]; then" in content
+        assert "if [ '' != \"\" ]; then" in content, content
         assert "TCL_LIBRARY=''" in content
         # The export is inside the if, so this is fine
         assert "export TCL_LIBRARY" in content

tests/unit/discovery/py_info/test_py_info.py

@@ -165,6 +165,7 @@ def test_py_info_cache_invalidation_on_py_info_change(mocker, session_app_data):
     # 3. Modify the content of py_info.py
     py_info_script = Path(cached_py_info.__file__).parent / "py_info.py"
     original_content = py_info_script.read_text(encoding="utf-8")
+    original_stat = py_info_script.stat()
 
     try:
         # 4. Clear the in-memory cache
@@ -181,8 +182,9 @@ def test_py_info_cache_invalidation_on_py_info_change(mocker, session_app_data):
             assert spy.call_count == 2
 
     finally:
-        # Restore the original content
+        # Restore the original content and timestamp
         py_info_script.write_text(original_content, encoding="utf-8")
+        os.utime(str(py_info_script), (original_stat.st_atime, original_stat.st_mtime))
 
 
 @pytest.mark.skipif(not fs_supports_symlink(), reason="symlink is not supported")