Skip to content

Commit 648ee85

Browse files
Merge main into CI workflow hardening — pick up #311 CI/toolchain fixes
2 parents dac8e1e + 86055f1 commit 648ee85

3 files changed

Lines changed: 32 additions & 27 deletions

File tree

.github/workflows/semgrep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
semgrep:
1818
name: Scan
19-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-24.04
2020
container:
2121
image: returntocorp/semgrep:1.166.0
2222
if: (github.actor != 'dependabot[bot]')

.github/workflows/unit-tests.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python-version: ['3.9', '3.10', '3.11']
11+
python-version: ['3.12', '3.13', '3.14']
1212
steps:
1313
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
1414
- name: Set up Python ${{ matrix.python-version }}
@@ -18,7 +18,7 @@ jobs:
1818
- name: Install dependencies
1919
run: |
2020
python -m pip install --upgrade pip
21-
pip install pytest
21+
pip install pytest "setuptools<81"
2222
pip install -r requirements.txt
2323
- name: Ensure Config
2424
run: cp config.json.sample config.json
@@ -28,6 +28,11 @@ jobs:
2828
run: |
2929
pip install -r Access/access_modules/requirements.txt --no-cache-dir --ignore-installed
3030
- name: Lint code base
31-
run: python -m pylama Access/accessrequest_helper.py scripts bootprocess
31+
run: |
32+
pip install "setuptools<81"
33+
python -m pylama Access/accessrequest_helper.py scripts bootprocess
3234
- name: Test with pytest
33-
run: python -m pytest -v --cov --disable-warnings
35+
# pylama ships a pytest plugin with the removed pytest_collect_file(path,...)
36+
# signature that pytest 9 rejects. Linting runs as its own step, so disable
37+
# the redundant pytest integration here.
38+
run: python -m pytest -v --cov --disable-warnings -p no:pylama

requirements.txt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ certifi==2024.7.4
1212
cffi==2.0.0
1313
chardet==3.0.4
1414
configparser==5.0.1
15-
cryptography==46.0.5
15+
cryptography==49.0.0
1616
decorator==4.4.2
1717
defusedxml==0.7.1
1818
Deprecated==1.2.10
@@ -40,11 +40,11 @@ Jinja2==3.1.4
4040
jmespath==0.10.0
4141
Markdown==3.3.3
4242
MarkupSafe==2.1.5
43-
msgpack==1.0.0
43+
msgpack==1.2.1
4444
ndg-httpsclient==0.5.1
4545
oauth2client==4.1.3
4646
oauthlib==3.1.0
47-
packaging==21.3
47+
packaging==24.2
4848
paramiko==3.4.0
4949
parso==0.7.1
5050
pathlib2==2.3.5
@@ -57,13 +57,13 @@ ptyprocess==0.6.0
5757
pyasn1==0.6.3
5858
pyasn1-modules==0.4.2
5959
pycparser==2.20
60-
pyflakes==3.0.0
60+
pyflakes==3.4.0
6161
PyGithub==1.56
6262
Pygments==2.15.0
63-
PyJWT==2.12.0
63+
PyJWT==2.13.0
6464
PyMySQL==1.1.1
6565
PyNaCl==1.5.0
66-
pyOpenSSL==26.0.0
66+
pyOpenSSL==26.3.0
6767
pyparsing==2.4.7
6868
python-dateutil==2.8.1
6969
python-Levenshtein==0.12.0
@@ -84,17 +84,17 @@ soupsieve==2.0.1
8484
sqlparse==0.5.1
8585
traitlets==5.0.5
8686
uritemplate==3.0.1
87-
urllib3==2.6.3
87+
urllib3==2.7.0
8888
wcwidth==0.2.5
8989
zipp==3.19.1
9090
selenium==4.23.1
9191
pyotp==2.7.0
9292
attrs==21.3.0
93-
pytest==7.2.0
94-
pytest-bdd==6.1.1
95-
pytest-cov==4.0.0
96-
pytest-django==4.5.2
97-
pytest-mock==3.10.0
93+
pytest==9.1.1
94+
pytest-bdd==7.3.0
95+
pytest-cov==7.1.0
96+
pytest-django==4.12.0
97+
pytest-mock==3.15.1
9898
pylama==8.4.1
9999
semgrep==1.85.0
100100
mysqlclient==2.1.1
@@ -104,18 +104,18 @@ sqlalchemy==1.4.45
104104
redis==4.4.4
105105
celery==5.2.7
106106
django-stubs==1.14.0
107-
pycodestyle==2.10.0
108-
pylint==2.16.2
109-
pylint-django==2.5.3
110-
pylint-plugin-utils==0.7
107+
pycodestyle==2.14.0
108+
pylint==4.0.6
109+
pylint-django==2.8.0
110+
pylint-plugin-utils==0.9.0
111111
mccabe==0.7.0
112-
radon==5.1.0
113-
eradicate==2.1.0
114-
mypy==1.0.0
115-
mypy-extensions==1.0.0
116-
vulture==2.7
112+
radon==6.0.1
113+
eradicate==3.0.1
114+
mypy==2.3.0
115+
mypy-extensions==1.1.0
116+
vulture==2.16
117117
django-cid==2.3
118-
flake8==6.0.0
118+
flake8==7.3.0
119119
django-session-timeout==0.1.0
120120
django-axes==5.41.1
121121
jsonschema==4.17.3

0 commit comments

Comments
 (0)