Skip to content

Commit 2b451bd

Browse files
chore: upgrade python version
1 parent 8cba004 commit 2b451bd

16 files changed

+484
-739
lines changed

.github/workflows/check-reserved-keywords.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: setup python
1616
uses: actions/setup-python@v2
1717
with:
18-
python-version: 3.8
18+
python-version: 3.12
1919

2020
- name: Install pip
2121
run: pip install -r requirements/pip.txt

.github/workflows/ci2.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [ubuntu-20.04]
18-
python-version: ['3.8']
18+
python-version: ['3.12']
1919
toxenv: [django42, quality, docs, pii_check]
2020
permissions:
2121
# Gives the action the necessary permissions for publishing new
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Report coverage
4848
id: coverage_comment
49-
if: matrix.python-version == '3.8' && matrix.toxenv == 'django42'
49+
if: matrix.python-version == '3.12' && matrix.toxenv == 'django42'
5050
uses: py-cov-action/python-coverage-comment-action@v3
5151
with:
5252
GITHUB_TOKEN: ${{ github.token }}

.github/workflows/pypi-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: setup python
1616
uses: actions/setup-python@v2
1717
with:
18-
python-version: 3.8
18+
python-version: 3.12
1919

2020
- name: Install pip
2121
run: pip install -r requirements/pip.txt

requirements/base.txt

