Skip to content

Commit

Permalink
Merge pull request #89 from zopefoundation/config-with-c-code-templat…
Browse files Browse the repository at this point in the history
…e-8d837c89

Configuring for c-code: drop support for Python 3.7
  • Loading branch information
tseaver committed May 28, 2024
2 parents 692cd83 + 7f50940 commit 1a0801f
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 34 deletions.
36 changes: 10 additions & 26 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ jobs:
matrix:
python-version:
- "pypy-3.10"
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand All @@ -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
Expand Down Expand Up @@ -169,11 +163,10 @@ jobs:
pip install -U pip
pip install -U "setuptools<69" wheel twine
- name: Build zodbpickle (macOS x86_64, Python 3.8+)
- name: Build zodbpickle (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
Expand All @@ -183,11 +176,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 zodbpickle (macOS arm64, Python 3.8+)
- name: Build zodbpickle (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
Expand All @@ -201,7 +193,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).
Expand Down Expand Up @@ -230,19 +221,18 @@ jobs:
startsWith(runner.os, 'Mac')
uses: actions/upload-artifact@v4
with:
name: zodbpickle-${{ 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: zodbpickle-${{ runner.os }}-${{ matrix.python-version }}-x86_64.whl
path: dist/*x86_64.whl
- name: Upload zodbpickle 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: zodbpickle-${{ runner.os }}-${{ matrix.python-version }}-arm64.whl
name: zodbpickle-${{ runner.os }}-${{ matrix.python-version }}.whl
path: dist/*arm64.whl
- name: Upload zodbpickle wheel (all other platforms)
if: >
Expand Down Expand Up @@ -274,7 +264,6 @@ jobs:
matrix:
python-version:
- "pypy-3.10"
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand All @@ -283,13 +272,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
Expand Down
2 changes: 0 additions & 2 deletions .manylinux-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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';;
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/config/c-code
[meta]
template = "c-code"
commit-id = "1c0f31f5"
commit-id = "8d837c89"

[python]
with-appveyor = true
Expand Down
4 changes: 2 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
Changelog
===========

3.4 (unreleased)
4.0 (unreleased)
================

- Nothing changed yet.
- Drop support for Python 3.7.


3.3 (2024-04-16)
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ def read(fname):
'License :: OSI Approved :: Python Software Foundation License',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
Expand All @@ -78,7 +77,7 @@ def read(fname):
packages=find_packages('src'),
package_dir={'': 'src'},
ext_modules=ext_modules,
python_requires='>=3.7',
python_requires='>=3.8',
extras_require={
'test': ['zope.testrunner'],
},
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
minversion = 4.0
envlist =
lint
py37,py37-pure
py38,py38-pure
py39,py39-pure
py310,py310-pure
Expand Down

0 comments on commit 1a0801f

Please sign in to comment.