Skip to content

Commit 7f5c9a4

Browse files
committed
ci: update test dependencies
Update all package versions. Cleanup github stuff. Signed-off-by: Robin Jarry <[email protected]>
1 parent d28a495 commit 7f5c9a4

File tree

4 files changed

+26
-20
lines changed

4 files changed

+26
-20
lines changed

.github/workflows/ci.yml

+14-8
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,17 @@
33
---
44
name: CI
55

6-
on: [push, pull_request]
6+
on:
7+
pull_request:
8+
branches:
9+
- master
10+
push:
11+
branches:
12+
- master
713

814
jobs:
915
lint:
10-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-24.04
1117
steps:
1218
- uses: actions/checkout@v4
1319
- uses: actions/setup-python@v4
@@ -23,20 +29,20 @@ jobs:
2329
- run: python -m tox -e lint
2430

2531
check-commits:
26-
if: github.event_name == 'pull_request'
32+
if: ${{ github.event.pull_request.commits }}
2733
runs-on: ubuntu-latest
2834
env:
29-
SRPY_START_COMMIT: "${{ github.event.pull_request.base.sha }}"
30-
SRPY_END_COMMIT: "${{ github.event.pull_request.head.sha }}"
35+
SRPY_COMMIT_RANGE: "HEAD~${{ github.event.pull_request.commits }}.."
3136
steps:
3237
- run: sudo apt-get install git make
3338
- uses: actions/checkout@v4
3439
with:
3540
fetch-depth: 0
41+
ref: ${{ github.event.pull_request.head.sha || github.ref }}
3642
- run: make check-commits
3743

3844
test:
39-
runs-on: ubuntu-latest
45+
runs-on: ubuntu-24.04
4046
strategy:
4147
matrix:
4248
include:
@@ -67,7 +73,7 @@ jobs:
6773
- run: python -m tox -e ${{ matrix.toxenv }}
6874

6975
coverage:
70-
runs-on: ubuntu-latest
76+
runs-on: ubuntu-24.04
7177
steps:
7278
- uses: actions/checkout@v4
7379
- uses: actions/setup-python@v4
@@ -86,7 +92,7 @@ jobs:
8692
deploy:
8793
needs: [lint, test]
8894
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
89-
runs-on: ubuntu-latest
95+
runs-on: ubuntu-24.04
9096
steps:
9197
- uses: actions/checkout@v4
9298
- uses: actions/setup-python@v4

Makefile

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ tests:
1212
format:
1313
tox -e format
1414

15-
SRPY_START_COMMIT ?= origin/master
16-
SRPY_END_COMMIT ?= HEAD
15+
SRPY_COMMIT_RANGE ?= origin/master..
1716

1817
check-commits:
19-
./check-commits.sh $(SRPY_START_COMMIT)..$(SRPY_END_COMMIT)
18+
./check-commits.sh $(SRPY_COMMIT_RANGE)
2019

2120
.PHONY: lint tests format check-commits

pylintrc

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ disable=
7171
missing-docstring,
7272
suppressed-message,
7373
too-many-lines,
74+
too-many-positional-arguments,
7475
unnecessary-pass,
7576
unused-argument,
7677
use-implicit-booleaness-not-comparison-to-string,

tox.ini

+9-9
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ basepython = python3
5656
description = Format python code using isort and black.
5757
changedir = .
5858
deps =
59-
black~=23.12.1
60-
isort~=5.13.2
59+
black~=25.1.0
60+
isort~=6.0.0
6161
skip_install = true
6262
install_command = python3 -m pip install {opts} {packages}
6363
allowlist_externals =
@@ -73,14 +73,14 @@ description = Run coding style checks.
7373
install_command = {toxinidir}/tox-install.sh {toxworkdir} {opts} {packages}
7474
changedir = .
7575
deps =
76-
astroid~=3.0.2
77-
black~=23.12.1
78-
flake8~=7.0.0
79-
isort~=5.13.2
80-
pycodestyle~=2.11.1
76+
astroid~=3.3.8
77+
black~=25.1.0
78+
flake8~=7.1.1
79+
isort~=6.0.0
80+
pycodestyle~=2.12.1
8181
pyflakes~=3.2.0
82-
pylint~=3.0.3
83-
setuptools~=69.0.3
82+
pylint~=3.3.4
83+
setuptools~=75.8.0
8484
allowlist_externals =
8585
/bin/sh
8686
/usr/bin/sh

0 commit comments

Comments
 (0)