diff --git a/.coveragerc b/.coveragerc index bd610ab..b102ff0 100644 --- a/.coveragerc +++ b/.coveragerc @@ -17,6 +17,7 @@ source = [report] show_missing = true precision = 2 +ignore_errors = True exclude_lines = except ImportError: if __name__ == '__main__': diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e7d99dc..df7dac0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -162,14 +162,14 @@ jobs: if: matrix.python-version == '3.13' run: | pip install -U pip - pip install -U setuptools wheel twine + pip install -U "setuptools<69" wheel twine # Remove this hack once 'cffi' has a release supporting Python 3.13. pip install -e "git+https://github.com/python-cffi/cffi.git#egg=cffi" - name: Install Build Dependencies if: matrix.python-version != '3.13' run: | pip install -U pip - pip install -U setuptools wheel twine + pip install -U "setuptools<69" wheel twine pip install cffi - name: Build persistent (macOS x86_64, Python 3.8+) @@ -254,14 +254,14 @@ jobs: with: name: persistent-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/*whl - - name: Publish package to PyPI (mac) - # We cannot 'uses: pypa/gh-action-pypi-publish@v1.4.1' because - # that's apparently a container action, and those don't run on - # the Mac. + - name: Publish package to PyPI (Non-Linux) + # We cannot use pypa/gh-action-pypi-publish because that + # is a container action, and those don't run on macOS + # or Windows GHA runners. if: > github.event_name == 'push' && startsWith(github.ref, 'refs/tags') - && startsWith(runner.os, 'Mac') + && !startsWith(runner.os, 'Linux') && !startsWith(matrix.python-version, 'pypy') && !startsWith(matrix.python-version, '3.13') env: @@ -346,7 +346,7 @@ jobs: - name: Install persistent 3.13 ${{ matrix.python-version }} if: matrix.python-version == '3.13' run: | - pip install -U wheel setuptools + pip install -U wheel "setuptools<69" # Remove this hack once 'cffi' has a release supporting Python 3.13. pip install -e "git+https://github.com/python-cffi/cffi.git#egg=cffi" # coverage might have a wheel on PyPI for a future python version which is @@ -362,7 +362,7 @@ jobs: - name: Install persistent if: matrix.python-version != '3.13' run: | - pip install -U wheel setuptools + pip install -U wheel "setuptools<69" pip install -U coverage pip install -U 'cffi; platform_python_implementation == "CPython"' # Unzip into src/ so that testrunner can find the .so files @@ -634,5 +634,5 @@ jobs: with: user: __token__ password: ${{ secrets.TWINE_PASSWORD }} - skip_existing: true - packages_dir: wheelhouse/ + skip-existing: true + packages-dir: wheelhouse/ diff --git a/.manylinux-install.sh b/.manylinux-install.sh index 804f2e3..a654758 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -42,14 +42,14 @@ tox_env_map() { # Compile wheels for PYBIN in /opt/python/*/bin; do if \ - [[ "${PYBIN}" == *"cp313"* ]] || \ - [[ "${PYBIN}" == *"cp311"* ]] || \ - [[ "${PYBIN}" == *"cp312"* ]] || \ - [[ "${PYBIN}" == *"cp37"* ]] || \ - [[ "${PYBIN}" == *"cp38"* ]] || \ - [[ "${PYBIN}" == *"cp39"* ]] || \ - [[ "${PYBIN}" == *"cp310"* ]] ; then - if [[ "${PYBIN}" == *"cp313"* ]] ; then + [[ "${PYBIN}" == *"cp313/"* ]] || \ + [[ "${PYBIN}" == *"cp311/"* ]] || \ + [[ "${PYBIN}" == *"cp312/"* ]] || \ + [[ "${PYBIN}" == *"cp37/"* ]] || \ + [[ "${PYBIN}" == *"cp38/"* ]] || \ + [[ "${PYBIN}" == *"cp39/"* ]] || \ + [[ "${PYBIN}" == *"cp310/"* ]] ; then + if [[ "${PYBIN}" == *"cp313/"* ]] ; then "${PYBIN}/pip" install --pre -e /io/ "${PYBIN}/pip" wheel /io/ --pre -w wheelhouse/ else diff --git a/.meta.toml b/.meta.toml index b308bad..6297b12 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,10 +2,10 @@ # https://github.com/zopefoundation/meta/tree/master/config/c-code [meta] template = "c-code" -commit-id = "5a4d3a13" +commit-id = "4dc0484e" [python] -with-appveyor = true +with-appveyor = false with-windows = true with-pypy = true with-future-python = true diff --git a/tox.ini b/tox.ini index 6f25e97..c931407 100644 --- a/tox.ini +++ b/tox.ini @@ -19,6 +19,7 @@ envlist = usedevelop = true pip_pre = py313: true deps = + setuptools < 69 py37: urllib3 < 2 Sphinx setenv =