Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
fdf9333
added dependency-update workflow template
Rimsha2535 Mar 19, 2026
67e8357
Add dependency-update workflow template and update tests
Rimsha2535 Apr 13, 2026
e764019
Merge branch 'main' into feature/dependency-update-workflow
Rimsha2535 Apr 13, 2026
c9c53e6
Apply review feedback for dependency update workflow
Rimsha2535 Apr 14, 2026
c05e242
Merge branch 'main' into feature/dependency-update-workflow
ArBridgeman Apr 15, 2026
cea77fd
Improve dependency update workflow, tests, and docs
Rimsha2535 Apr 20, 2026
9844688
Merge branch 'main' into feature/dependency-update-workflow
ArBridgeman Apr 29, 2026
454f20e
Merge branch 'main' into feature/dependency-update-workflow
ArBridgeman Apr 29, 2026
49145b9
Fix release:prepare test
ArBridgeman Apr 29, 2026
bf38243
Update PTB workflows to 7.0.0
ArBridgeman Apr 29, 2026
b59c5b5
Add Slack reporting hook
ArBridgeman May 4, 2026
85c89d2
Add entry to unreleased.md changelog
ArBridgeman May 4, 2026
a882d41
Update .github/workflows/dependency-update.yml
Rimsha2535 May 6, 2026
eec5503
Update .github/workflows/dependency-update.yml
Rimsha2535 May 6, 2026
4bb47a9
Update .github/workflows/dependency-update.yml
Rimsha2535 May 6, 2026
a4c95e3
Update .github/workflows/dependency-update.yml
Rimsha2535 May 6, 2026
8ec9d68
Update .github/workflows/dependency-update.yml
Rimsha2535 May 6, 2026
7ee7359
Merge branch 'main' into feature/dependency-update-workflow
Rimsha2535 May 6, 2026
9e18007
Add slack_hook
Rimsha2535 May 4, 2026
ee5f3ab
Resolve merge conflicts
Rimsha2535 May 6, 2026
6f64290
Copy dependency-update workflow changes to template
Rimsha2535 May 6, 2026
e6abb21
Merge branch 'main' into feature/dependency-update-workflow
ArBridgeman May 11, 2026
de5ae69
Re-run workflow:generate
ArBridgeman May 11, 2026
3ed222c
Add to top of the summary
ArBridgeman May 11, 2026
662130b
Add to .gitattributes
ArBridgeman May 11, 2026
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
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ doc/changes/changelog.md linguist-generated=true
.github/workflows/check-release-tag.yml linguist-generated=true
.github/workflows/checks.yml linguist-generated=true
.github/workflows/ci.yml linguist-generated=true
.github/workflows/dependency-update.yml linguist-generated=true
.github/workflows/fast-tests.yml linguist-generated=true
.github/workflows/gh-pages.yml linguist-generated=true
.github/workflows/matrix-*.yml linguist-generated=true
Expand Down
115 changes: 115 additions & 0 deletions .github/workflows/dependency-update.yml

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

6 changes: 6 additions & 0 deletions doc/changes/unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

In this major release, several modifications were made to the PTB's workflow templates:

* For automatically resolving vulnerabilities, the `dependency-update.yml` workflow was
added. For more details, see the [Dependency Update](https://exasol.github.io/python-toolbox/main/user_guide/features/github_workflows/index.html#dependency-update) section.
* The periodic run which was previously executed in the `ci.yml` has been moved to its
own `periodic-validation.yml` and will run weekly. This also has been modified to
run the `slow-checks.yml` so that more complete linting and coverage information is
Expand All @@ -15,6 +17,10 @@ it only executes `gh-pages.yml`.
add custom `fast-tests-extension.yml` and `merge-gate-extension.yml` files. For more
details, check out the [Workflow Extensions](https://exasol.github.io/python-toolbox/main/user_guide/features/github_workflows/index.html#workflow-extensions) section.

## Features

* #756: Added `dependency-update.yml` to automate resolving vulnerabilities with a generated pull request

## Bugfix

* #563: Fixed merge-gate to prevent auto-merges from happening when integration tests failed
Expand Down
16 changes: 16 additions & 0 deletions doc/user_guide/features/github_workflows/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ Maintained by the PTB
* - ``fast-tests.yml``
- Workflow call
- Executes unit tests.
* - ``dependency-update.yml``
- Weekly and manual
- Audits project dependencies for known vulnerabilities, updates them with Poetry when needed, and creates a pull request if the ``poetry.lock`` was changed.
* - ``gh-pages.yml``
- Workflow call
- Builds the documentation and deploys it to GitHub Pages.
Expand Down Expand Up @@ -138,6 +141,19 @@ and is maintained by the PTB and what is project-specific.
CI Actions
----------

.. _dependency_update:

Dependency Update
^^^^^^^^^^^^^^^^^

The ``dependency-update.yml`` workflow is used to resolve vulnerabilities by updating our project dependencies.

It can be triggered manually and is also scheduled to run weekly.

The workflow first audits dependencies for known vulnerabilities. If vulnerabilities
are detected, it updates the dependencies using Poetry. When the ``poetry.lock`` is changed,
then it creates a pull request with the update.

.. _pr_merge_yml:

Merge
Expand Down
115 changes: 115 additions & 0 deletions exasol/toolbox/templates/github/workflows/dependency-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
name: Dependency Update

on:
schedule:
# Every Monday at 03:00 UTC
- cron: "0 3 * * 1"
workflow_dispatch:
Comment thread
ArBridgeman marked this conversation as resolved.

jobs:
dependency-update:
name: Dependency Update
runs-on: "(( os_version ))"
permissions:
contents: write
pull-requests: write

steps:
- name: Check out Repository
id: check-out-repository
uses: actions/checkout@v6
with:
fetch-depth: 0

- name: Fail if not running on the default branch
id: check-branch
if: github.ref != format('refs/heads/{0}', github.event.repository.default_branch)
uses: actions/github-script@v8
with:
script: |
core.setFailed('Not running on the default branch. github.ref is ${{ github.ref }}')

- name: Set up Python & Poetry Environment
id: set-up-python-and-poetry-environment
uses: exasol/python-toolbox/.github/actions/python-environment@v6
with:
python-version: "(( minimum_python_version ))"
poetry-version: "(( dependency_manager_version ))"

- name: Audit Dependencies
id: audit-dependencies
run: |
poetry run -- nox -s dependency:audit | tee vulnerabilities.json
LENGTH=$(jq 'length' vulnerabilities.json)
echo "count=$LENGTH" >> "$GITHUB_OUTPUT"

- name: Update Dependencies
id: update-dependencies
if: steps.audit-dependencies.outputs.count > 0
run: poetry update

- name: Check for poetry.lock Changes
id: check-for-poetry-lock-changes
if: steps.audit-dependencies.outputs.count > 0
run: |
if git diff --quiet -- poetry.lock; then
echo "changed=false" >> "$GITHUB_OUTPUT"
else
echo "changed=true" >> "$GITHUB_OUTPUT"
fi

- name: Configure git
id: configure-git
if: steps.check-for-poetry-lock-changes.outputs.changed == 'true'
run: |
git config --global user.email "opensource@exasol.com"
git config --global user.name "Automatic Dependency Updater"

- name: Create branch
id: create-branch
if: steps.check-for-poetry-lock-changes.outputs.changed == 'true'
run: |
branch_name="dependency-update/$(date "+%Y-%m-%d_%H:%M:%S")"
echo "Creating branch $branch_name"
git switch -C "$branch_name"

- name: Commit Changes & Push
id: publish-branch
if: steps.check-for-poetry-lock-changes.outputs.changed == 'true'
run: |
branch_name=$(git rev-parse --abbrev-ref HEAD)
git add poetry.lock
git commit --message "Updated poetry.lock"
git push --set-upstream origin "$branch_name"

- name: Create Pull Request
id: create-pr
if: steps.check-for-poetry-lock-changes.outputs.changed == 'true'
env:
GH_TOKEN: ${{ github.token }}
run: |
BASE_BRANCH=$(gh repo view --json defaultBranchRef -q .defaultBranchRef.name)

PR_BODY="Automated dependency update for \`poetry.lock\`.
This PR was created by the dependency update workflow after running:
- \`poetry run -- nox -s dependency:audit\`
- \`poetry update\`"

PR_URL=$(gh pr create \
--base "$BASE_BRANCH" \
--title "Update dependencies to fix vulnerabilities ($(date '+%Y-%m-%d'))" \
--body "$PR_BODY")

echo "pr_url=$PR_URL" >> "$GITHUB_OUTPUT"

- name: Report New Pull Request to Slack Channel
id: report-pr-slack
if: ${{ steps.create-pr.outputs.pr_url }}
uses: ravsamhq/notify-slack-action@v2
with:
status: '${{ job.status }}'
token: '${{ secrets.GITHUB_TOKEN }}'
notification_title: 'Dependency update for {repo} created a Pull Request'
message_format: '{workflow} created Pull Request ${{ steps.create-pr.outputs.pr_url }}'
env:
SLACK_WEBHOOK_URL: '${{ secrets.INTEGRATION_TEAM_SECURITY_UPDATES_WEBHOOK }}'
2 changes: 1 addition & 1 deletion exasol/toolbox/util/dependencies/audit.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ def load_from_pip_audit(cls, working_directory: Path) -> Vulnerabilities:

vulnerabilities = []
for entry in audit_dict["dependencies"]:
for vuln_entry in entry["vulns"]:
for vuln_entry in entry.get("vulns", []):
vulnerabilities.append(
Vulnerability.from_audit_entry(
package_name=entry["name"],
Expand Down
2 changes: 1 addition & 1 deletion test/integration/project-template/nox_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ def test_install_github_workflows(self, poetry_path, run_command):
assert output.returncode == 0

file_list = run_command(["ls", ".github/workflows"]).stdout.splitlines()
assert len(file_list) == 15
assert len(file_list) == 16
2 changes: 1 addition & 1 deletion test/unit/nox/_workflow_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class TestGenerateWorkflow:
@staticmethod
@pytest.mark.parametrize(
"nox_session_runner_posargs, expected_count",
[(ALL, 15), *[(key, 1) for key in WORKFLOW_TEMPLATE_OPTIONS.keys()]],
[(ALL, 16), *[(key, 1) for key in WORKFLOW_TEMPLATE_OPTIONS.keys()]],
indirect=["nox_session_runner_posargs"],
)
def test_works_as_expected(
Expand Down
8 changes: 7 additions & 1 deletion test/unit/util/dependencies/audit_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,13 @@ class TestVulnerabilities:
@staticmethod
def test_with_no_vulnerabilities():
pip_audit_dict = {
"dependencies": [{"name": "alabaster", "version": "0.7.16", "vulns": []}]
"dependencies": [
{
"name": "exasol-toolbox",
"skip_reason": "Dependency not found on PyPI and could not be audited: exasol-toolbox (7.0.0)",
},
{"name": "alabaster", "version": "0.7.16", "vulns": []},
]
}
pip_audit_json = json.dumps(pip_audit_dict)

Expand Down
1 change: 1 addition & 0 deletions test/unit/util/workflows/templates_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ def test_get_workflow_templates(project_config):
"checks",
"ci",
"fast-tests",
"dependency-update",
"gh-pages",
"matrix-all",
"matrix-exasol",
Expand Down