Skip to content

Commit dee2426

Browse files
ArBridgemanArBridgeman
committed
Update to poetry 2.1+ changes to 'poetry run -- command -- --cli-arg'
See discussion and related changes in: python-poetry/poetry#10204
1 parent b647d83 commit dee2426

File tree

21 files changed

+49
-49
lines changed

21 files changed

+49
-49
lines changed

‎.github/workflows/checks.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
- name: Run changelog update check
5757
if: ${{ github.ref != 'refs/heads/main' }}
58-
run: poetry run nox -s changelog:updated
58+
run: poetry run -- nox -s changelog:updated
5959

6060
build-matrix:
6161
name: Generate Build Matrix
@@ -79,7 +79,7 @@ jobs:
7979
python-version: ${{ matrix.python-version }}
8080

8181
- name: Run lint
82-
run: poetry run nox -s lint:code
82+
run: poetry run -- nox -s lint:code
8383

8484
- name: Upload Artifacts
8585
uses: actions/[email protected]
@@ -108,7 +108,7 @@ jobs:
108108
python-version: ${{ matrix.python-version }}
109109

110110
- name: Run type-check
111-
run: poetry run nox -s lint:typing
111+
run: poetry run -- nox -s lint:typing
112112

113113
Security:
114114
name: Security Checks (Python-${{ matrix.python-version }})
@@ -128,7 +128,7 @@ jobs:
128128
python-version: ${{ matrix.python-version }}
129129

130130
- name: Run security linter
131-
run: poetry run nox -s lint:security
131+
run: poetry run -- nox -s lint:security
132132

133133
- name: Upload Artifacts
134134
uses: actions/[email protected]
@@ -151,7 +151,7 @@ jobs:
151151
python-version: "3.9"
152152

153153
- name: Run format check
154-
run: poetry run nox -s project:format
154+
run: poetry run -- nox -s project:format
155155

156156
Tests:
157157
name: Unit-Tests (Python-${{ matrix.python-version }})
@@ -173,7 +173,7 @@ jobs:
173173
python-version: ${{ matrix.python-version }}
174174

175175
- name: Run Tests and Collect Coverage
176-
run: poetry run nox -s test:unit -- -- --coverage
176+
run: poetry run -- nox -s test:unit -- --coverage
177177

178178
- name: Upload Artifacts
179179
uses: actions/[email protected]

‎.github/workflows/gh-pages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
- name: Build Documentation
2222
run: |
23-
poetry run nox -s docs:multiversion
23+
poetry run -- nox -s docs:multiversion
2424
2525
- name: Deploy
2626
uses: JamesIves/[email protected]

‎.github/workflows/matrix-all.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
uses: ./.github/actions/python-environment
2121

2222
- name: Generate matrix
23-
run: poetry run nox -s matrix:all
23+
run: poetry run -- nox -s matrix:all
2424

2525
- id: set-matrix
2626
run: |
27-
echo "matrix=$(poetry run nox -s matrix:all)" >> $GITHUB_OUTPUT
27+
echo "matrix=$(poetry run -- nox -s matrix:all)" >> $GITHUB_OUTPUT
2828
2929
outputs:
3030
matrix: ${{ steps.set-matrix.outputs.matrix }}

‎.github/workflows/matrix-exasol.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
uses: ./.github/actions/python-environment
2121

2222
- name: Generate matrix
23-
run: poetry run nox -s matrix:exasol
23+
run: poetry run -- nox -s matrix:exasol
2424

2525
- id: set-matrix
2626
run: |
27-
echo "matrix=$(poetry run nox -s matrix:exasol)" >> $GITHUB_OUTPUT
27+
echo "matrix=$(poetry run -- nox -s matrix:exasol)" >> $GITHUB_OUTPUT
2828
2929
outputs:
3030
matrix: ${{ steps.set-matrix.outputs.matrix }}

‎.github/workflows/matrix-python.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
uses: ./.github/actions/python-environment
2121

2222
- name: Generate matrix
23-
run: poetry run nox -s matrix:python
23+
run: poetry run -- nox -s matrix:python
2424

