FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Bump all the dependencies · getpatchwork/patchwork@de04e0a · GitHub

/ patchwork Public

Commit de04e0a

Browse files
stephenfin
committed
Bump all the dependencies
We also change our testing matrix so that we only test the upper and lower bounds of supported Python releases. This should ease pressure on CI somewhat. We also switch from the deprecated psycopg2 to psycopg (which actually corresponds to v3 now). Changes to the source were auto-generated with django-upgrade. Signed-off-by: Stephen Finucane <stephen@that.guru>
1 parent 4a7c05b commit de04e0a

20 files changed

Lines changed: 184 additions & 294 deletions

‎.github/workflows/ci.yaml‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout source code
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v6
1616
- name: Set up Python
17-
uses: actions/setup-python@v5
17+
uses: actions/setup-python@v6
1818
with:
19-
python-version: "3.13"
19+
python-version: "3.14"
2020
cache: 'pip'
2121
- name: Set up Go
22-
uses: actions/setup-go@v5
22+
uses: actions/setup-go@v6
2323
with:
24-
go-version: "1.21"
24+
go-version: "1.26"
2525
- name: Install dependencies
2626
run: python -m pip install tox
2727
- name: Run tox
@@ -33,7 +33,7 @@ jobs:
3333
matrix:
3434
# NOTE: If you add a version here, don't forget to update the
3535
# '[gh-actions]' section in tox.ini
36-
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
36+
python: ["3.11", "3.14"]
3737
db: [postgres, mysql, sqlite3]
3838
env:
3939
DATABASE_TYPE: "${{ matrix.db }}"
@@ -44,7 +44,7 @@ jobs:
4444
MYSQL_ROOT_PASSWORD: root-${{ github.run_id }}
4545
services:
4646
postgres:
47-
image: postgres:latest
47+
image: postgres:17
4848
env:
4949
POSTGRES_DB: ${{ env.DATABASE_NAME }}
5050
POSTGRES_PASSWORD: ${{ env.DATABASE_PASSWORD }}
@@ -57,7 +57,7 @@ jobs:
5757
--health-timeout 5s
5858
--health-retries 5
5959
mysql:
60-
image: mysql:latest
60+
image: mysql:8.4
6161
env:
6262
MYSQL_DATABASE: ${{ env.DATABASE_NAME }}
6363
MYSQL_USER: ${{ env.DATABASE_USER }}
@@ -72,9 +72,9 @@ jobs:
7272
--health-retries 5
7373
steps:
7474
- name: Checkout source code
75-
uses: actions/checkout@v4
75+
uses: actions/checkout@v6
7676
- name: Set up Python ${{ matrix.python }}
77-
uses: actions/setup-python@v5
77+
uses: actions/setup-python@v6
7878
with:
7979
python-version: ${{ matrix.python }}
8080
cache: 'pip'
@@ -104,20 +104,22 @@ jobs:
104104
runs-on: ubuntu-latest
105105
steps:
106106
- name: Checkout source code
107-
uses: actions/checkout@v4
107+
uses: actions/checkout@v6
108108
with:
109109
fetch-depth: 0
110+
- name: Fetch all branches
111+
run: git fetch --all
110112
- name: Set up Python
111-
uses: actions/setup-python@v5
113+
uses: actions/setup-python@v6
112114
with:
113-
python-version: "3.13"
115+
python-version: "3.14"
114116
cache: 'pip'
115117
- name: Install dependencies
116118
run: python -m pip install tox
117119
- name: Build docs (via tox)
118120
run: tox -e docs
119121
- name: Archive build results
120-
uses: actions/upload-artifact@v4
122+
uses: actions/upload-artifact@v7
121123
with:
122124
name: html-docs-build
123125
path: docs/_build/html
@@ -132,13 +134,13 @@ jobs:
132134
COMPOSE_FILE: ${{ matrix.db == 'mysql' && 'docker-compose.yml' || (matrix.db == 'postgres' && 'docker-compose-pg.yml') || 'docker-compose-sqlite3.yml' }}
133135
steps:
134136
- name: Checkout source code
135-
uses: actions/checkout@v4
137+
uses: actions/checkout@v6
136138
with:
137139
fetch-depth: 0
138140
- name: Set up Python
139-
uses: actions/setup-python@v5
141+
uses: actions/setup-python@v6
140142
with:
141-
python-version: "3.13"
143+
python-version: "3.14"
142144
cache: 'pip'
143145
- name: Build docker-compose service
144146
run: |
@@ -151,7 +153,7 @@ jobs:
151153
{ echo patchwork; echo patchwork; } | \
152154
docker compose run -T --rm web \
153155
python manage.py changepassword patchwork
154-
# FIXME(stephenfin): Re-enable this once dbbackup supports Django 4.0
156+
# FIXME(stephenfin): Re-enable this once we've update configuration accordingly
155157
# - name: Test dbbackup/dbrestore
156158
# run: |
157159
# docker compose run -T --rm web python manage.py dbbackup

