Skip to content

Commit

Permalink
update config/ci to run new layout
Browse files Browse the repository at this point in the history
  • Loading branch information
jenshnielsen committed Nov 7, 2023
1 parent 1fa9254 commit 7070aaa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ jobs:
if: ${{ !matrix.min-version }}
- name: Run parallel tests
run: |
pytest -m "not serial" --cov=qcodes --cov-report xml --hypothesis-profile ci --durations=20 src/qcodes
pytest -m "not serial" --cov=qcodes --cov-report xml --hypothesis-profile ci --durations=20 tests
# a subset of the tests fails when run in parallel on Windows so run those in serial here
- name: Run serial tests
run: |
pytest -m "serial" -n 0 --dist no --cov=qcodes --cov-report xml --cov-append --hypothesis-profile ci src/qcodes
pytest -m "serial" -n 0 --dist no --cov=qcodes --cov-report xml --cov-append --hypothesis-profile ci tests
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3.1.4
with:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ stubPath = "typings/stubs"
[tool.pytest.ini_options]
minversion = "6.0"
junit_family = "legacy"

testpaths = "tests"
addopts = "-n auto --dist=loadfile"

markers = "serial"
Expand Down

0 comments on commit 7070aaa

Please sign in to comment.