Skip to content

Commit 96f7860

Browse files
committed
Upgraded to Python 3.11
1 parent d6dbf0c commit 96f7860

File tree

3 files changed

+29
-20
lines changed

3 files changed

+29
-20
lines changed

.github/workflows/tests.yml

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,56 @@ concurrency:
1313
permissions:
1414
contents: read
1515

16+
env:
17+
DJANGO_SETTINGS_MODULE: tracdjangoplugin.settings_tests
18+
PYTHONWARNINGS: >
19+
error,
20+
default:::passlib.utils,
21+
1622
jobs:
1723
noshadows:
18-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-24.04
1925
steps:
2026
- name: Checkout
2127
uses: actions/checkout@v4
2228
- uses: actions/setup-python@v5
2329
with:
24-
python-version: '3.8'
30+
python-version: '3.11'
2531
- run: pip install "tinycss2>=1.2.0"
2632
- run: python noshadows.py --tests
27-
env:
28-
PYTHONWARNINGS: error
2933

3034
tracdjangoplugin:
31-
runs-on: ubuntu-20.04
35+
runs-on: ubuntu-24.04
3236
steps:
3337
- name: Checkout
3438
uses: actions/checkout@v4
3539
- uses: actions/setup-python@v5
3640
with:
37-
python-version: '3.8'
41+
python-version: '3.11'
42+
- name: Install system package dependencies
43+
run: |
44+
sudo apt-get update
45+
sudo apt-get -y install subversion
3846
- name: Install requirements
3947
run: python -m pip install -r requirements.txt
4048
- name: Run tests
4149
run: python -m django test tracdjangoplugin.tests
42-
env:
43-
DJANGO_SETTINGS_MODULE: tracdjangoplugin.settings_tests
44-
PYTHONWARNINGS: error
4550

4651
traccheck:
47-
runs-on: ubuntu-20.04
52+
runs-on: ubuntu-24.04
4853
steps:
4954
- name: Checkout
5055
uses: actions/checkout@v4
5156
- uses: actions/setup-python@v5
5257
with:
53-
python-version: '3.8'
58+
python-version: '3.11'
59+
- name: Install system package dependencies
60+
run: |
61+
sudo apt-get update
62+
sudo apt-get -y install subversion
5463
- name: Install requirements
5564
run: python -m pip install -r requirements.txt
56-
- run: python traccheck.py lint trac-env/
57-
env:
58-
DJANGO_SETTINGS_MODULE: tracdjangoplugin.settings_tests
59-
PYTHONWARNINGS: error
60-
- run: python traccheck.py components --check .TRACFREEZE.txt trac-env/
61-
env:
62-
DJANGO_SETTINGS_MODULE: tracdjangoplugin.settings_tests
63-
PYTHONWARNINGS: error
65+
- name: Lint Trac configuration
66+
run: python traccheck.py lint trac-env/
67+
- name: Check frozen Trac components
68+
run: python traccheck.py components --check .TRACFREEZE.txt trac-env/

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# pull official base image
2-
FROM python:3.8-slim-bullseye
2+
FROM python:3.12-slim-bookworm
33

44
# set work directory
55
WORKDIR /code

requirements.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ psycopg2==2.9.9 --no-binary=psycopg2
55
Django==4.2.16
66
libsass==0.23.0
77

8+
# Optional Trac dependencies that make DeprecationWarning go away
9+
multipart==1.1.0
10+
passlib==1.7.4
11+
812
# Trac plugins
913
TracSpamFilter[dns,spambayes] @ svn+https://svn.edgewall.org/repos/trac/plugins/trunk/spam-filter@17766
1014
TracDragDrop @ svn+https://trac-hacks.org/svn/tracdragdropplugin/0.12@18635

0 commit comments

Comments
 (0)