Skip to content
Closed
Show file tree
Hide file tree
Changes from all 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
13 changes: 2 additions & 11 deletions .github/workflows/auto-dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,23 @@ on:
pull_request_target:

permissions:
# Read repository contents and Dependabot metadata used by the nested action.
contents: read
# The nested action also uses `github.token` internally for PR operations.
pull-requests: write

jobs:
auto-merge:
name: Auto-merge Dependabot PR
if: >
github.actor == 'dependabot[bot]' &&
!contains(github.event.pull_request.title, 'the repo-config group') &&
!contains(github.event.pull_request.title, 'Bump black from ')
!contains(github.event.pull_request.title, 'the repo-config group')
runs-on: ubuntu-slim
steps:
- name: Generate GitHub App token
id: app-token
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
with:
app-id: ${{ secrets.FREQUENZ_AUTO_DEPENDABOT_APP_ID }}
private-key: ${{ secrets.FREQUENZ_AUTO_DEPENDABOT_APP_PRIVATE_KEY }}
# Merge Dependabot PRs.
permission-contents: write
# Create the auto-merged label if it does not exist.
permission-issues: write
# Approve PRs, add labels, and enable auto-merge.
permission-pull-requests: write

- name: Auto-merge Dependabot PR
uses: frequenz-floss/dependabot-auto-approve@e943399cc9d76fbb6d7faae446cd57301d110165 # v1.5.0
Expand Down
22 changes: 9 additions & 13 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,9 @@ jobs:
strategy:
fail-fast: false
matrix:
arch:
- amd64
- arm
os:
platform:
- ubuntu-24.04
- ubuntu-24.04-arm
python:
- "3.11"
- "3.12"
Expand All @@ -41,7 +39,7 @@ jobs:
# that uses the same venv to run multiple linting sessions
- "ci_checks_max"
- "pytest_min"
runs-on: ${{ matrix.os }}${{ matrix.arch != 'amd64' && format('-{0}', matrix.arch) || '' }}
runs-on: ${{ matrix.platform }}

steps:
- name: Run nox
Expand All @@ -60,7 +58,7 @@ jobs:
needs: ["nox"]
# We skip this job only if nox was also skipped
if: always() && needs.nox.result != 'skipped'
runs-on: ubuntu-24.04
runs-on: ubuntu-slim
env:
DEPS_RESULT: ${{ needs.nox.result }}
steps:
Expand Down Expand Up @@ -105,15 +103,13 @@ jobs:
strategy:
fail-fast: false
matrix:
arch:
- amd64
- arm
os:
platform:
- ubuntu-24.04
- ubuntu-24.04-arm
python:
- "3.11"
- "3.12"
runs-on: ${{ matrix.os }}${{ matrix.arch != 'amd64' && format('-{0}', matrix.arch) || '' }}
runs-on: ${{ matrix.platform }}

steps:
- name: Setup Git
Expand Down Expand Up @@ -161,7 +157,7 @@ jobs:
needs: ["test-installation"]
# We skip this job only if test-installation was also skipped
if: always() && needs.test-installation.result != 'skipped'
runs-on: ubuntu-24.04
runs-on: ubuntu-slim
env:
DEPS_RESULT: ${{ needs.test-installation.result }}
steps:
Expand Down Expand Up @@ -276,7 +272,7 @@ jobs:
# discussions to create the release announcement in the discussion forums
contents: write
discussions: write
runs-on: ubuntu-24.04
runs-on: ubuntu-slim
steps:
- name: Download distribution files
uses: actions/download-artifact@v8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dco-merge-queue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

jobs:
DCO:
runs-on: ubuntu-latest
runs-on: ubuntu-slim
if: ${{ github.actor != 'dependabot[bot]' }}
steps:
- run: echo "This DCO job runs on merge_queue event and doesn't check PR contents"

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- name: Labeler
# XXX: !!! SECURITY WARNING !!!
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-notes-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
jobs:
check-release-notes:
name: Check release notes are updated
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- name: Check for a release notes update
if: github.event_name == 'pull_request'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/repo-config-migration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ jobs:
steps:
- name: Generate token
id: create-app-token
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
with:
app-id: ${{ secrets.FREQUENZ_AUTO_DEPENDABOT_APP_ID }}
private-key: ${{ secrets.FREQUENZ_AUTO_DEPENDABOT_APP_PRIVATE_KEY }}
- name: Migrate
uses: frequenz-floss/gh-action-dependabot-migrate@b389f72f9282346920150a67495efbae450ac07b # v1.1.0
uses: frequenz-floss/gh-action-dependabot-migrate@07dc7e74726498c50726a80cc2167a04d896508f # v1.0.0
with:
script-url-template: >-
https://raw.githubusercontent.com/frequenz-floss/frequenz-repo-config-python/{version}/cookiecutter/migrate.py
Expand Down
13 changes: 7 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
requires = [
"setuptools == 82.0.1",
"setuptools_scm[toml] == 10.0.5",
"frequenz-repo-config[lib] == 0.14.0",
"frequenz-repo-config[lib] == 0.17.0",
]
build-backend = "setuptools.build_meta"

[project]
name = "frequenz-client-common"
description = "Common code and utilities for Frequenz API clients"
readme = "README.md"
license = { text = "MIT" }
license = "MIT"
license-files = ["LICENSE"]
keywords = ["frequenz", "python", "lib", "library", "client-common"]
classifiers = [
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Topic :: Software Development :: Libraries",
Expand All @@ -40,6 +40,7 @@ email = "floss@frequenz.com"
[project.optional-dependencies]
dev-flake8 = [
"flake8 == 7.3.0",
"flake8-datetimez == 20.10.0",
"flake8-docstrings == 1.7.0",
"flake8-pyproject == 1.2.4", # For reading the flake8 config from pyproject.toml
"pydoclint == 0.8.3",
Expand All @@ -56,7 +57,7 @@ dev-mkdocs = [
"mkdocs-material == 9.7.6",
"mkdocstrings[python] == 1.0.3",
"mkdocstrings-python == 2.0.3",
"frequenz-repo-config[lib] == 0.14.0",
"frequenz-repo-config[lib] == 0.17.0",
]
dev-mypy = [
"mypy == 1.20.0",
Expand All @@ -65,15 +66,15 @@ dev-mypy = [
# For checking the noxfile, docs/ script, and tests
"frequenz-client-common[dev-mkdocs,dev-noxfile,dev-pytest]",
]
dev-noxfile = ["nox == 2026.2.9", "frequenz-repo-config[lib] == 0.14.0"]
dev-noxfile = ["nox == 2026.2.9", "frequenz-repo-config[lib] == 0.17.0"]
dev-pylint = [
"pylint == 4.0.5",
# For checking the noxfile, docs/ script, and tests
"frequenz-client-common[dev-mkdocs,dev-noxfile,dev-pytest]",
]
dev-pytest = [
"pytest == 9.0.2",
"frequenz-repo-config[extra-lint-examples] == 0.14.0",
"frequenz-repo-config[extra-lint-examples] == 0.17.0",
Comment on lines -76 to +77
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something's really working real bad in this repo. The PR title (and dependabot metadata) says we are upgrading to v0.16.0 but it upgraded to v0.17.0 🤦 🤔 🤷

"hypothesis == 6.151.10",
"pytest-mock == 3.15.1",
"pytest-asyncio == 1.3.0",
Expand Down
Loading