‎docker-compose-pg.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
db:
4-
image: postgres:latest
4+
image: postgres:17
55
volumes:
66
- ./tools/docker/db/postdata:/var/lib/postgresql/data
77
environment:

‎manage.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
'DJANGO_SETTINGS_MODULE', 'patchwork.settings.production'
88
)
99

10-
import django
11-
12-
if django.VERSION < (3, 2):
13-
raise Exception('Patchwork requires Django 3.2 or greater')
14-
1510
from django.core.management import execute_from_command_line
1611

1712
execute_from_command_line(sys.argv)

‎patchwork/admin.py‎

Lines changed: 24 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -44,48 +44,42 @@ class DelegationRuleInline(admin.TabularInline):
4444
fields = ('path', 'user', 'priority')
4545

4646

47+
@admin.register(Project)
4748
class ProjectAdmin(admin.ModelAdmin):
4849
list_display = ('name', 'linkname', 'listid', 'listemail')
4950
inlines = [
5051
DelegationRuleInline,
5152
]
5253

5354

54-
admin.site.register(Project, ProjectAdmin)
55-
56-
55+
@admin.register(Person)
5756
class PersonAdmin(admin.ModelAdmin):
5857
list_display = ('__str__', 'has_account')
5958
search_fields = ('name', 'email')
6059

60+
@admin.display(
61+
description='Account',
62+
boolean=True,
63+
ordering='user',
64+
)
6165
def has_account(self, person):
6266
return bool(person.user)
6367

64-
has_account.boolean = True
65-
has_account.admin_order_field = 'user'
66-
has_account.short_description = 'Account'
67-
68-
69-
admin.site.register(Person, PersonAdmin)
70-
7168

69+
@admin.register(State)
7270
class StateAdmin(admin.ModelAdmin):
7371
list_display = ('name', 'action_required')
7472

7573

76-
admin.site.register(State, StateAdmin)
77-
78-
74+
@admin.register(Cover)
7975
class CoverAdmin(admin.ModelAdmin):
8076
list_display = ('name', 'submitter', 'project', 'date')
8177
list_filter = ('project',)
8278
search_fields = ('name', 'submitter__name', 'submitter__email')
8379
date_hierarchy = 'date'
8480

8581

