Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix CI to run the unit tests without optional deps #11017

Merged
merged 5 commits into from
Oct 8, 2021
Merged

Fix CI to run the unit tests without optional deps #11017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
095408b
Don't use 'combine' with tox in CI
erikjohnston Oct 7, 2021
ad6fb51
Fix testing without optional deps
erikjohnston Oct 7, 2021
05dd958
Newsfile
erikjohnston Oct 7, 2021
49fec72
Fix?
erikjohnston Oct 7, 2021
537caff
Merge remote-tracking branch 'origin/develop' into erikj/ci_tox
erikjohnston Oct 7, 2021
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
9 changes: 6 additions & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,23 @@ jobs:
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
database: ["sqlite"]
toxenv: ["py"]
include:
# Newest Python without optional deps
- python-version: "3.10"
toxenv: "py-noextras,combine"
toxenv: "py-noextras"

# Oldest Python with PostgreSQL
- python-version: "3.6"
database: "postgres"
postgres-version: "9.6"
toxenv: "py"

# Newest Python with newest PostgreSQL
- python-version: "3.10"
database: "postgres"
postgres-version: "14"
toxenv: "py"

steps:
- uses: actions/checkout@v2
Expand All @@ -111,7 +114,7 @@ jobs:
if: ${{ matrix.postgres-version }}
timeout-minutes: 2
run: until pg_isready -h localhost; do sleep 1; done
- run: tox -e py,combine
- run: tox -e ${{ matrix.toxenv }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you could use ${{ matrix.toxenv || "py" } here, but it's probably not worth if it this CI run works.

env:
TRIAL_FLAGS: "--jobs=2"
SYNAPSE_POSTGRES: ${{ matrix.database == 'postgres' || '' }}
Expand Down Expand Up @@ -169,7 +172,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- run: pip install tox
- run: tox -e py,combine
- run: tox -e py
env:
TRIAL_FLAGS: "--jobs=2"
- name: Dump logs
Expand Down
1 change: 1 addition & 0 deletions changelog.d/11017.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix CI to run the unit tests without optional deps.