Skip to content

Commit 5f06e4e

Browse files
author
Feanil Patel
authored
Merge pull request #181 from openedx/jenkins/add-python312-support-f36e7e6
feat: add python 3.11 support
2 parents 5d4f511 + b90d3c0 commit 5f06e4e

12 files changed

Lines changed: 75 additions & 44 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [ubuntu-20.04]
16-
python-version: ['3.8']
17-
toxenv: [quality, django32, django40, django42]
16+
python-version:
17+
- '3.8'
18+
- '3.11'
19+
toxenv: [quality, django42]
1820

1921
steps:
2022
- name: checkout repo

CHANGELOG.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ Change Log
1414
Unreleased
1515
**********
1616

17+
3.6.0
18+
*****
19+
20+
Added
21+
=====
22+
23+
* feat: support for python3.12.
24+
1725
3.5.0
1826
*****
1927

djpyfs/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# pylint: disable=django-not-configured
22
"""init file"""
3-
__version__ = '3.5.0'
3+
__version__ = '3.6.0'

requirements/ci.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ filelock==3.13.1
1616
# via
1717
# tox
1818
# virtualenv
19-
packaging==23.2
19+
packaging==24.0
2020
# via
2121
# pyproject-api
2222
# tox
@@ -32,7 +32,7 @@ tomli==2.0.1
3232
# via
3333
# pyproject-api
3434
# tox
35-
tox==4.13.0
35+
tox==4.14.1
3636
# via -r requirements/ci.in
3737
virtualenv==20.25.1
3838
# via tox

requirements/common_constraints.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,12 @@ elasticsearch<7.14.0
2121

2222
# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
2323
django-simple-history==3.0.0
24+
25+
# opentelemetry requires version 6.x at the moment:
26+
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
27+
# Normally this could be added as a constraint in edx-django-utils, where we're
28+
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
29+
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
30+
# So we need to pin it globally, for now.
31+
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
32+
importlib-metadata<7

requirements/constraints.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@
1414
# moto>5.0.0 contains breaking changes with mock_s3 testing
1515
# needs to fixed separately
1616
moto<5.0.0
17+
18+
backports.zoneinfo;python_version<"3.9"

requirements/dev.txt

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ appdirs==1.4.4
88
# via fs
99
asgiref==3.7.2
1010
# via django
11-
backports-zoneinfo==0.2.1
12-
# via django
13-
boto3==1.34.54
11+
backports-zoneinfo==0.2.1 ; python_version < "3.9"
12+
# via
13+
# -c requirements/constraints.txt
14+
# django
15+
boto3==1.34.61
1416
# via fs-s3fs
15-
botocore==1.34.54
17+
botocore==1.34.61
1618
# via
1719
# boto3
1820
# s3transfer
@@ -28,7 +30,7 @@ colorama==0.4.6
2830
# via tox
2931
distlib==0.3.8
3032
# via virtualenv
31-
django==4.2.10
33+
django==4.2.11
3234
# via
3335
# -c requirements/common_constraints.txt
3436
# -r requirements/base.in
@@ -42,18 +44,20 @@ fs==2.4.16
4244
# fs-s3fs
4345
fs-s3fs==1.1.1
4446
# via -r requirements/base.in
45-
importlib-metadata==7.0.1
46-
# via build
47+
importlib-metadata==6.11.0
48+
# via
49+
# -c requirements/common_constraints.txt
50+
# build
4751
jmespath==1.0.1
4852
# via
4953
# boto3
5054
# botocore
51-
packaging==23.2
55+
packaging==24.0
5256
# via
5357
# build
5458
# pyproject-api
5559
# tox
56-
pip-tools==7.4.0
60+
pip-tools==7.4.1
5761
# via -r requirements/dev.in
5862
platformdirs==4.2.0
5963
# via
@@ -85,17 +89,17 @@ tomli==2.0.1
8589
# pyproject-api
8690
# pyproject-hooks
8791
# tox
88-
tox==4.13.0
92+
tox==4.14.1
8993
# via -r requirements/dev.in
9094
typing-extensions==4.10.0
9195
# via asgiref
9296
urllib3==1.26.18
9397
# via botocore
9498
virtualenv==20.25.1
9599
# via tox
96-
wheel==0.42.0
100+
wheel==0.43.0
97101
# via pip-tools
98-
zipp==3.17.0
102+
zipp==3.18.0
99103
# via importlib-metadata
100104

