Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/security-issues/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ runs:
- name: Install Python Toolbox / Security tool
shell: bash
run: |
pip install exasol-toolbox==1.6.0
pip install exasol-toolbox==1.6.1

- name: Create Security Issue Report
shell: bash
Expand Down
2 changes: 2 additions & 0 deletions doc/changes/changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changelog

* [unreleased](unreleased.md)
* [1.6.1](changes_1.6.1.md)
* [1.6.0](changes_1.6.0.md)
* [1.5.0](changes_1.5.0.md)
* [1.4.0](changes_1.4.0.md)
Expand Down Expand Up @@ -38,6 +39,7 @@
hidden:
---
unreleased
changes_1.6.1
changes_1.6.0
changes_1.5.0
changes_1.4.0
Expand Down
28 changes: 28 additions & 0 deletions doc/changes/changes_1.6.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# 1.6.1 - 2025-07-16

## Summary

This version of the PTB resolves many bugfixes associated with the cookiecutter template
and creating a new project that uses the PTB.

If any directories or files specified in your `noxconfig.py` via `Config.source` should
not be included in a Sonar analysis, it is recommended to add the following to
your `pyproject.toml` under the `[tool.sonar]` section:

```toml
exclusions = "<source-directory>/version.py,<source_directory>/<directory-to-ignore>/*"
```

## Bugfixes

* #489: Fixed .pre-commit-config.yaml to use existing nox tasks
* #490: Fixed artifacts:validate & sonar:check to work for newly created projects
* #484: Fixed hint command text in version.py to include -s for executing nox task

## Documentation

* #488: Updated user guide to make clearer under which conditions branch protections based on GitHub actions can be enacted

## Refactoring

* #482: Updated pull_request_template.md to reflect checks we should regularly perform
14 changes: 0 additions & 14 deletions doc/changes/unreleased.md
Original file line number Diff line number Diff line change
@@ -1,15 +1 @@
# Unreleased

## Bugfixes

* #489: Fixed .pre-commit-config.yaml to use existing nox tasks
* #490: Fixed artifacts:validate & sonar:check to work for newly created projects
* #484: Fixed hint command text in version.py to include -s for executing nox task

## Documentation

* #488: Updated user guide to make clearer under which conditions branch protections based on GitHub actions can be enacted

## Refactoring

* #482: Updated pull_request_template.md to reflect checks we should regularly perform
8 changes: 8 additions & 0 deletions doc/user_guide/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ For a **public** project
projectKey = "com.exasol:<project-key>"
hostUrl = "https://sonarcloud.io"
organization = "exasol"
exclusions = "<source-directory>/version.py,<source_directory>/<directory-to-ignore>/*"
6. Post-merge, update the branch protections to include SonarQube analysis

* This should only be done when tests exist for the project, & that the project is
Expand All @@ -253,8 +254,15 @@ For a **private** project
projectKey = "com.exasol:<project-key>"
hostUrl = "https://sonar.exasol.com"
organization = "exasol"
exclusions = "<source-directory>/version.py,<source_directory>/<directory-to-ignore>/*"
6. Post-merge, update the branch protections to include SonarQube analysis from exasonarqubeprchecks

* This should only be done when tests exist for the project, & that the project is
at a state in which enforced code coverage would not be a burden. For new projects,
we recommend creating an issue to add the SonarQube analysis to the branch protections
at a later point. In such scenarios, SonarQube analysis will still report its analysis
results to the PR, but it will not prevent the PR from being merged.

9. Go 🥜
+++++++++++++
You are ready to use the toolbox. With *nox -l* you can list all available tasks.
Expand Down
3 changes: 2 additions & 1 deletion exasol/toolbox/nox/_package_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@

# fmt: off
_VERSION_MODULE_TEMPLATE = cleandoc('''
""" ATTENTION:
"""ATTENTION:
This file is generated by exasol/toolbox/nox/_package_version.py when using:
* either "poetry run -- nox -s project:fix"
* or "poetry run -- nox -s version:check -- --fix"
Do not edit this file manually!
If you need to change the version, do so in the pyproject.toml, e.g. by using
`poetry version X.Y.Z`.
"""

MAJOR = {major}
MINOR = {minor}
PATCH = {patch}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1

- name: Build Artifacts
run: poetry build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1

- name: Check Tag Version
# make sure the pushed/created tag matched the project version
Expand Down
16 changes: 8 additions & 8 deletions exasol/toolbox/templates/github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 0

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1

- name: Check Version(s)
run: poetry run -- nox -s version:check
Expand All @@ -32,7 +32,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1

- name: Build Documentation
run: |
Expand All @@ -59,7 +59,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1

- name: Run changelog update check
run: poetry run -- nox -s changelog:updated
Expand All @@ -78,7 +78,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -131,7 +131,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -155,7 +155,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1

- name: Run format check
run: poetry run -- nox -s project:format
Expand All @@ -177,7 +177,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1
with:
python-version: ${{ matrix.python-version }}

Expand Down
2 changes: 1 addition & 1 deletion exasol/toolbox/templates/github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fetch-depth: 0

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1

- name: Build Documentation
run: |
Expand Down
2 changes: 1 addition & 1 deletion exasol/toolbox/templates/github/workflows/matrix-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1

- name: Generate matrix
run: poetry run -- nox -s matrix:all
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1

- name: Generate matrix
run: poetry run -- nox -s matrix:exasol
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1

- name: Generate matrix
run: poetry run -- nox -s matrix:python
Expand Down
2 changes: 1 addition & 1 deletion exasol/toolbox/templates/github/workflows/report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fetch-depth: 0

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1

- name: Download Artifacts
uses: actions/download-artifact@v4.2.1
Expand Down
2 changes: 1 addition & 1 deletion exasol/toolbox/templates/github/workflows/slow-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.0
uses: exasol/python-toolbox/.github/actions/python-environment@1.6.1
with:
python-version: ${{ matrix.python-version }}

Expand Down
2 changes: 1 addition & 1 deletion exasol/toolbox/version.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "exasol-toolbox"
version = "1.6.0"
version = "1.6.1"
requires-python = ">=3.9,<4.0"
description = "Your one-stop solution for managing all standard tasks and core workflows of your Python project."
authors = [
Expand Down