Skip to content

Commit 2d95b2f

Browse files
committed
Merge branch 'install_permission' of https://github.com/bckohan/django-typer into install_permission
2 parents 05cc151 + 76c83aa commit 2d95b2f

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

.github/workflows/test.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -682,9 +682,13 @@ jobs:
682682
shell: powershell
683683
- name: Run Powershell Tab Completion Tests
684684
run: |
685-
just test ./tests/verify_environment.py; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
686-
.venv\Scripts\activate.ps1; cmd /c "pytest --cov-append ./tests/shellcompletion/test_shell_resolution.py::TestShellResolution::test_powershell"; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
687-
just test-powershell; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
685+
just test ./tests/verify_environment.py
686+
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
687+
. .venv\Scripts\activate.ps1
688+
cmd /c "pytest --cov-append ./tests/shellcompletion/test_shell_resolution.py::TestShellResolution::test_powershell"
689+
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
690+
just test-powershell
691+
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
688692
shell: powershell
689693
- name: Test CMD shell failure
690694
run: |
@@ -753,8 +757,12 @@ jobs:
753757
- name: Run Powershell Tab Completion Tests
754758
run: |
755759
just test ./tests/verify_environment.py
756-
.venv\Scripts\activate.ps1; cmd /c "pytest --cov-append ./tests/shellcompletion/test_shell_resolution.py::TestShellResolution::test_pwsh"; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
757-
just test-pwsh; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
760+
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
761+
. .venv\Scripts\activate.ps1
762+
cmd /c "pytest --cov-append ./tests/shellcompletion/test_shell_resolution.py::TestShellResolution::test_pwsh"
763+
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
764+
just test-pwsh
765+
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
758766
shell: pwsh
759767
- name: Test CMD shell failure
760768
run: |

justfile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,19 +280,17 @@ test-zsh:
280280
[script("powershell")]
281281
test-powershell:
282282
uv sync --no-extra rich
283-
.venv/Scripts/activate.ps1; pytest --cov-append tests/shellcompletion/test_shell_resolution.py::TestShellResolution::test_powershell tests/test_parser_completers.py tests/test_parser_completers.py tests/shellcompletion/test_powershell.py::PowerShellTests tests/shellcompletion/test_powershell.py::PowerShellExeTests
284-
# TODO - not implemented on windows
285-
# uv sync --no-extra rich
286-
# .venv/Scripts/activate.ps1; pytest --cov-append tests/shellcompletion/test_powershell.py::PowerShellExeTests::test_prompt_install
283+
. .venv/Scripts/activate.ps1; pytest --cov-append tests/shellcompletion/test_shell_resolution.py::TestShellResolution::test_powershell tests/test_parser_completers.py tests/test_parser_completers.py tests/shellcompletion/test_powershell.py::PowerShellTests tests/shellcompletion/test_powershell.py::PowerShellExeTests; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
284+
uv sync --no-extra rich
285+
. .venv/Scripts/activate.ps1; pytest --cov-append tests/shellcompletion/test_powershell.py::PowerShellExeTests::test_prompt_install; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
287286

288287
# test pwsh shell completions
289288
[script("pwsh")]
290289
test-pwsh:
291290
uv sync --all-extras
292-
.venv/Scripts/activate.ps1; pytest --cov-append tests/shellcompletion/test_shell_resolution.py::TestShellResolution::test_pwsh tests/test_parser_completers.py tests/shellcompletion/test_powershell.py::PWSHTests tests/shellcompletion/test_powershell.py::PWSHExeTests
293-
# TODO - not implemented on windows
294-
# uv sync --no-extra rich
295-
# .venv/Scripts/activate.ps1; pytest --cov-append tests/shellcompletion/test_powershell.py::PWSHExeTests::test_prompt_install
291+
. .venv/Scripts/activate.ps1; pytest --cov-append tests/shellcompletion/test_shell_resolution.py::TestShellResolution::test_pwsh tests/test_parser_completers.py tests/shellcompletion/test_powershell.py::PWSHTests tests/shellcompletion/test_powershell.py::PWSHExeTests; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
292+
uv sync --no-extra rich
293+
. .venv/Scripts/activate.ps1; pytest --cov-append tests/shellcompletion/test_powershell.py::PWSHExeTests::test_prompt_install; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
296294

297295
# test fish shell completions
298296
[script("fish")]

0 commit comments

Comments
 (0)