Skip to content

Modernize ci #205

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.

Sign up for GitHub

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Modernize ci #205

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
59c7ef1
GitHub Actions: Modernize versions of GitHub Actions and Python
cclauss Oct 9, 2025
86a081b
drop support for only Python 3.7
ngoldbaum Oct 20, 2025
ff919de
fix mac publish name
ngoldbaum Oct 21, 2025
517537f
use newer upload/download artifact major versions
ngoldbaum Oct 28, 2025
b0a640f
simplify cibuildwheel configuration
ngoldbaum Oct 28, 2025
67f3aa0
skip mussllinux, needs work to adjust for lack of yum
ngoldbaum Oct 28, 2025
958489a
Merge pull request #1 from ngoldbaum/check-update
ngoldbaum Oct 28, 2025
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
51 changes: 28 additions & 23 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v5
with:
submodules: recursive
- uses: actions/setup-python@v1
- uses: actions/setup-python@v6
with:
python-version: 3.8
python-version: 3.x
- name: Run lint
run: |
python -m pip install tox
Expand All @@ -22,17 +22,17 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
steps:
- name: Set git to use LF on Windows
if: runner.os == 'Windows'
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- uses: actions/checkout@v2
- uses: actions/checkout@v5
with:
submodules: recursive
- uses: actions/setup-python@v4
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
allow-prereleases: true
Expand All @@ -44,16 +44,18 @@ jobs:
package-sdist:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v5
with:
submodules: recursive
- uses: actions/setup-python@v1
- uses: actions/setup-python@v6
with:
python-version: 3.x
- name: Build source package
run: python setup.py sdist
run: |
pip install build
python -m build --sdist
- name: Upload source package
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: sdist
path: dist/
Expand All @@ -65,17 +67,18 @@ jobs:
include:
- name: manylinux
os: ubuntu-latest
- name: macos
- name: macosx
os: macos-latest
- name: win
os: windows-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v5
with:
submodules: recursive
- uses: actions/setup-python@v2

- uses: actions/setup-python@v6
with:
python-version: 3.x
- name: Install cibuildwheel
run: python -m pip install cibuildwheel
# - name: Install Visual C++ for Python 2.7
Expand All @@ -91,16 +94,18 @@ jobs:
if: runner.os == 'Windows'
run: python -m cibuildwheel --output-dir wheelhouse
env:
CIBW_BUILD: cp37-${{ matrix.name }}* pp*-${{ matrix.name }}*
CIBW_BUILD: cp38-${{ matrix.name }}* pp*-${{ matrix.name }}*
CIBW_ENABLE: pypy

- name: Build wheels for Linux and macOS
if: runner.os != 'Windows'
run: python -m cibuildwheel --output-dir wheelhouse
env:
CIBW_BUILD: cp37-${{ matrix.name }}* pp*-${{ matrix.name }}*
CIBW_BUILD: cp38-${{ matrix.name }}* pp*-${{ matrix.name }}*
CIBW_ENABLE: pypy
CIBW_ARCHS_LINUX: auto aarch64
CIBW_BEFORE_BUILD_LINUX: yum install -y libffi-devel
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: wheels-${{ matrix.name }}
path: ./wheelhouse/*.whl
Expand All @@ -109,20 +114,20 @@ jobs:
runs-on: ubuntu-latest
needs: [lint, test, package-sdist, package-wheel]
steps:
- uses: actions/checkout@v2
- uses: actions/download-artifact@v1
- uses: actions/checkout@v5
- uses: actions/download-artifact@v5
with:
name: sdist
path: dist/
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v5
with:
name: wheels-win
path: dist/
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v5
with:
name: wheels-macos
name: wheels-macosx
path: dist/
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v5
with:
name: wheels-manylinux
path: dist/
Expand Down
3 changes: 1 addition & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def finalize_options(self):
install_requires=[
"cffi>=1.0.0",
],
python_requires=">=3.7",
python_requires=">=3.8",
cffi_modules=["src/brotlicffi/_build.py:ffi"],
packages=find_packages('src'),
package_dir={'': 'src'},
Expand All @@ -113,7 +113,6 @@ def finalize_options(self):
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"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 Down
Loading