Skip to content

Commit bf854c1

Browse files
committed
try fix CI
1 parent 8b7a6f6 commit bf854c1

File tree

4 files changed

+24
-13
lines changed

4 files changed

+24
-13
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,11 @@ jobs:
280280
run: |
281281
just setup ${{ steps.sp.outputs.python-path }}
282282
just test-lock Django~=${{ matrix.django-version }}.0
283-
just install-psycopg3
283+
just install
284284
- name: Run Unit Tests
285285
run: |
286286
just test ./tests/verify_environment.py
287-
just test-all
287+
just test-all --group psycopg3
288288
- name: Store coverage files
289289
uses: actions/upload-artifact@v4
290290
with:
@@ -727,7 +727,8 @@ jobs:
727727
shell: powershell
728728
- name: Test CMD shell failure
729729
run: |
730-
.venv\Scripts\activate.bat
730+
set PYTHONPATH=%CD%
731+
.venv\Scripts\activate
731732
pytest --cov-append ./tests/shellcompletion/test_shell_resolution.py::test_get_win_shell_failure
732733
shell: cmd
733734
- name: Store coverage files

justfile

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -187,20 +187,19 @@ fix: lint format
187187
check: check-lint check-format check-types check-package check-docs check-docs-links check-readme
188188

189189
# run the tests that require rich not to be installed
190-
test-no-rich:
191-
uv pip uninstall rich
192-
uv run pytest --cov-append -m no_rich
190+
test-no-rich *ENV:
191+
uv run {{ ENV }} --no-extra rich --exact pytest --cov-append -m no_rich
193192

194193
# run the tests that require rich to be installed
195-
test-rich:
196-
uv run pytest --cov-append -m rich
194+
test-rich *ENV:
195+
uv run {{ ENV }} --extra rich --exact pytest --cov-append -m rich
197196

198197
# run all tests
199-
test-all: test-rich test-no-rich
200-
uv pip install colorama
201-
uv run pytest --cov-append -m "not rich and not no_rich"
202-
uv pip uninstall colorama
203-
uv run pytest --cov-append -k test_ctor_params
198+
test-all *ENV: coverage-erase
199+
@just test-rich {{ ENV }}
200+
@just test-no-rich {{ ENV }}
201+
uv run {{ ENV }} --all-extras --group colorama --exact pytest --cov-append -m "not rich and not no_rich"
202+
uv run --all-extras --no-group colorama --exact colorama pytest --cov-append -k test_ctor_params
204203

205204
_log-tests:
206205
uv run pytest --collect-only --disable-warnings -q --no-cov
@@ -267,6 +266,10 @@ test *TESTS:
267266
precommit:
268267
@just run pre-commit
269268

269+
# erase any coverage data
270+
coverage-erase:
271+
@just run coverage erase
272+
270273
# generate the test coverage report
271274
coverage:
272275
@just run coverage combine --keep *.coverage

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@ exclude = [
166166
]
167167

168168
[dependency-groups]
169+
colorama = [
170+
"colorama>=0.4.6",
171+
]
169172
dev = [
170173
"coverage>=7.6.12",
171174
"django-stubs>=5.1.3",

uv.lock

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)