Skip to content

CI: Modernize OS runner and Python versions #245

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.

Sign up for GitHub

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
amotl merged 5 commits into from
Dec 3, 2025
Merged

CI: Modernize OS runner and Python versions #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e5fc71
CI: Modernize OS runner and Python versions
amotl Dec 3, 2025
4d3f1be
CI: Improve Dependabot configuration
amotl Dec 3, 2025
3887dd3
CI: Adjust GitHub org name for `release-github` job
amotl Dec 3, 2025
c663923
CI: Don't limit runs to `test.yml`
amotl Dec 3, 2025
b2e4aa0
Project: Bundle `build` and `twine` packages into `release` extra
amotl Dec 3, 2025
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
6 changes: 3 additions & 3 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

version: 2
updates:
- package-ecosystem: "pip" # See documentation for possible values
directory: "/" # Location of package manifests
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "weekly"
interval: "daily"

- package-ecosystem: "github-actions"
directory: "/"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: '3.11'
python-version: '3.14'
cache: 'pip'
cache-dependency-path: 'setup.cfg'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-github.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
$(go env GOPATH)/bin/github-release -v release \
--user panodata \
--user grafana-toolbox \
--repo grafana-client \
--tag ${{ steps.version.outputs.VERSION }} \
--name ${{ steps.version.outputs.VERSION }}
18 changes: 11 additions & 7 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@ name: Test
on:

pull_request:
branches: ~
paths:
- '.github/workflows/test.yml'
- '.github/workflows/**'
- 'pyproject.toml'
- 'setup.cfg'
- '**.py'

push:
branches: [ main ]
paths:
- '.github/workflows/test.yml'
- '.github/workflows/**'
- 'pyproject.toml'
- 'setup.cfg'
- '**.py'
Expand All @@ -32,11 +31,16 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-22.04"]
os: [
'ubuntu-latest',
]
python-version: [
'3.7', '3.13',
'pypy-3.9', 'pypy-3.10',
'3.14',
'pypy-3.11',
]
Comment on lines +34 to 40
Copy link

@coderabbitai coderabbitai bot Dec 3, 2025

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash

# Check for Python version requirements
echo "=== setup.cfg (if exists) ==="
if [ -f setup.cfg ]; then
  cat setup.cfg | grep -A 5 -E "(python_requires|Programming Language)"
else
  echo "File not found"
fi

echo -e "\n=== pyproject.toml (if exists) ==="
if [ -f pyproject.toml ]; then
  cat pyproject.toml | grep -A 3 -E "(requires-python|requires_python)"
else
  echo "File not found"
fi

echo -e "\n=== setup.py (if exists) ==="
if [ -f setup.py ]; then
  cat setup.py | grep -A 2 "python_requires" || echo "python_requires not found"
fi

echo -e "\n=== Current .github/workflows/test.yml matrix (lines 34-43) ==="
if [ -f .github/workflows/test.yml ]; then
  sed -n '34,43p' .github/workflows/test.yml
fi

Repository: grafana-toolbox/grafana-client

Length of output: 1238

Correct the test matrix to match declared Python version support (3.7–3.13).

The project declares support for Python 3.7–3.13 in setup.cfg (python_requires = >=3.7 and classifier entries), but the test matrix has been reduced to only 3.14 and pypy-3.11 in the main job. This removes testing for all currently-supported versions (3.7–3.13) while adding an untested future version (3.14). Only Python 3.7 is partially retained via an explicit include on ubuntu-22.04.

This change significantly reduces CI coverage and creates a mismatch between declared and tested compatibility. Restore testing for 3.8–3.13 in the main matrix, and clarify the intent behind 3.14 (beta testing, or removal of support for older versions?).

Copy link
Contributor Author

@amotl amotl Dec 3, 2025

Choose a reason for hiding this comment

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

The test matrix includes this snippet that extends it to cover Python 3.7.

include:
  - os: 'ubuntu-22.04'
    python-version: '3.7'

include:
- os: 'ubuntu-22.04'
python-version: '3.7'
steps:
- uses: actions/checkout@v5

Expand All @@ -56,7 +60,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --editable=.[test,develop]
python -m pip install --editable='.[test,develop]'

- name: Check code style
if: matrix.python-version != '3.7' && matrix.python-version != 'pypy-3.7'
Expand Down
6 changes: 4 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ classifiers =
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Programming Language :: Python :: 3.13
Programming Language :: Python :: 3.14
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: Implementation :: PyPy
Topic :: Communications
Expand Down Expand Up @@ -84,12 +85,13 @@ test =
requests-mock<2

develop =
build<2
poethepoet<1
pip-review<2 # Use `pip-review --local --interactive` to upgrade outdated packages.
ruff<0.15;python_version>='3.7'
twine<7

release =
build<2
twine<7

[options.packages.find]
where = .
Expand Down
Loading