86-
admin.site.register(Cover, CoverAdmin)
87-
88-
82+
@admin.register(Patch)
8983
class PatchAdmin(admin.ModelAdmin):
9084
list_display = (
9185
'name',
@@ -101,40 +95,35 @@ class PatchAdmin(admin.ModelAdmin):
10195
search_fields = ('name', 'submitter__name', 'submitter__email')
10296
date_hierarchy = 'date'
10397

98+
@admin.display(
99+
description='Pull',
100+
boolean=True,
101+
ordering='pull_url',
102+
)
104103
def is_pull_request(self, patch):
105104
return bool(patch.pull_url)
106105

107-
is_pull_request.boolean = True
108-
is_pull_request.admin_order_field = 'pull_url'
109-
is_pull_request.short_description = 'Pull'
110-
111-
112-
admin.site.register(Patch, PatchAdmin)
113-
114106

107+
@admin.register(CoverComment)
115108
class CoverCommentAdmin(admin.ModelAdmin):
116109
list_display = ('cover', 'submitter', 'date')
117110
search_fields = ('cover__name', 'submitter__name', 'submitter__email')
118111
date_hierarchy = 'date'
119112

120113

121-
admin.site.register(CoverComment, CoverCommentAdmin)
122-
123-
114+
@admin.register(PatchComment)
124115
class PatchCommentAdmin(admin.ModelAdmin):
125116
list_display = ('patch', 'submitter', 'date')
126117
search_fields = ('patch__name', 'submitter__name', 'submitter__email')
127118
date_hierarchy = 'date'
128119

129120

130-
admin.site.register(PatchComment, PatchCommentAdmin)
131-
132-
133121
class PatchInline(admin.StackedInline):
134122
model = Patch
135123
extra = 0
136124

137125

126+
@admin.register(Series)
138127
class SeriesAdmin(admin.ModelAdmin):
139128
list_display = (
140129
'name',
@@ -154,11 +143,10 @@ class SeriesAdmin(admin.ModelAdmin):
154143
filter_horizontal = ('dependencies',)
155144
inlines = (PatchInline,)
156145

146+
@admin.display(boolean=True)
157147
def received_all(self, series):
158148
return series.received_all
159149

160-
received_all.boolean = True
161-
162150
def get_queryset(self, request):
163151
qs = super(SeriesAdmin, self).get_queryset(request)
164152
return qs.prefetch_related(
@@ -171,16 +159,12 @@ def get_queryset(self, request):
171159
)
172160

173161

174-
admin.site.register(Series, SeriesAdmin)
175-
176-
162+
@admin.register(SeriesReference)
177163
class SeriesReferenceAdmin(admin.ModelAdmin):
178164
model = SeriesReference
179165

180166

181-
admin.site.register(SeriesReference, SeriesReferenceAdmin)
182-
183-
167+
@admin.register(Check)
184168
class CheckAdmin(admin.ModelAdmin):
185169
list_display = (
186170
'patch',
@@ -195,27 +179,18 @@ class CheckAdmin(admin.ModelAdmin):
195179
date_hierarchy = 'date'
196180

197181

198-
admin.site.register(Check, CheckAdmin)
199-
200-
182+
@admin.register(Bundle)
201183
class BundleAdmin(admin.ModelAdmin):
202184
list_display = ('name', 'owner', 'project', 'public')
203185
list_filter = ('public', 'project')
204186
search_fields = ('name', 'owner')
205187

206188

207-
admin.site.register(Bundle, BundleAdmin)
208-
209-
189+
@admin.register(Tag)
210190
class TagAdmin(admin.ModelAdmin):
211191
list_display = ('name',)
212192

213193

214-
admin.site.register(Tag, TagAdmin)
215-
216-
194+
@admin.register(PatchRelation)
217195
class PatchRelationAdmin(admin.ModelAdmin):
218196
model = PatchRelation
219-
220-
221-
admin.site.register(PatchRelation, PatchRelationAdmin)

‎patchwork/forms.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#
44
# SPDX-License-Identifier: GPL-2.0-or-later
55

6-
import django
76
from django.contrib.auth.models import User
87
from django import forms
98
from django.forms import renderers
@@ -179,10 +178,7 @@ def _get_choices(self):
179178
choices.append(self.no_change_choice)
180179
return choices
181180

182-
if django.VERSION >= (5, 0):
183-
choices = property(_get_choices, forms.ChoiceField.choices.fset)
184-
else:
185-
choices = property(_get_choices, forms.ChoiceField._set_choices)
181+
choices = property(_get_choices, forms.ChoiceField.choices.fset)
186182

187183
def is_no_change(self, value):
188184
return value == self.no_change_choice[0]

‎patchwork/settings/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
if os.getenv('DATABASE_TYPE') == 'postgres':
120120
DATABASES = {
121121
'default': {
122-
'ENGINE': 'django.db.backends.postgresql_psycopg2',
122+
'ENGINE': 'django.db.backends.postgresql',
123123
'HOST': os.environ.get('DATABASE_HOST', 'localhost'),
124124
'PORT': os.environ.get('DATABASE_PORT', ''),
125125
'NAME': os.environ.get('DATABASE_NAME', 'patchwork'),

‎patchwork/settings/production.example.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@
5656

5757
STATIC_ROOT = os.environ.get('STATIC_ROOT', '/srv/patchwork/htdocs/static')
5858

59-
STATICFILES_STORAGE = (
60-
'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
61-
)
59+
STORAGES = {
60+
'default': {
61+
'BACKEND': 'django.core.files.storage.FileSystemStorage',
62+
},
63+
'staticfiles': {
64+
'BACKEND': 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage',
65+
},
66+
}

‎patchwork/tests/views/test_bundles.py‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,14 +331,18 @@ def _get_auth_string(user):
331331

332332
# Check we can view as owner
333333
auth_string = _get_auth_string(self.user)
334-
response = self.client.get(self.url, HTTP_AUTHORIZATION=auth_string)
334+
response = self.client.get(
335+
self.url, headers={'authorization': auth_string}
336+
)
335337

336338
self.assertEqual(response.status_code, 200)
337339
self.assertContains(response, self.patches[0].name)
338340

339341
# Check we can't view as another user
340342
auth_string = _get_auth_string(self.other_user)
341-
response = self.client.get(self.url, HTTP_AUTHORIZATION=auth_string)
343+
response = self.client.get(
344+
self.url, headers={'authorization': auth_string}
345+
)
342346
self.assertEqual(response.status_code, 404)
343347

344348
def test_private_bundle_mbox_token_auth(self):
@@ -353,14 +357,18 @@ def _get_auth_string(user):
353357

354358
# Check we can view as owner
355359
auth_string = _get_auth_string(self.user)
356-
response = self.client.get(self.url, HTTP_AUTHORIZATION=auth_string)
360+
response = self.client.get(
361+
self.url, headers={'authorization': auth_string}
362+
)
357363

358364
self.assertEqual(response.status_code, 200)
359365
self.assertContains(response, self.patches[0].name)
360366

361367
# Check we can't view as another user
362368
auth_string = _get_auth_string(self.other_user)
363-
response = self.client.get(self.url, HTTP_AUTHORIZATION=auth_string)
369+
response = self.client.get(
370+
self.url, headers={'authorization': auth_string}
371+
)
364372
self.assertEqual(response.status_code, 404)
365373

366374

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL