diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index df7dac0..a78aa77 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -97,7 +97,6 @@ jobs: matrix: python-version: - "pypy-3.10" - - "3.7" - "3.8" - "3.9" - "3.10" @@ -106,13 +105,8 @@ jobs: - "3.13" os: [ubuntu-latest, macos-latest, windows-latest] exclude: - - os: macos-latest - python-version: "3.7" - os: macos-latest python-version: "pypy-3.10" - include: - - python-version: "3.7" - os: macos-12 steps: - name: checkout @@ -172,11 +166,10 @@ jobs: pip install -U "setuptools<69" wheel twine pip install cffi - - name: Build persistent (macOS x86_64, Python 3.8+) + - name: Build persistent (macOS x86_64) if: > startsWith(runner.os, 'Mac') - && !(startsWith(matrix.python-version, 'pypy') - || matrix.python-version == '3.7') + && !startsWith(matrix.python-version, 'pypy') env: MACOSX_DEPLOYMENT_TARGET: 10.9 _PYTHON_HOST_PLATFORM: macosx-10.9-x86_64 @@ -186,11 +179,10 @@ jobs: # output (pip install uses a random temporary directory, making this difficult). python setup.py build_ext -i python setup.py bdist_wheel - - name: Build persistent (macOS arm64, Python 3.8+) + - name: Build persistent (macOS arm64) if: > startsWith(runner.os, 'Mac') - && !(startsWith(matrix.python-version, 'pypy') - || matrix.python-version == '3.7') + && !startsWith(matrix.python-version, 'pypy') env: MACOSX_DEPLOYMENT_TARGET: 11.0 _PYTHON_HOST_PLATFORM: macosx-11.0-arm64 @@ -204,7 +196,6 @@ jobs: if: > !startsWith(runner.os, 'Mac') || startsWith(matrix.python-version, 'pypy') - || matrix.python-version == '3.7' run: | # Next, build the wheel *in place*. This helps ccache, and also lets us cache the configure # output (pip install uses a random temporary directory, making this difficult). @@ -233,19 +224,18 @@ jobs: startsWith(runner.os, 'Mac') uses: actions/upload-artifact@v4 with: - name: persistent-${{ runner.os }}-${{ matrix.python-version }}.whl + # The x86_64 wheel is uploaded with a different name just so it can be + # manually downloaded when desired. The wheel itself *cannot* be tested + # on the GHA runner, which uses arm64 architecture. + name: persistent-${{ runner.os }}-${{ matrix.python-version }}-x86_64.whl path: dist/*x86_64.whl - name: Upload persistent wheel (macOS arm64) if: > startsWith(runner.os, 'Mac') - && !(startsWith(matrix.python-version, 'pypy') - || matrix.python-version == '3.7') + && !startsWith(matrix.python-version, 'pypy') uses: actions/upload-artifact@v4 with: - # The arm64 wheel is uploaded with a different name just so it can be - # manually downloaded when desired. The wheel itself *cannot* be tested - # on the GHA runner, which uses x86_64 architecture. - name: persistent-${{ runner.os }}-${{ matrix.python-version }}-arm64.whl + name: persistent-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/*arm64.whl - name: Upload persistent wheel (all other platforms) if: > @@ -277,7 +267,6 @@ jobs: matrix: python-version: - "pypy-3.10" - - "3.7" - "3.8" - "3.9" - "3.10" @@ -286,13 +275,8 @@ jobs: - "3.13" os: [ubuntu-latest, macos-latest, windows-latest] exclude: - - os: macos-latest - python-version: "3.7" - os: macos-latest python-version: "pypy-3.10" - include: - - python-version: "3.7" - os: macos-12 steps: - name: checkout @@ -532,12 +516,9 @@ jobs: pip install -U wheel pip install -U `ls dist/persistent-*`[test] - name: Lint - # We only need to do this on one version, and it should be Python 3, because - # pylint has stopped updating for Python 2. - # TODO: Pick a linter and configuration and make this step right. run: | - pip install -U pylint - # python -m pylint --limit-inference-results=1 --rcfile=.pylintrc persistent -f parseable -r n + pip install -U tox + tox -e lint manylinux: runs-on: ubuntu-latest diff --git a/.manylinux-install.sh b/.manylinux-install.sh index a654758..5c9e4ef 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -29,7 +29,6 @@ yum -y install libffi-devel tox_env_map() { case $1 in *"cp313"*) echo 'py313';; - *"cp37"*) echo 'py37';; *"cp38"*) echo 'py38';; *"cp39"*) echo 'py39';; *"cp310"*) echo 'py310';; @@ -45,7 +44,6 @@ for PYBIN in /opt/python/*/bin; do [[ "${PYBIN}" == *"cp313/"* ]] || \ [[ "${PYBIN}" == *"cp311/"* ]] || \ [[ "${PYBIN}" == *"cp312/"* ]] || \ - [[ "${PYBIN}" == *"cp37/"* ]] || \ [[ "${PYBIN}" == *"cp38/"* ]] || \ [[ "${PYBIN}" == *"cp39/"* ]] || \ [[ "${PYBIN}" == *"cp310/"* ]] ; then diff --git a/.meta.toml b/.meta.toml index 36a67c5..3825313 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 = "4dc0484e" +commit-id = "8d837c89" [python] with-appveyor = false diff --git a/CHANGES.rst b/CHANGES.rst index f35e643..7eaabc4 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,9 +2,11 @@ ``persistent`` Changelog ========================== -5.3 (unreleased) +6.0 (unreleased) ================ +- Drop support for Python 3.7. + - Build Windows wheels on GHA. diff --git a/tox.ini b/tox.ini index c931407..1810dc3 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,6 @@ minversion = 4.0 envlist = lint - py37,py37-pure py38,py38-pure py39,py39-pure py310,py310-pure @@ -19,7 +18,7 @@ envlist = usedevelop = true pip_pre = py313: true deps = - setuptools < 69 + setuptools < 69 py37: urllib3 < 2 Sphinx setenv =