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

Do not publish future versions #132

Merged
merged 6 commits into from
Jan 28, 2022
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion config/c-code/tests-strategy.j2
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
- "3.9"
- "3.10"
{% if with_future_python %}
- "3.11.0-alpha.4"
- "%(future_python_version)s"
{% endif %}
os: [ubuntu-20.04, macos-latest]
{% if with_pypy or with_legacy_python or gha_additional_exclude %}
Expand Down
11 changes: 9 additions & 2 deletions config/c-code/tests.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ jobs:
run: |
pip install -U pip
pip install -U setuptools wheel twine cffi
pip install -U coveralls coverage

- name: Build %(package_name)s
run: |
Expand All @@ -108,7 +107,6 @@ jobs:
python setup.py build_ext -i
python setup.py bdist_wheel
# Also install it, so that we get dependencies in the (pip) cache.
pip install -U coverage
pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
pip install .[test]

Expand All @@ -130,6 +128,9 @@ jobs:
&& startsWith(github.ref, 'refs/tags')
&& startsWith(runner.os, 'Mac')
&& !startsWith(matrix.python-version, 'pypy')
{% if with_future_python %}
&& !startsWith(matrix.python-version, '%(future_python_version)s')
{% endif %}
env:
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
run: |
Expand All @@ -151,7 +152,13 @@ jobs:
- name: Install %(package_name)s
run: |
pip install -U wheel setuptools
{% if with_future_python %}
# coverage has a wheel on PyPI for a future python version which is
# not ABI compatible with the current one, so build it from sdist:
pip install -U --no-binary :all: coverage
icemac marked this conversation as resolved.
Show resolved Hide resolved
{% else %}
pip install -U coverage
{% endif %}
pip install -U 'faulthandler; python_version == "2.7" and 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
2 changes: 2 additions & 0 deletions config/config-package.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
META_HINT = """\
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/{config_type}"""
FUTUTRE_PYTHON_VERSION = "3.11.0-alpha.4"


def copy_with_meta(template_name, destination, config_type, **kw):
Expand Down Expand Up @@ -352,6 +353,7 @@ def copy_with_meta(template_name, destination, config_type, **kw):
with_sphinx_doctests=with_sphinx_doctests,
with_legacy_python=with_legacy_python,
with_future_python=with_future_python,
future_python_version=FUTUTRE_PYTHON_VERSION,
with_pypy=with_pypy,
with_windows=with_windows,
)
Expand Down
2 changes: 1 addition & 1 deletion config/default/tests.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- ["3.9", "py39"]
- ["3.10", "py310"]
{% if with_future_python %}
- ["3.11.0-alpha.4", "py311"]
- ["%(future_python_version)s", "py311"]
{% endif %}
{% if with_pypy and with_legacy_python %}
- ["pypy2", "pypy"]
Expand Down