2525
- id: set-matrix
2626
run: |
27-
echo "matrix=$(poetry run nox -s matrix:python)" >> $GITHUB_OUTPUT
27+
echo "matrix=$(poetry run -- nox -s matrix:python)" >> $GITHUB_OUTPUT
2828
2929
outputs:
3030
matrix: ${{ steps.set-matrix.outputs.matrix }}

‎.github/workflows/report.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
cp security-python3.9/.security.json ../ || true
3636
3737
- name: Validate Artifacts
38-
run: poetry run nox -s artifacts:validate
38+
run: poetry run -- nox -s artifacts:validate
3939

4040
- name: Generate Report
41-
run: poetry run nox -s project:report -- -- --format json | tee metrics.json
41+
run: poetry run -- nox -s project:report -- -- --format json | tee metrics.json
4242

4343
- name: Upload Artifacts
4444
uses: actions/[email protected]
@@ -49,8 +49,8 @@ jobs:
4949
- name: Generate GitHub Summary
5050
run: |
5151
echo -e "# Summary\n" >> $GITHUB_STEP_SUMMARY
52-
poetry run nox -s project:report -- -- --format markdown >> $GITHUB_STEP_SUMMARY
53-
poetry run nox -s dependency:licenses >> $GITHUB_STEP_SUMMARY
52+
poetry run -- nox -s project:report -- -- --format markdown >> $GITHUB_STEP_SUMMARY
53+
poetry run -- nox -s dependency:licenses >> $GITHUB_STEP_SUMMARY
5454
echo -e "\n\n# Coverage\n" >> $GITHUB_STEP_SUMMARY
5555
poetry run coverage report -- --format markdown >> $GITHUB_STEP_SUMMARY
5656
poetry run tbx lint pretty-print >> $GITHUB_STEP_SUMMARY

‎.github/workflows/slow-checks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
python-version: ${{ matrix.python-version }}
3434

3535
- name: Run Tests and Collect Coverage
36-
run: poetry run nox -s test:integration -- -- --coverage --db-version ${{ matrix.exasol-version }}
36+
run: poetry run -- nox -s test:integration -- --coverage --db-version ${{ matrix.exasol-version }}
3737

3838
- name: Upload Artifacts
3939
uses: actions/[email protected]

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repos:
88
types: [ python ]
99
pass_filenames: false
1010
language: system
11-
entry: poetry run nox -s project:fix
11+
entry: poetry run -- nox -s project:fix
1212
stages: [ pre-commit ]
1313

1414
- repo: https://github.com/pre-commit/pre-commit-hooks
@@ -28,7 +28,7 @@ repos:
2828
types: [ python ]
2929
pass_filenames: false
3030
language: system
31-
entry: poetry run nox -s lint:typing
31+
entry: poetry run -- nox -s lint:typing
3232
stages: [ pre-push ]
3333

3434
- repo: local
@@ -38,5 +38,5 @@ repos:
3838
types: [ python ]
3939
pass_filenames: false
4040
language: system
41-
entry: poetry run nox -s lint:code
41+
entry: poetry run -- nox -s lint:code
4242
stages: [ pre-push ]

‎doc/design.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ To view all the defined nox tasks & their definitions use:
155155

156156
.. code-block:: shell
157157
158-
poetry run nox -l
158+
poetry run -- nox -l
159159
160160
Workflows
161161
~~~~~~~~~

‎exasol/toolbox/pre_commit_hooks/package_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
_VERSION_MODULE_TEMPLATE = cleandoc('''
2525
# ATTENTION:
2626
# This file is generated by exasol/toolbox/pre_commit_hooks/package_version.py when using:
27-
# * either "poetry run nox -s project:fix"
27+
# * either "poetry run -- nox -s project:fix"
2828
# * or "poetry run version-check <path/version.py> --fix"
2929
# Do not edit this file manually!
3030
# If you need to change the version, do so in the project.toml, e.g. by using `poetry version X.Y.Z`.

0 commit comments

Comments
 (0)