101105
# The following packages are considered to be unsafe in a requirements file:

requirements/pip-tools.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ build==1.1.1
88
# via pip-tools
99
click==8.1.7
1010
# via pip-tools
11-
importlib-metadata==7.0.1
12-
# via build
13-
packaging==23.2
11+
importlib-metadata==6.11.0
12+
# via
13+
# -c requirements/common_constraints.txt
14+
# build
15+
packaging==24.0
1416
# via build
15-
pip-tools==7.4.0
17+
pip-tools==7.4.1
1618
# via -r requirements/pip-tools.in
1719
pyproject-hooks==1.0.0
1820
# via
@@ -23,9 +25,9 @@ tomli==2.0.1
2325
# build
2426
# pip-tools
2527
# pyproject-hooks
26-
wheel==0.42.0
28+
wheel==0.43.0
2729
# via pip-tools
28-
zipp==3.17.0
30+
zipp==3.18.0
2931
# via importlib-metadata
3032

3133
# The following packages are considered to be unsafe in a requirements file:

requirements/pip.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --allow-unsafe --output-file=requirements/pip.txt requirements/pip.in
66
#
7-
wheel==0.42.0
7+
wheel==0.43.0
88
# via -r requirements/pip.in
99

1010
# The following packages are considered to be unsafe in a requirements file:

requirements/quality.txt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@ astroid==3.1.0
1616
# via
1717
# pylint
1818
# pylint-celery
19-
backports-zoneinfo==0.2.1
19+
backports-zoneinfo==0.2.1 ; python_version < "3.9"
2020
# via
21+
# -c requirements/constraints.txt
2122
# -r requirements/test.txt
2223
# django
23-
boto3==1.34.54
24+
boto3==1.34.61
2425
# via
2526
# -r requirements/test.txt
2627
# fs-s3fs
2728
# moto
28-
botocore==1.34.54
29+
botocore==1.34.61
2930
# via
3031
# -r requirements/test.txt
3132
# boto3
@@ -63,7 +64,7 @@ cryptography==42.0.5
6364
# secretstorage
6465
dill==0.3.8
6566
# via pylint
66-
django==4.2.10
67+
django==4.2.11
6768
# via
6869
# -c requirements/common_constraints.txt
6970
# -r requirements/test.txt
@@ -85,11 +86,12 @@ idna==3.6
8586
# via
8687
# -r requirements/test.txt
8788
# requests
88-
importlib-metadata==7.0.1
89+
importlib-metadata==6.11.0
8990
# via
91+
# -c requirements/common_constraints.txt
9092
# keyring
9193
# twine
92-
importlib-resources==6.1.2
94+
importlib-resources==6.3.0
9395
# via keyring
9496
iniconfig==2.0.0
9597
# via
@@ -138,7 +140,7 @@ moto==4.2.14
138140
# -r requirements/test.txt
139141
nh3==0.2.15
140142
# via readme-renderer
141-
packaging==23.2
143+
packaging==24.0
142144
# via
143145
# -r requirements/test.txt
144146
# pytest
@@ -180,7 +182,7 @@ pylint-plugin-utils==0.8.2
180182
# pylint-django
181183
pypng==0.20220715.0
182184
# via -r requirements/test.txt
183-
pytest==8.1.0
185+
pytest==8.1.1
184186
# via
185187
# -r requirements/test.txt
186188
# pytest-cov
@@ -275,7 +277,7 @@ xmltodict==0.13.0
275277
# via
276278
# -r requirements/test.txt
277279
# moto
278-
zipp==3.17.0
280+
zipp==3.18.0
279281
# via
280282
# importlib-metadata
281283
# importlib-resources

0 commit comments

Comments
 (0)