Skip to content

Commit

Permalink
Merge pull request #468 from luhn/fix-ci
Browse files Browse the repository at this point in the history
Fix CI
  • Loading branch information
mmerickel authored Oct 18, 2024
2 parents 5a67a56 + 9338d12 commit 407532d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 19 deletions.
18 changes: 1 addition & 17 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,49 +21,33 @@ jobs:
- "3.10"
- "3.11"
- "3.12"
- "pypy-3.8"
- "pypy-3.9"
- "pypy-3.10"
os:
- "ubuntu-latest"
- "windows-latest"
- "macos-latest"
architecture:
- x64
- x86
include:
- py: "pypy-3.8"
toxenv: "pypy38"
- py: "pypy-3.9"
toxenv: "pypy39"
- py: "pypy-3.10"
toxenv: "pypy310"
exclude:
# Linux and macOS don't have x86 python
- os: "ubuntu-latest"
architecture: x86
- os: "macos-latest"
architecture: x86
# Don't run all PyPy versions except latest on
# Windows/macOS. They are expensive to run.
- os: "windows-latest"
py: "pypy-3.8"
- os: "macos-latest"
py: "pypy-3.8"
- os: "windows-latest"
py: "pypy-3.9"
- os: "macos-latest"
py: "pypy-3.9"

name: "Python: ${{ matrix.py }}-${{ matrix.architecture }} on ${{ matrix.os }}"
name: "Python: ${{ matrix.py }} on ${{ matrix.os }}"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.py }}
architecture: ${{ matrix.architecture }}
- run: pip install tox
- name: Running tox with specific toxenv
if: ${{ matrix.toxenv != '' }}
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
envlist =
lint,
py38,py39,py310,py311,py312,pypy38,pypy39,pypy310,
py38,py39,py310,py311,py312,pypy39,pypy310,
coverage,
docs,
isolated_build = True
Expand All @@ -10,7 +10,6 @@ isolated_build = True
commands =
python --version
python -m pytest \
pypy38: --no-cov \
pypy39: --no-cov \
pypy310: --no-cov \
{posargs:}
Expand Down

0 comments on commit 407532d

Please sign in to comment.