Skip to content

Commit

Permalink
# This is a combination of 6 commits.
Browse files Browse the repository at this point in the history
# This is the 1st commit message:

Add Python 3.11 and PyPy 3.9 to the testing
# The commit message pytest-dev#2 will be skipped:

# tox.ini: Add py311 and pypy39

# The commit message pytest-dev#3 will be skipped:

# pytest72

# The commit message pytest-dev#4 will be skipped:

# xdist302
#
# Co-authored-by: Mason Lin <pizza0117@gmail.com>

# The commit message pytest-dev#5 will be skipped:

# coverage65
#
# Co-authored-by: Mason Lin <pizza0117@gmail.com>

# The commit message pytest-dev#6 will be skipped:

# Drop py36 and upgrade to pytest-xdist==3.1.0
  • Loading branch information
cclauss committed Feb 19, 2023
1 parent ae9d626 commit 039e8f2
Showing 2 changed files with 55 additions and 34 deletions.
84 changes: 51 additions & 33 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -6,25 +6,25 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["pypy-3.7", "3.9"]
python-version: ["pypy-3.9", "3.11"]
target: [
"src-layout",
"adhoc-layout",
]
include:
# Add new helper variables to existing jobs
- {python-version: "pypy-3.7", tox-python-version: "pypy3"}
- {python-version: "3.9", tox-python-version: "py39"}
- {python-version: "pypy-3.9", tox-python-version: "pypy3"}
- {python-version: "3.11", tox-python-version: "py311"}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.cache/pip
key:
@@ -34,8 +34,8 @@ jobs:
- name: Install dependencies
run: |
python -m pip install -U pip
python -m pip install -U wheel
python -m pip install --upgrade pip
python -m pip install --upgrade wheel
python -m pip install --progress-bar=off tox -rci/requirements.txt
- name: Examples
@@ -51,33 +51,15 @@ jobs:
matrix:
include:
- name: 'check'
python: '3.9'
toxpython: 'python3.9'
python: '3.11'
toxpython: 'python3.11'
tox_env: 'check'
os: 'ubuntu-latest'
- name: 'docs'
python: '3.9'
toxpython: 'python3.9'
python: '3.11'
toxpython: 'python3.11'
tox_env: 'docs'
os: 'ubuntu-latest'
- name: 'py36-pytest70-xdist250-coverage62 (ubuntu)'
python: '3.6'
toxpython: 'python3.6'
python_arch: 'x64'
tox_env: 'py36-pytest70-xdist250-coverage62'
os: 'ubuntu-latest'
- name: 'py36-pytest70-xdist250-coverage62 (windows)'
python: '3.6'
toxpython: 'python3.6'
python_arch: 'x64'
tox_env: 'py36-pytest70-xdist250-coverage62'
os: 'windows-latest'
- name: 'py36-pytest70-xdist250-coverage62 (macos)'
python: '3.6'
toxpython: 'python3.6'
python_arch: 'x64'
tox_env: 'py36-pytest70-xdist250-coverage62'
os: 'macos-latest'
- name: 'py37-pytest71-xdist250-coverage64 (ubuntu)'
python: '3.7'
toxpython: 'python3.7'
@@ -150,6 +132,24 @@ jobs:
python_arch: 'x64'
tox_env: 'py310-pytest71-xdist250-coverage64'
os: 'macos-latest'
- name: 'py311-pytest72-xdist310-coverage65 (ubuntu)'
python: '3.11'
toxpython: 'python3.11'
python_arch: 'x64'
tox_env: 'py311-pytest72-xdist310-coverage65'
os: 'ubuntu-latest'
- name: 'py311-pytest72-xdist310-coverage65 (windows)'
python: '3.11'
toxpython: 'python3.11'
python_arch: 'x64'
tox_env: 'py311-pytest72-xdist310-coverage65'
os: 'windows-latest'
- name: 'py311-pytest72-xdist310-coverage65 (macos)'
python: '3.11'
toxpython: 'python3.11'
python_arch: 'x64'
tox_env: 'py311-pytest72-xdist310-coverage65'
os: 'macos-latest'
- name: 'pypy37-pytest71-xdist250-coverage64 (ubuntu)'
python: 'pypy-3.7'
toxpython: 'pypy3.7'
@@ -186,17 +186,35 @@ jobs:
python_arch: 'x64'
tox_env: 'pypy38-pytest71-xdist250-coverage64'
os: 'macos-latest'
- name: 'pypy39--pytest72-xdist310-coverage65 (ubuntu)'
python: 'pypy-3.9'
toxpython: 'pypy3.9'
python_arch: 'x64'
tox_env: 'pypy39-pytest72-xdist310-coverage65'
os: 'ubuntu-latest'
- name: 'pypy39-pytest72-xdist310-coverage65 (windows)'
python: 'pypy-3.9'
toxpython: 'pypy3.9'
python_arch: 'x64'
tox_env: 'pypy39-pytest72-xdist310-coverage65'
os: 'windows-latest'
- name: 'pypy39-pytest72-xdist310-coverage65 (macos)'
python: 'pypy-3.9'
toxpython: 'pypy3.9'
python_arch: 'x64'
tox_env: 'pypy39-pytest72-xdist310-coverage65'
os: 'macos-latest'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
architecture: ${{ matrix.python_arch }}
- name: install dependencies
run: |
python -mpip install --progress-bar=off -r ci/requirements.txt
python -m pip install --progress-bar=off -r ci/requirements.txt
virtualenv --version
pip --version
tox --version
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ passenv =
[tox]
envlist =
check
py{36}-pytest{70}-xdist250-coverage{62}
py{37,38,39,310,py37,py38}-pytest{71}-xdist250-coverage{64}
py{311,py39}-pytest{72}-xdist310-coverage{65}
docs

[testenv]
@@ -30,6 +30,7 @@ setenv =
pytest62: _DEP_PYTEST=pytest==6.2.5
pytest70: _DEP_PYTEST=pytest==7.0.1
pytest71: _DEP_PYTEST=pytest==7.1.2
pytest72: _DEP_PYTEST=pytest==7.2.0

xdist127: _DEP_PYTESTXDIST=pytest-xdist==1.27.0
xdist129: _DEP_PYTESTXDIST=pytest-xdist==1.29.0
@@ -41,6 +42,7 @@ setenv =
xdist201: _DEP_PYTESTXDIST=pytest-xdist==2.1.0
xdist202: _DEP_PYTESTXDIST=pytest-xdist==2.2.0
xdist250: _DEP_PYTESTXDIST=pytest-xdist==2.5.0
xdist310: _DEP_PYTESTXDIST=pytest-xdist==3.1.0
xdistdev: _DEP_PYTESTXDIST=git+https://github.com/pytest-dev/pytest-xdist.git#egg=pytest-xdist

coverage45: _DEP_COVERAGE=coverage==4.5.4
@@ -55,6 +57,7 @@ setenv =
coverage62: _DEP_COVERAGE=coverage==6.2
coverage63: _DEP_COVERAGE=coverage==6.3.3
coverage64: _DEP_COVERAGE=coverage==6.4.2
coverage65: _DEP_COVERAGE=coverage==6.5.0
# For testing against a coverage.py working tree.
coveragedev: _DEP_COVERAGE=-e{env:COVERAGE_HOME}
passenv =

0 comments on commit 039e8f2

Please # to comment.