Skip to content

Commit cb901bc

Browse files
committed
commit checks reshuffled
1 parent d1c767c commit cb901bc

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

.github/workflows/commit.yml

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,13 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
jobs:
16-
py3:
16+
py2:
1717
runs-on: ubuntu-latest
1818
if: ${{ !startsWith(github.event.head_commit.message, 'WIP') }}
1919
strategy:
2020
matrix:
2121
python-version:
22-
- "3.9"
23-
- "3.10"
24-
- "3.11"
25-
- "3.12"
26-
- "3.13"
22+
- pypy2.7
2723

2824
steps:
2925
- name: Check out the repository
@@ -34,13 +30,12 @@ jobs:
3430
with:
3531
python-version: ${{ matrix.python-version }}
3632

37-
- name: Install Poetry
38-
run: |
39-
python3 -m pip install "poetry==2.1.1" "virtualenv==20.26.6"
40-
python3 -m poetry -V
41-
33+
# PyYaml 5.4.1 requires cython < 3.0.0 for Python 2.7
4234
- name: Install dependencies
43-
run: python3 -m poetry install --with=dev
35+
run: |
36+
echo "cython<3" > /tmp/constraint.txt
37+
PIP_CONSTRAINT=/tmp/constraint.txt python -m pip install --no-deps -r requirements.txt
38+
python -m pip install pytest
4439
4540
- name: Create .env
4641
run: |
@@ -49,16 +44,21 @@ jobs:
4944
echo "MSTEAMS_TEST_NAME=${{ secrets.MSTEAMS_TEST_NAME }}" >> ./.env
5045
5146
- name: Run tests
52-
run: python3 -m poetry run tox -e py3
47+
run: python -m pytest
5348

54-
py2:
55-
needs: py3 # only run py2 if py3 succeeded
49+
py3:
50+
needs: py2 # only run if py2 succeeded
5651
runs-on: ubuntu-latest
5752
if: ${{ !startsWith(github.event.head_commit.message, 'WIP') }}
5853
strategy:
5954
matrix:
6055
python-version:
61-
- pypy2.7
56+
- "3.9"
57+
- "3.10"
58+
- "3.11"
59+
- "3.12"
60+
- "3.13"
61+
- "3.14"
6262

6363
steps:
6464
- name: Check out the repository
@@ -69,12 +69,13 @@ jobs:
6969
with:
7070
python-version: ${{ matrix.python-version }}
7171

72-
# PyYaml 5.4.1 requires cython < 3.0.0 for Python 2.7
73-
- name: Install dependencies
72+
- name: Install Poetry
7473
run: |
75-
echo "cython<3" > /tmp/constraint.txt
76-
PIP_CONSTRAINT=/tmp/constraint.txt python -m pip install --no-deps -r requirements.txt
77-
python -m pip install pytest
74+
python3 -m pip install "poetry==2.1.1" "virtualenv==20.26.6"
75+
python3 -m poetry -V
76+
77+
- name: Install dependencies
78+
run: python3 -m poetry install --with=dev
7879

7980
- name: Create .env
8081
run: |
@@ -83,4 +84,4 @@ jobs:
8384
echo "MSTEAMS_TEST_NAME=${{ secrets.MSTEAMS_TEST_NAME }}" >> ./.env
8485
8586
- name: Run tests
86-
run: python -m pytest
87+
run: python3 -m poetry run tox -e py3

0 commit comments

Comments
 (0)