Revert "- switch template files"

This reverts commit 8e62fae.
zopefoundation · Sep 15, 2024 · 9ae4a4d · 9ae4a4d
1 parent d224896
commit 9ae4a4d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/config/c-code/manylinux-install.sh.j2 b/config/c-code/manylinux-install.sh.j2
@@ -30,14 +30,13 @@ yum -y install libffi-devel
 tox_env_map() {
     case $1 in
 {% if with_future_python %}
-        *"cp314"*) echo 'py314';;
+        *"cp313"*) echo 'py313';;
 {% endif %}
         *"cp38"*) echo 'py38';;
         *"cp39"*) echo 'py39';;
         *"cp310"*) echo 'py310';;
         *"cp311"*) echo 'py311';;
         *"cp312"*) echo 'py312';;
-        *"cp313"*) echo 'py313';;
         *) echo 'py';;
     esac
 }
@@ -46,16 +45,15 @@ tox_env_map() {
 for PYBIN in /opt/python/*/bin; do
     if \
 {% if with_future_python %}
-       [[ "${PYBIN}" == *"cp314/"* ]] || \
+       [[ "${PYBIN}" == *"cp313/"* ]] || \
 {% endif %}
        [[ "${PYBIN}" == *"cp311/"* ]] || \
        [[ "${PYBIN}" == *"cp312/"* ]] || \
-       [[ "${PYBIN}" == *"cp313/"* ]] || \
        [[ "${PYBIN}" == *"cp38/"* ]] || \
        [[ "${PYBIN}" == *"cp39/"* ]] || \
        [[ "${PYBIN}" == *"cp310/"* ]] ; then
 {% if with_future_python %}
-        if [[ "${PYBIN}" == *"cp314/"* ]] ; then
+        if [[ "${PYBIN}" == *"cp313/"* ]] ; then
             "${PYBIN}/pip" install --pre -e /io/
             "${PYBIN}/pip" wheel /io/ --pre -w wheelhouse/
         else

diff --git a/config/c-code/tox.ini.j2 b/config/c-code/tox.ini.j2
@@ -11,9 +11,8 @@ envlist =
     py310,py310-pure
     py311,py311-pure
     py312,py312-pure
-    py313,py313-pure
 {% if with_future_python %}
-    py314,py314-pure
+    py313,py313-pure
 {% endif %}
 {% if with_pypy %}
     pypy3

diff --git a/config/default/tests.yml.j2 b/config/default/tests.yml.j2
@@ -41,9 +41,8 @@ jobs:
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]
         - ["3.12",  "py312"]
-        - ["3.13",  "py313"]
 {% if with_future_python %}
-        - ["%(future_python_version)s",  "py314"]
+        - ["%(future_python_version)s",  "py313"]
 {% endif %}
 {% if with_pypy %}
         - ["pypy-3.10", "pypy3"]

diff --git a/config/default/tox-envlist.j2 b/config/default/tox-envlist.j2
@@ -8,9 +8,8 @@ envlist =
     py310
     py311
     py312
-    py313
 {% if with_future_python %}
-    py314
+    py313
 {% endif %}
 {% if with_pypy %}
     pypy3

diff --git a/config/default/tox-testenv.j2 b/config/default/tox-testenv.j2
@@ -8,7 +8,7 @@ package = wheel
 wheel_build_env = .pkg
 {% endif %}
 {% if with_future_python %}
-pip_pre = py314: true
+pip_pre = py313: true
 {% endif %}
 deps =
     setuptools  %(setuptools_version_spec)s

diff --git a/config/toolkit/tox.ini.j2 b/config/toolkit/tox.ini.j2
@@ -16,6 +16,8 @@ setenv =
     %(line)s
   {% endfor %}
 {% endif %}
+    py312: VIRTUALENV_PIP=23.1.2
+    py312: PIP_REQUIRE_VIRTUALENV=0
 commands_pre =
 {% if testenv_commands_pre %}
   {% for line in testenv_commands_pre %}

diff --git a/config/zope-product/tox.ini.j2 b/config/zope-product/tox.ini.j2
@@ -16,6 +16,8 @@ setenv =
     %(line)s
   {% endfor %}
 {% endif %}
+    py312: VIRTUALENV_PIP=23.1.2
+    py312: PIP_REQUIRE_VIRTUALENV=0
 commands_pre =
 {% if testenv_commands_pre %}
   {% for line in testenv_commands_pre %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,9 +8,8 @@ envlist = @@
         py310
         py311
         py312
-        py313
     {% if with_future_python %}
-        py314
+        py313
     {% endif %}
     {% if with_pypy %}
         pypy3
@@ Expand Down @@