Lines changed: 42 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.8
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# make upgrade
@@ -11,29 +11,21 @@ asgiref==3.7.2
1111
# -r requirements/base.in
1212
# django
1313
# django-cors-headers
14-
async-timeout==4.0.3
15-
# via redis
16-
attrs==23.2.0
14+
attrs==24.2.0
1715
# via -r requirements/base.in
1816
backoff==2.2.1
1917
# via segment-analytics-python
20-
backports-zoneinfo[tzdata]==0.2.1
21-
# via
22-
# celery
23-
# django
24-
# djangorestframework
25-
# kombu
26-
billiard==4.2.0
18+
billiard==4.2.1
2719
# via celery
2820
celery[redis]==5.4.0
2921
# via -r requirements/base.in
30-
certifi==2024.6.2
22+
certifi==2024.8.30
3123
# via requests
32-
cffi==1.16.0
24+
cffi==1.17.1
3325
# via
3426
# cryptography
3527
# pynacl
36-
charset-normalizer==3.3.2
28+
charset-normalizer==3.4.0
3729
# via requests
3830
click==8.1.7
3931
# via
@@ -56,7 +48,7 @@ coreapi==2.3.3
5648
# openapi-codec
5749
coreschema==0.0.4
5850
# via coreapi
59-
cryptography==42.0.8
51+
cryptography==43.0.3
6052
# via
6153
# pyjwt
6254
# social-auth-core
@@ -66,7 +58,7 @@ defusedxml==0.8.0rc2
6658
# via
6759
# python3-openid
6860
# social-auth-core
69-
django==4.2.13
61+
django==4.2.16
7062
# via
7163
# -c requirements/common_constraints.txt
7264
# -c requirements/constraints.txt
@@ -83,7 +75,7 @@ django==4.2.13
8375
# edx-drf-extensions
8476
# openedx-filters
8577
# social-auth-app-django
86-
django-cors-headers==4.4.0
78+
django-cors-headers==4.6.0
8779
# via -r requirements/base.in
8880
django-crum==0.7.9
8981
# via edx-django-utils
@@ -102,78 +94,78 @@ djangorestframework==3.15.2
10294
# django-rest-swagger
10395
# drf-jwt
10496
# edx-drf-extensions
105-
dnspython==2.6.1
97+
dnspython==2.7.0
10698
# via pymongo
10799
drf-jwt==1.19.2
108100
# via edx-drf-extensions
109-
edx-auth-backends==4.3.0
101+
edx-auth-backends==4.4.0
110102
# via -r requirements/base.in
111103
edx-braze-client==0.2.5
112104
# via -r requirements/base.in
113105
edx-django-release-util==1.4.0
114106
# via -r requirements/base.in
115-
edx-django-utils==5.14.2
107+
edx-django-utils==7.0.0
116108
# via
117109
# -r requirements/base.in
118110
# edx-drf-extensions
119111
# edx-rest-api-client
120-
edx-drf-extensions==10.3.0
112+
edx-drf-extensions==10.5.0
121113
# via -r requirements/base.in
122-
edx-opaque-keys==2.10.0
114+
edx-opaque-keys==2.11.0
123115
# via edx-drf-extensions
124-
edx-rest-api-client==5.7.1
116+
edx-rest-api-client==6.0.0
125117
# via -r requirements/base.in
126-
idna==3.7
118+
idna==3.10
127119
# via requests
128120
itypes==1.2.0
129121
# via coreapi
130122
jinja2==3.1.4
131123
# via coreschema
132-
kombu==5.3.7
124+
kombu==5.4.2
133125
# via celery
134-
markupsafe==2.1.5
126+
markupsafe==3.0.2
135127
# via
136128
# jinja2
137129
# werkzeug
138-
marshmallow==3.21.3
130+
marshmallow==3.23.0
139131
# via
140132
# commercetools
141133
# marshmallow-enum
142134
marshmallow-enum==1.5.1
143135
# via commercetools
144-
mysqlclient==2.2.4
136+
mysqlclient==2.2.5
145137
# via -r requirements/base.in
146-
newrelic==9.11.0
138+
newrelic==10.2.0
147139
# via edx-django-utils
148140
oauthlib==3.2.2
149141
# via
150142
# requests-oauthlib
151143
# social-auth-core
152144
openapi-codec==1.3.2
153145
# via django-rest-swagger
154-
openedx-filters==1.9.0
146+
openedx-filters==1.11.0
155147
# via -r requirements/base.in
156148
packaging==24.1
157149
# via marshmallow
158-
pbr==6.0.0
150+
pbr==6.1.0
159151
# via stevedore
160-
pillow==10.3.0
152+
pillow==11.0.0
161153
# via -r requirements/base.in
162-
prompt-toolkit==3.0.47
154+
prompt-toolkit==3.0.48
163155
# via click-repl
164-
psutil==6.0.0
156+
psutil==6.1.0
165157
# via edx-django-utils
166158
pycparser==2.22
167159
# via cffi
168-
pyjwt[crypto]==2.8.0
160+
pyjwt[crypto]==2.9.0
169161
# via
170162
# drf-jwt
171163
# edx-auth-backends
172164
# edx-drf-extensions
173165
# edx-rest-api-client
174166
# segment-analytics-python
175167
# social-auth-core
176-
pymongo==4.7.3
168+
pymongo==4.10.1
177169
# via edx-opaque-keys
178170
pynacl==1.5.0
179171
# via edx-django-utils
@@ -184,13 +176,13 @@ python-dateutil==2.9.0.post0
184176
# segment-analytics-python
185177
python3-openid==3.2.0
186178
# via social-auth-core
187-
pytz==2024.1
179+
pytz==2024.2
188180
# via
189181
# -r requirements/base.in
190182
# commercetools
191-
pyyaml==6.0.1
183+
pyyaml==6.0.2
192184
# via edx-django-release-util
193-
redis==5.0.7
185+
redis==5.2.0
194186
# via celery
195187
requests==2.32.3
196188
# via
@@ -201,7 +193,6 @@ requests==2.32.3
201193
# requests-mock
202194
# requests-oauthlib
203195
# segment-analytics-python
204-
# slumber
205196
# social-auth-core
206197
# stripe
207198
requests-mock==1.12.1
@@ -210,46 +201,42 @@ requests-oauthlib==2.0.0
210201
# via
211202
# commercetools
212203
# social-auth-core
213-
segment-analytics-python==2.3.2
204+
segment-analytics-python==2.3.3
214205
# via -r requirements/base.in
215206
semantic-version==2.10.0
216207
# via edx-drf-extensions
217-
simplejson==3.19.2
208+
simplejson==3.19.3
218209
# via django-rest-swagger
219210
six==1.16.0
220211
# via
221212
# edx-auth-backends
222213
# edx-django-release-util
223214
# python-dateutil
224-
slumber==0.7.1
225-
# via edx-rest-api-client
226-
social-auth-app-django==5.4.1
215+
social-auth-app-django==5.4.2
227216
# via edx-auth-backends
228217
social-auth-core==4.5.4
229218
# via
230219
# edx-auth-backends
231220
# social-auth-app-django
232-
sqlparse==0.5.0
221+
sqlparse==0.5.1
233222
# via django
234-
stevedore==5.2.0
223+
stevedore==5.3.0
235224
# via
236225
# edx-django-utils
237226
# edx-opaque-keys
238-
stripe==10.0.0
227+
stripe==11.2.0
239228
# via -r requirements/base.in
240229
typing-extensions==4.12.2
241230
# via
242-
# asgiref
243231
# edx-opaque-keys
244-
# kombu
245232
# stripe
246-
tzdata==2024.1
233+
tzdata==2024.2
247234
# via
248-
# backports-zoneinfo
249235
# celery
236+
# kombu
250237
uritemplate==4.1.1
251238
# via coreapi
252-
urllib3==2.2.2
239+
urllib3==2.2.3
253240
# via requests
254241
vine==5.1.0
255242
# via
@@ -258,9 +245,9 @@ vine==5.1.0
258245
# kombu
259246
wcwidth==0.2.13
260247
# via prompt-toolkit
261-
webob==1.8.7
248+
webob==1.8.9
262249
# via commercetools
263-
werkzeug==3.0.3
250+
werkzeug==3.0.6
264251
# via commercetools
265252
wrapt==1.16.0
266253
# via commercetools

