-
Notifications
You must be signed in to change notification settings - Fork 1
Refactoring/376 update to poetry v2 #394
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
7f61e25
Update to poetry 2.0.1
ArBridgeman dc93b46
Remove template action as using PTB action throughout repos
ArBridgeman f0d3f1e
Update default poetry version in example text and action
ArBridgeman b647d83
Update to poetry 2.1.2
ArBridgeman dee2426
Update to poetry 2.1+ changes to 'poetry run -- command -- --cli-arg'
ArBridgeman c52c714
Remove line added by poetry 2.0.1 as using 2.1.2 & in build reqs
ArBridgeman 3a26688
Update lock after removing poetry as dependency from 2.0.1 upgrade step
ArBridgeman e44f490
Update lock with updated dependencies
ArBridgeman a98afc8
Update to poetry 2.1+ changes to 'poetry run -- command -- --cli-arg'
ArBridgeman 347f1f2
Update to poetry 2.1+ changes to 'poetry run -- command -- --cli-arg'
ArBridgeman a2dd677
Adapt remaining poetry run <commands>
ArBridgeman 4cf0332
Update changelog with summary statement regarding minor breaking change
ArBridgeman 7cffd52
Amend workflows for issue running poetry run --coverage and fix typo …
ArBridgeman 4de301f
Modify changelog per review comments
ArBridgeman 931137a
Add another author to project
ArBridgeman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,7 @@ jobs: | |
| uses: ./.github/actions/python-environment | ||
|
|
||
| - name: Check Version(s) | ||
| run: poetry run version-check `poetry run python -c "from noxconfig import PROJECT_CONFIG; print(PROJECT_CONFIG.version_file)"` | ||
| run: poetry run version-check `poetry run -- python -c "from noxconfig import PROJECT_CONFIG; print(PROJECT_CONFIG.version_file)"` | ||
|
|
||
| Documentation: | ||
| name: Docs | ||
|
|
@@ -35,7 +35,7 @@ jobs: | |
|
|
||
| - name: Build Documentation | ||
| run: | | ||
| poetry run python -m nox -s docs:build | ||
| poetry run -- nox -s docs:build | ||
|
|
||
| Changelog: | ||
| name: Changelog Update Check | ||
|
|
@@ -55,7 +55,7 @@ jobs: | |
|
|
||
| - name: Run changelog update check | ||
| if: ${{ github.ref != 'refs/heads/main' }} | ||
| run: poetry run nox -s changelog:updated | ||
| run: poetry run -- nox -s changelog:updated | ||
|
|
||
| build-matrix: | ||
| name: Generate Build Matrix | ||
|
|
@@ -79,7 +79,7 @@ jobs: | |
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| - name: Run lint | ||
| run: poetry run nox -s lint:code | ||
| run: poetry run -- nox -s lint:code | ||
|
|
||
| - name: Upload Artifacts | ||
| uses: actions/[email protected] | ||
|
|
@@ -108,7 +108,7 @@ jobs: | |
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| - name: Run type-check | ||
| run: poetry run nox -s lint:typing | ||
| run: poetry run -- nox -s lint:typing | ||
|
|
||
| Security: | ||
| name: Security Checks (Python-${{ matrix.python-version }}) | ||
|
|
@@ -128,7 +128,7 @@ jobs: | |
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| - name: Run security linter | ||
| run: poetry run nox -s lint:security | ||
| run: poetry run -- nox -s lint:security | ||
|
|
||
| - name: Upload Artifacts | ||
| uses: actions/[email protected] | ||
|
|
@@ -151,7 +151,7 @@ jobs: | |
| python-version: "3.9" | ||
|
|
||
| - name: Run format check | ||
| run: poetry run nox -s project:format | ||
| run: poetry run -- nox -s project:format | ||
|
|
||
| Tests: | ||
| name: Unit-Tests (Python-${{ matrix.python-version }}) | ||
|
|
@@ -173,7 +173,7 @@ jobs: | |
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| - name: Run Tests and Collect Coverage | ||
| run: poetry run nox -s test:unit -- -- --coverage | ||
| run: poetry run -- nox -s test:unit -- --coverage | ||
|
|
||
| - name: Upload Artifacts | ||
| uses: actions/[email protected] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,7 @@ jobs: | |
|
|
||
| - name: Build Documentation | ||
| run: | | ||
| poetry run nox -s docs:multiversion | ||
| poetry run -- nox -s docs:multiversion | ||
|
|
||
| - name: Deploy | ||
| uses: JamesIves/[email protected] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,18 +27,18 @@ jobs: | |
| - name: Copy Artifacts into Root Folder | ||
| working-directory: ./artifacts | ||
| run: | | ||
| poetry run coverage combine --keep coverage-python3.9*/.coverage | ||
| poetry run -- coverage combine --keep coverage-python3.9*/.coverage | ||
| # Errors during copying are ignored because they are checked in the next step | ||
| cp .coverage ../ || true | ||
| cp lint-python3.9/.lint.txt ../ || true | ||
| cp lint-python3.9/.lint.json ../ || true | ||
| cp security-python3.9/.security.json ../ || true | ||
|
|
||
| - name: Validate Artifacts | ||
| run: poetry run nox -s artifacts:validate | ||
| run: poetry run -- nox -s artifacts:validate | ||
|
|
||
| - name: Generate Report | ||
| run: poetry run nox -s project:report -- -- --format json | tee metrics.json | ||
| run: poetry run -- nox -s project:report -- --format json | tee metrics.json | ||
|
|
||
| - name: Upload Artifacts | ||
| uses: actions/[email protected] | ||
|
|
@@ -49,9 +49,9 @@ jobs: | |
| - name: Generate GitHub Summary | ||
| run: | | ||
| echo -e "# Summary\n" >> $GITHUB_STEP_SUMMARY | ||
| poetry run nox -s project:report -- -- --format markdown >> $GITHUB_STEP_SUMMARY | ||
| poetry run nox -s dependency:licenses >> $GITHUB_STEP_SUMMARY | ||
| poetry run -- nox -s project:report -- --format markdown >> $GITHUB_STEP_SUMMARY | ||
| poetry run -- nox -s dependency:licenses >> $GITHUB_STEP_SUMMARY | ||
| echo -e "\n\n# Coverage\n" >> $GITHUB_STEP_SUMMARY | ||
| poetry run coverage report -- --format markdown >> $GITHUB_STEP_SUMMARY | ||
| poetry run tbx lint pretty-print >> $GITHUB_STEP_SUMMARY | ||
| poetry run tbx security pretty-print .security.json >> $GITHUB_STEP_SUMMARY | ||
| poetry run -- tbx lint pretty-print >> $GITHUB_STEP_SUMMARY | ||
| poetry run -- tbx security pretty-print .security.json >> $GITHUB_STEP_SUMMARY | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,7 +33,7 @@ jobs: | |
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| - name: Run Tests and Collect Coverage | ||
| run: poetry run nox -s test:integration -- -- --coverage --db-version ${{ matrix.exasol-version }} | ||
| run: poetry run -- nox -s test:integration -- --coverage --db-version ${{ matrix.exasol-version }} | ||
|
|
||
| - name: Upload Artifacts | ||
| uses: actions/[email protected] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 0 additions & 33 deletions
33
exasol/toolbox/templates/github/actions/python-environment/action.yml
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ jobs: | |
| run: | | ||
| echo "Please enable the version check by replacing this output with shell command bellow:" | ||
| echo "" | ||
| echo "poetry run version-check <<VERSION_PY>>" | ||
| echo "poetry run -- version-check <<VERSION_PY>>" | ||
| echo "" | ||
| echo "Note: <<VERSION_PY>> needs to point to the version file of the project (version.py)." | ||
| exit 1 | ||
|
|
@@ -41,7 +41,7 @@ jobs: | |
|
|
||
| - name: Build Documentation | ||
| run: | | ||
| poetry run python -m nox -s docs:build | ||
| poetry run -- nox -s docs:build | ||
|
|
||
| build-matrix: | ||
| name: Generate Build Matrix | ||
|
|
@@ -61,7 +61,7 @@ jobs: | |
| python-version: "3.9" | ||
|
|
||
| - name: Run changelog update check | ||
| run: poetry run nox -s changelog:updated | ||
| run: poetry run -- nox -s changelog:updated | ||
|
|
||
| Lint: | ||
| name: Linting (Python-${{ matrix.python-version }}) | ||
|
|
@@ -81,7 +81,7 @@ jobs: | |
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| - name: Run lint | ||
| run: poetry run nox -s lint:code | ||
| run: poetry run -- nox -s lint:code | ||
|
|
||
| - name: Upload Artifacts | ||
| uses: actions/[email protected] | ||
|
|
@@ -110,7 +110,7 @@ jobs: | |
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| - name: Run type-check | ||
| run: poetry run nox -s lint:typing | ||
| run: poetry run -- nox -s lint:typing | ||
|
|
||
| Security: | ||
| name: Security Checks (Python-${{ matrix.python-version }}) | ||
|
|
@@ -130,7 +130,7 @@ jobs: | |
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| - name: Run security linter | ||
| run: poetry run nox -s lint:security | ||
| run: poetry run -- nox -s lint:security | ||
|
|
||
| - name: Upload Artifacts | ||
| uses: actions/[email protected] | ||
|
|
@@ -153,7 +153,7 @@ jobs: | |
| python-version: "3.9" | ||
|
|
||
| - name: Run format check | ||
| run: poetry run nox -s project:format | ||
| run: poetry run -- nox -s project:format | ||
|
|
||
| Tests: | ||
| name: Unit-Tests (Python-${{ matrix.python-version }}, Exasol-${{ matrix.exasol-version}}) | ||
|
|
@@ -175,7 +175,7 @@ jobs: | |
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| - name: Run Tests and Collect Coverage | ||
| run: poetry run nox -s test:unit -- -- --coverage | ||
| run: poetry run -- nox -s test:unit -- --coverage | ||
|
|
||
| - name: Upload Artifacts | ||
| uses: actions/[email protected] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,7 @@ jobs: | |
|
|
||
| - name: Build Documentation | ||
| run: | | ||
| poetry run nox -s docs:multiversion | ||
| poetry run -- nox -s docs:multiversion | ||
|
|
||
| - name: Deploy | ||
| uses: JamesIves/[email protected] | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.