Skip to content

Commit 477adce

Browse files
Merge branch 'main' into feature/#368-Add-Nox-task-for-full-release
2 parents b279d1c + e05da01 commit 477adce

26 files changed

+142
-112
lines changed

.github/actions/security-issues/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ runs:
3939
- name: Install Python Toolbox / Security tool
4040
shell: bash
4141
run: |
42-
pip install exasol-toolbox==0.8.0
42+
pip install exasol-toolbox==1.0.1
4343
4444
- name: Create Security Issue Report
4545
shell: bash

.github/workflows/checks.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,16 @@ jobs:
4040
Changelog:
4141
name: Changelog Update Check
4242
runs-on: ubuntu-24.04
43+
if: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/master' }}
4344

4445
steps:
4546
- name: SCM Checkout
4647
uses: actions/checkout@v4
4748

48-
- name: Fetch the main branch
49-
run: git fetch origin main
50-
5149
- name: Setup Python & Poetry Environment
5250
uses: ./.github/actions/python-environment
53-
with:
54-
python-version: "3.9"
5551

5652
- name: Run changelog update check
57-
if: ${{ github.ref != 'refs/heads/main' }}
5853
run: poetry run -- nox -s changelog:updated
5954

6055
build-matrix:
@@ -147,8 +142,6 @@ jobs:
147142

148143
- name: Setup Python & Poetry Environment
149144
uses: ./.github/actions/python-environment
150-
with:
151-
python-version: "3.9"
152145

153146
- name: Run format check
154147
run: poetry run -- nox -s project:format

doc/changes/changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Changelog
22

33
* [unreleased](unreleased.md)
4+
* [1.0.1](changes_1.0.1.md)
45
* [1.0.0](changes_1.0.0.md)
56
* [0.21.0](changes_0.21.0.md)
67
* [0.20.0](changes_0.20.0.md)
@@ -31,6 +32,7 @@
3132
hidden:
3233
---
3334
unreleased
35+
changes_1.0.1
3436
changes_1.0.0
3537
changes_0.21.0
3638
changes_0.20.0

doc/changes/changes_1.0.1.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# 1.0.1 - 2025-04-11
2+
3+
## Bugfixes
4+
5+
* #397: Fixed handling empty coverage
6+
* #403: Removed unneeded `poetry run` from internal code of nox tasks
7+
8+
## Refactorings
9+
10+
* #399: Modified `release:prepare` to update `.github/actions` with new PTB version

doc/changes/unreleased.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# Unreleased
22

3-
## Bugfixes
4-
5-
* #397: Fix handling empty coverage
6-
73
## ✨ Features
84

95
* [#378](https://github.com/exasol/python-toolbox/pull/378/files): Add Nox task to trigger a release

exasol/toolbox/nox/_dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ def _parse_args(session) -> argparse.Namespace:
263263
def run(self, session: Session) -> None:
264264
args = self._parse_args(session)
265265

266-
command = ["poetry", "run", "pip-audit", "-f", "json"]
266+
command = ["pip-audit", "-f", "json"]
267267
output = subprocess.run(command, capture_output=True)
268268

269269
audit_json = self._filter_json_for_vulnerabilities(output.stdout)

exasol/toolbox/nox/_format.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def _code_format(session: Session, mode: Mode, files: Iterable[str]) -> None:
1717
def command(*args: str) -> Iterable[str]:
1818
return args if mode == Mode.Fix else list(args) + ["--check"]
1919

20-
session.run(*command("poetry", "run", "isort"), *files)
21-
session.run(*command("poetry", "run", "black"), *files)
20+
session.run(*command("isort"), *files)
21+
session.run(*command("black"), *files)
2222

2323

2424
def _pyupgrade(session: Session, files: Iterable[str]) -> None:

exasol/toolbox/nox/_lint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def _security_lint(session: Session, files: Iterable[str]) -> None:
7575

7676

7777
def _import_lint(session: Session, path: Path) -> None:
78-
session.run("poetry", "run", "lint-imports", "--config", path)
78+
session.run("lint-imports", "--config", path)
7979

8080

8181
class Dependencies:

exasol/toolbox/nox/_shared.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def _deny_filter(files: Iterable[Path], deny_list: Iterable[str]) -> Iterable[Pa
4747

4848

4949
def _version(session: Session, mode: Mode, version_file: Path) -> None:
50-
command = ["poetry", "run", "version-check"]
50+
command = ["version-check"]
5151
command = command if mode == Mode.Check else command + ["--fix"]
5252
session.run(*command, f"{version_file}")
5353

exasol/toolbox/nox/_test.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@
2121
def _test_command(
2222
path: Path, config: Config, context: MutableMapping[str, Any]
2323
) -> Iterable[str]:
24-
base_command = ["poetry", "run"]
2524
coverage_command = (
2625
["coverage", "run", "-a", f"--rcfile={config.root / 'pyproject.toml'}", "-m"]
2726
if context["coverage"]
2827
else []
2928
)
3029
pytest_command = ["pytest", "-v", f"{path}"]
31-
return base_command + coverage_command + pytest_command + context["fwd-args"]
30+
return coverage_command + pytest_command + context["fwd-args"]
3231

3332

3433
def _unit_tests(
@@ -67,7 +66,7 @@ def _pass(
6766
def _coverage(
6867
session: Session, config: Config, context: MutableMapping[str, Any]
6968
) -> None:
70-
command = ["poetry", "run", "coverage", "report", "-m"]
69+
command = ["coverage", "report", "-m"]
7170
coverage_file = config.root / ".coverage"
7271
coverage_file.unlink(missing_ok=True)
7372
_unit_tests(session, config, context)

0 commit comments

Comments
 (0)