From 41a0fb98cd2734a7c6da5250ae9ce4eda2723055 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Mon, 16 Oct 2023 08:20:43 +0200 Subject: [PATCH] Fix GHA manylinux tests. --- .github/workflows/tests.yml | 28 ++-------------------------- .manylinux-install.sh | 13 ++++--------- .meta.toml | 6 +++++- .readthedocs.yaml | 25 +++++++++++++++++++++++++ MANIFEST.in | 1 + appveyor.yml | 4 +--- tox.ini | 30 ++++++++++++++++++++---------- 7 files changed, 58 insertions(+), 49 deletions(-) create mode 100644 .readthedocs.yaml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f1129f5..7a3d9f8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -102,7 +102,7 @@ jobs: - "3.9" - "3.10" - "3.11" - - "3.12.0-beta.4" + - "3.12" os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 @@ -178,15 +178,7 @@ jobs: python setup.py build_ext -i python setup.py bdist_wheel - - name: Install zope.index and dependencies (3.12.0-beta.4) - if: matrix.python-version == '3.12.0-beta.4' - run: | - # Install to collect dependencies into the (pip) cache. - # Use "--pre" here because dependencies with support for this future - # Python release may only be available as pre-releases - pip install --pre .[test] - name: Install zope.index and dependencies - if: matrix.python-version != '3.12.0-beta.4' run: | # Install to collect dependencies into the (pip) cache. pip install .[test] @@ -230,7 +222,6 @@ jobs: && startsWith(github.ref, 'refs/tags') && startsWith(runner.os, 'Mac') && !startsWith(matrix.python-version, 'pypy') - && !startsWith(matrix.python-version, '3.12.0-beta.4') env: TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} run: | @@ -249,7 +240,7 @@ jobs: - "3.9" - "3.10" - "3.11" - - "3.12.0-beta.4" + - "3.12" os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 @@ -286,22 +277,7 @@ jobs: with: name: zope.index-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ - - name: Install zope.index 3.12.0-beta.4 - if: ${{ startsWith(matrix.python-version, '3.12.0-beta.4') }} - run: | - pip install -U wheel setuptools - # 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 - # Unzip into src/ so that testrunner can find the .so files - # when we ask it to load tests from that directory. This - # might also save some build time? - unzip -n dist/zope.index-*whl -d src - # Use "--pre" here because dependencies with support for this future - # Python release may only be available as pre-releases - pip install --pre -U -e .[test] - name: Install zope.index - if: ${{ !startsWith(matrix.python-version, '3.12.0-beta.4') }} run: | pip install -U wheel setuptools pip install -U coverage diff --git a/.manylinux-install.sh b/.manylinux-install.sh index 9820362..614917e 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -28,12 +28,12 @@ yum -y install libffi-devel tox_env_map() { case $1 in - *"cp312"*) echo 'py312';; *"cp37"*) echo 'py37';; *"cp38"*) echo 'py38';; *"cp39"*) echo 'py39';; *"cp310"*) echo 'py310';; *"cp311"*) echo 'py311';; + *"cp312"*) echo 'py312';; *) echo 'py';; esac } @@ -41,19 +41,14 @@ tox_env_map() { # Compile wheels for PYBIN in /opt/python/*/bin; do if \ - [[ "${PYBIN}" == *"cp312"* ]] || \ [[ "${PYBIN}" == *"cp311"* ]] || \ + [[ "${PYBIN}" == *"cp312"* ]] || \ [[ "${PYBIN}" == *"cp37"* ]] || \ [[ "${PYBIN}" == *"cp38"* ]] || \ [[ "${PYBIN}" == *"cp39"* ]] || \ [[ "${PYBIN}" == *"cp310"* ]] ; then - if [[ "${PYBIN}" == *"cp312"* ]] ; then - "${PYBIN}/pip" install --pre -e /io/ - "${PYBIN}/pip" wheel /io/ --pre -w wheelhouse/ - else - "${PYBIN}/pip" install -e /io/ - "${PYBIN}/pip" wheel /io/ -w wheelhouse/ - fi + "${PYBIN}/pip" install -e /io/ + "${PYBIN}/pip" wheel /io/ -w wheelhouse/ if [ `uname -m` == 'aarch64' ]; then cd /io/ ${PYBIN}/pip install tox diff --git a/.meta.toml b/.meta.toml index 17da41f..e38f0ab 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/c-code [meta] template = "c-code" -commit-id = "b99ba750" +commit-id = "978a8a28" [python] with-appveyor = true @@ -15,12 +15,16 @@ with-macos = false [tox] use-flake8 = true +testenv-deps = [ + "py37: urllib3 < 2", + ] [coverage] fail-under = 99 [manifest] additional-rules = [ + "include *.yaml", "include *.sh", "recursive-include docs *.bat", "recursive-include src *.rst", diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000..e30cda5 --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,25 @@ +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +# Required +version: 2 + +# Set the version of Python and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: "3.11" + +# Build documentation in the docs/ directory with Sphinx +sphinx: + configuration: docs/conf.py + +# We recommend specifying your dependencies to enable reproducible builds: +# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html +python: + install: + - requirements: docs/requirements.txt + - method: pip + path: . diff --git a/MANIFEST.in b/MANIFEST.in index 0741033..6c1f54b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -14,6 +14,7 @@ recursive-include docs *.txt recursive-include docs Makefile recursive-include src *.py +include *.yaml include *.sh recursive-include docs *.bat recursive-include src *.rst diff --git a/appveyor.yml b/appveyor.yml index 81f17b3..90ddfcb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,9 +15,7 @@ environment: - python: 39-x64 - python: 310-x64 - python: 311-x64 - # `multibuild` cannot install non-final versions as they are not on - # ftp.python.org, so we skip Python 3.11 until its final release: - # - python: 312-x64 + - python: 312-x64 install: - "SET PYTHONVERSION=%PYTHON%" diff --git a/tox.ini b/tox.ini index 5b4c5b2..2ab6e04 100644 --- a/tox.ini +++ b/tox.ini @@ -16,9 +16,8 @@ envlist = [testenv] usedevelop = true -pip_pre = py312: true deps = - Sphinx + py37: urllib3 < 2 setenv = pure: PURE_PYTHON=1 !pure-!pypy3: PURE_PYTHON=0 @@ -37,6 +36,7 @@ allowlist_externals = mkdir deps = coverage + py37: urllib3 < 2 setenv = PURE_PYTHON=1 commands = @@ -44,21 +44,31 @@ commands = coverage run -m zope.testrunner --test-path=src {posargs:-vc} coverage html -i coverage report -i -m --fail-under=99 - -[testenv:lint] +[testenv:release-check] +description = ensure that the distribution is ready to release basepython = python3 skip_install = true +deps = + twine + build + check-manifest + check-python-versions >= 0.20.0 + wheel commands = - isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py - flake8 src setup.py check-manifest check-python-versions + python -m build --sdist --no-isolation + twine check dist/* + +[testenv:lint] +basepython = python3 +skip_install = true deps = - check-manifest - check-python-versions >= 0.19.1 - wheel - flake8 isort + flake8 +commands = + isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py + flake8 src setup.py [testenv:isort-apply] basepython = python3