Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move Python 3.13 into the stable Python category and call a notional Python 3.14 "future Python" #279

Merged
merged 15 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions config/c-code/manylinux-install.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,14 @@ yum -y install libffi-devel
tox_env_map() {
case $1 in
{% if with_future_python %}
*"cp313"*) echo 'py313';;
*"cp314"*) echo 'py314';;
{% endif %}
*"cp38"*) echo 'py38';;
*"cp39"*) echo 'py39';;
*"cp310"*) echo 'py310';;
*"cp311"*) echo 'py311';;
*"cp312"*) echo 'py312';;
*"cp313"*) echo 'py313';;
icemac marked this conversation as resolved.
Show resolved Hide resolved
*) echo 'py';;
esac
}
Expand All @@ -45,15 +46,16 @@ tox_env_map() {
for PYBIN in /opt/python/*/bin; do
if \
{% if with_future_python %}
[[ "${PYBIN}" == *"cp313/"* ]] || \
[[ "${PYBIN}" == *"cp314/"* ]] || \
{% endif %}
[[ "${PYBIN}" == *"cp311/"* ]] || \
[[ "${PYBIN}" == *"cp312/"* ]] || \
[[ "${PYBIN}" == *"cp313/"* ]] || \
[[ "${PYBIN}" == *"cp38/"* ]] || \
[[ "${PYBIN}" == *"cp39/"* ]] || \
[[ "${PYBIN}" == *"cp310/"* ]] ; then
{% if with_future_python %}
if [[ "${PYBIN}" == *"cp313/"* ]] ; then
if [[ "${PYBIN}" == *"cp314/"* ]] ; then
"${PYBIN}/pip" install --pre -e /io/
"${PYBIN}/pip" wheel /io/ --pre -w wheelhouse/
else
Expand Down
2 changes: 0 additions & 2 deletions config/c-code/tests-cache.j2
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
{% if with_future_python %}
allow-prereleases: true
{% endif %}
icemac marked this conversation as resolved.
Show resolved Hide resolved
###
# Caching.
# This actually *restores* a cache and schedules a cleanup action
Expand Down
1 change: 1 addition & 0 deletions config/c-code/tests-strategy.j2
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
- "3.10"
- "3.11"
- "3.12"
- "3.13"
{% if with_future_python %}
- "%(future_python_version)s"
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions config/c-code/tests.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ jobs:
{% endif %}
run: |
pip install -U wheel "setuptools %(setuptools_version_spec)s"
pip install -U coverage
pip install -U coverage[toml]
pip install -U 'cffi; platform_python_implementation == "CPython"'
# Unzip into src/ so that testrunner can find the .so files
# when we ask it to load tests from that directory. This
Expand Down Expand Up @@ -334,7 +334,7 @@ jobs:
- name: Install %(package_name)s
run: |
pip install -U wheel
pip install -U coverage
pip install -U coverage[toml]
pip install -U "`ls dist/%(package_name)s-*.whl`[docs]"
- name: Build docs
env:
Expand Down
3 changes: 2 additions & 1 deletion config/c-code/tox.ini.j2
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ envlist =
py310,py310-pure
py311,py311-pure
py312,py312-pure
{% if with_future_python %}
py313,py313-pure
{% if with_future_python %}
py314,py314-pure
{% endif %}
{% if with_pypy %}
pypy3
Expand Down
5 changes: 2 additions & 3 deletions config/default/tests.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ jobs:
- ["3.10", "py310"]
- ["3.11", "py311"]
- ["3.12", "py312"]
- ["3.13", "py313"]
{% if with_future_python %}
- ["%(future_python_version)s", "py313"]
- ["%(future_python_version)s", "py314"]
{% endif %}
{% if with_pypy %}
- ["pypy-3.10", "pypy3"]
Expand Down Expand Up @@ -93,9 +94,7 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.config[0] }}
{% if with_future_python %}
allow-prereleases: true
{% endif %}
- name: Pip cache
uses: actions/cache@v4
with:
Expand Down
3 changes: 2 additions & 1 deletion config/default/tox-envlist.j2
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ envlist =
py310
py311
py312
{% if with_future_python %}
py313
{% if with_future_python %}
py314
{% endif %}
{% if with_pypy %}
pypy3
Expand Down
4 changes: 1 addition & 3 deletions config/default/tox-testenv.j2
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package = wheel
wheel_build_env = .pkg
{% endif %}
{% if with_future_python %}
pip_pre = py313: true
pip_pre = py314: true
{% endif %}
deps =
setuptools %(setuptools_version_spec)s
Expand All @@ -24,8 +24,6 @@ setenv =
%(line)s
{% endfor %}
{% endif %}
py312: VIRTUALENV_PIP=23.1.2
py312: PIP_REQUIRE_VIRTUALENV=0
{% if testenv_commands_pre %}
commands_pre =
{% for line in testenv_commands_pre %}
Expand Down
4 changes: 2 additions & 2 deletions config/shared/packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
ORG = 'zopefoundation'
BASE_PATH = pathlib.Path(__file__).parent.parent
OLDEST_PYTHON_VERSION = '3.8'
NEWEST_PYTHON_VERSION = '3.12'
NEWEST_PYTHON_VERSION = '3.13'
SUPPORTED_PYTHON_VERSIONS = [
f'3.{i}' for i in range(int(OLDEST_PYTHON_VERSION.replace('3.', '')),
int(NEWEST_PYTHON_VERSION.replace('3.', '')) + 1)
]
FUTURE_PYTHON_VERSION = '3.13'
FUTURE_PYTHON_VERSION = '3.14'
PYPY_VERSION = '3.10'
SETUPTOOLS_VERSION_SPEC = '<74'
MANYLINUX_PYTHON_VERSION = '3.11'
Expand Down
2 changes: 0 additions & 2 deletions config/toolkit/tox.ini.j2
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ 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 %}
Expand Down
2 changes: 0 additions & 2 deletions config/zope-product/tox.ini.j2
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ 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 %}
Expand Down