Skip to content

Commit

Permalink
ci: update test dependencies
Browse files Browse the repository at this point in the history
Update all package versions. Cleanup github stuff.

Signed-off-by: Robin Jarry <[email protected]>
  • Loading branch information
rjarry committed Feb 6, 2025
1 parent d28a495 commit 7f5c9a4
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 20 deletions.
22 changes: 14 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,17 @@
---
name: CI

on: [push, pull_request]
on:
pull_request:
branches:
- master
push:
branches:
- master

jobs:
lint:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
Expand All @@ -23,20 +29,20 @@ jobs:
- run: python -m tox -e lint

check-commits:
if: github.event_name == 'pull_request'
if: ${{ github.event.pull_request.commits }}
runs-on: ubuntu-latest
env:
SRPY_START_COMMIT: "${{ github.event.pull_request.base.sha }}"
SRPY_END_COMMIT: "${{ github.event.pull_request.head.sha }}"
SRPY_COMMIT_RANGE: "HEAD~${{ github.event.pull_request.commits }}.."
steps:
- run: sudo apt-get install git make
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha || github.ref }}
- run: make check-commits

test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -67,7 +73,7 @@ jobs:
- run: python -m tox -e ${{ matrix.toxenv }}

coverage:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
Expand All @@ -86,7 +92,7 @@ jobs:
deploy:
needs: [lint, test]
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ tests:
format:
tox -e format

SRPY_START_COMMIT ?= origin/master
SRPY_END_COMMIT ?= HEAD
SRPY_COMMIT_RANGE ?= origin/master..

check-commits:
./check-commits.sh $(SRPY_START_COMMIT)..$(SRPY_END_COMMIT)
./check-commits.sh $(SRPY_COMMIT_RANGE)

.PHONY: lint tests format check-commits
1 change: 1 addition & 0 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ disable=
missing-docstring,
suppressed-message,
too-many-lines,
too-many-positional-arguments,
unnecessary-pass,
unused-argument,
use-implicit-booleaness-not-comparison-to-string,
Expand Down
18 changes: 9 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ basepython = python3
description = Format python code using isort and black.
changedir = .
deps =
black~=23.12.1
isort~=5.13.2
black~=25.1.0
isort~=6.0.0
skip_install = true
install_command = python3 -m pip install {opts} {packages}
allowlist_externals =
Expand All @@ -73,14 +73,14 @@ description = Run coding style checks.
install_command = {toxinidir}/tox-install.sh {toxworkdir} {opts} {packages}
changedir = .
deps =
astroid~=3.0.2
black~=23.12.1
flake8~=7.0.0
isort~=5.13.2
pycodestyle~=2.11.1
astroid~=3.3.8
black~=25.1.0
flake8~=7.1.1
isort~=6.0.0
pycodestyle~=2.12.1
pyflakes~=3.2.0
pylint~=3.0.3
setuptools~=69.0.3
pylint~=3.3.4
setuptools~=75.8.0
allowlist_externals =
/bin/sh
/usr/bin/sh
Expand Down

0 comments on commit 7f5c9a4

Please sign in to comment.