requirements/ci.txt

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,34 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.8
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# make upgrade
66
#
7-
cachetools==5.3.3
7+
cachetools==5.5.0
88
# via tox
99
chardet==5.2.0
1010
# via tox
1111
colorama==0.4.6
1212
# via tox
13-
distlib==0.3.8
13+
distlib==0.3.9
1414
# via virtualenv
15-
filelock==3.15.4
15+
filelock==3.16.1
1616
# via
1717
# tox
1818
# virtualenv
1919
packaging==24.1
2020
# via
2121
# pyproject-api
2222
# tox
23-
platformdirs==4.2.2
23+
platformdirs==4.3.6
2424
# via
2525
# tox
2626
# virtualenv
2727
pluggy==1.5.0
2828
# via tox
29-
pyproject-api==1.7.1
29+
pyproject-api==1.8.0
3030
# via tox
31-
tomli==2.0.1
32-
# via
33-
# pyproject-api
34-
# tox
35-
tox==4.15.1
31+
tox==4.23.2
3632
# via -r requirements/ci.in
37-
virtualenv==20.26.3
33+
virtualenv==20.27.1
3834
# via tox

requirements/common_constraints.txt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,19 @@ Django<5.0
1818

1919
# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
2020
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
21+
# See https://github.com/openedx/edx-platform/issues/35126 for more info
2122
elasticsearch<7.14.0
2223

2324
# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
2425
django-simple-history==3.0.0
2526

26-
# opentelemetry requires version 6.x at the moment:
27-
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
28-
# Normally this could be added as a constraint in edx-django-utils, where we're
29-
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
30-
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
31-
# So we need to pin it globally, for now.
32-
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
33-
importlib-metadata<7
27+
# Cause: https://github.com/openedx/event-tracking/pull/290
28+
# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
29+
# We will pin event-tracking to do not break existing installations
30+
# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
31+
# has been resolved and edx-platform is running with pymongo>=4.4.0
32+
event-tracking<2.4.1
33+
34+
# Cause: https://github.com/openedx/edx-lint/issues/458
35+
# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
36+
pip<24.3

0 commit comments

Comments
 (0)