Skip to content

Commit b79577c

Browse files
awais786awais786
committed
feat: Adding python3.11 and 3.12 support.
1 parent 767eeda commit b79577c

File tree

20 files changed

+180
-163
lines changed

20 files changed

+180
-163
lines changed

Diff for: ‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
strategy:
1515
matrix:
1616
os: [ubuntu-20.04]
17-
python-version: ['3.8']
18-
toxenv: [quality, docs, django32, django42]
17+
python-version: ['3.8', '3.11', '3.12']
18+
toxenv: [quality, docs, django42]
1919

2020
steps:
2121
- uses: actions/checkout@v2

Diff for: ‎CHANGELOG.rst

+6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ Change Log
1414
Unreleased
1515
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1616

17+
[1.8.0] - 2024-03-31
18+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
19+
20+
* Added python3.11 and 3.12 support. Dropped django32 support.
21+
22+
1723
[1.6.0] - 2024-01-31
1824
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1925

Diff for: ‎Makefile

+6-1
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,13 @@ docs: ## generate Sphinx HTML documentation, including API docs
3737
tox -e docs
3838
$(BROWSER) docs/_build/html/index.html
3939

40+
COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt
41+
.PHONY: $(COMMON_CONSTRAINTS_TXT)
42+
$(COMMON_CONSTRAINTS_TXT):
43+
wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)"
44+
4045
upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
41-
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
46+
upgrade: $(COMMON_CONSTRAINTS_TXT) # update the requirements/*.txt files with the latest packages satisfying requirements/*.in
4247
pip install -qr requirements/pip-tools.txt
4348
# Make sure to compile files after any other files they include!
4449
pip-compile --upgrade --allow-unsafe -o requirements/pip.txt requirements/pip.in

Diff for: ‎code_annotations/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Extensible tools for parsing annotations in codebases.
33
"""
44

5-
__version__ = '1.7.0'
5+
__version__ = '1.8.0'

Diff for: ‎code_annotations/cli.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def django_find_annotations(
111111
annotation_count, elapsed.total_seconds()
112112
))
113113

114-
except Exception as exc: # pylint: disable=broad-except
114+
except Exception as exc:
115115
click.echo(traceback.print_exc())
116116
fail(str(exc))
117117

@@ -169,7 +169,7 @@ def static_find_annotations(config_file, source_path, report_path, verbosity, li
169169

170170
click.echo(f"Search found {annotation_count} annotations in {elapsed}.")
171171

172-
except Exception as exc: # pylint: disable=broad-except
172+
except Exception as exc:
173173
click.echo(traceback.print_exc())
174174
fail(str(exc))
175175

@@ -212,6 +212,6 @@ def generate_docs(
212212

213213
elapsed = datetime.datetime.now() - start_time
214214
click.echo(f"Report rendered in {elapsed.total_seconds()} seconds.")
215-
except Exception as exc: # pylint: disable=broad-except
215+
except Exception as exc:
216216
click.echo(traceback.print_exc())
217217
fail(str(exc))

Diff for: ‎code_annotations/contrib/sphinx/extensions/featuretoggles.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def iter_nodes(self):
111111
for opt in optional_attrs:
112112
if toggle.get(f".. toggle_{opt}:") not in (None, "None", "n/a", "N/A"):
113113
toggle_section += nodes.paragraph(
114-
text=f'{opt.title().replace("_"," ")}: {toggle[f".. toggle_{opt}:"]}',
114+
text=f'{opt.title().replace("_", " ")}: {toggle[f".. toggle_{opt}:"]}',
115115
ids=[f"{opt}-{toggle_name}"],
116116
)
117117
yield toggle_section

Diff for: ‎requirements/base.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
#
77
click==8.1.7
88
# via -r requirements/base.in
9-
jinja2==3.1.2
9+
jinja2==3.1.3
1010
# via -r requirements/base.in
11-
markupsafe==2.1.3
11+
markupsafe==2.1.5
1212
# via jinja2
1313
pbr==6.0.0
1414
# via stevedore
15-
python-slugify==8.0.1
15+
python-slugify==8.0.4
1616
# via -r requirements/base.in
1717
pyyaml==6.0.1
1818
# via -r requirements/base.in
19-
stevedore==5.1.0
19+
stevedore==5.2.0
2020
# via -r requirements/base.in
2121
text-unidecode==1.3
2222
# via python-slugify

Diff for: ‎requirements/ci.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
#
55
# make upgrade
66
#
7-
distlib==0.3.7
7+
distlib==0.3.8
88
# via virtualenv
9-
filelock==3.13.1
9+
filelock==3.13.3
1010
# via
1111
# tox
1212
# virtualenv
13-
packaging==23.2
13+
packaging==24.0
1414
# via tox
15-
platformdirs==4.1.0
15+
platformdirs==4.2.0
1616
# via virtualenv
17-
pluggy==1.3.0
17+
pluggy==1.4.0
1818
# via tox
1919
py==1.11.0
2020
# via tox
@@ -26,5 +26,5 @@ tox==3.28.0
2626
# via
2727
# -c requirements/constraints.txt
2828
# -r requirements/ci.in
29-
virtualenv==20.25.0
29+
virtualenv==20.25.1
3030
# via tox

Diff for: ‎requirements/common_constraints.txt

Whitespace-only changes.

Diff for: ‎requirements/constraints.txt

+5-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
# pin when possible. Writing an issue against the offending project and
99
# linking to it here is good.
1010

11-
# Common constraints for edx repos
12-
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
13-
11+
# This file contains all common constraints for edx-repos
12+
-c common_constraints.txt
1413
# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
1514
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
1615
tox<4.0.0
16+
17+
# Temporary to Support the python 3.11 Upgrade
18+
backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library

Diff for: ‎requirements/dev.txt

+35-36
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,21 @@
44
#
55
# make upgrade
66
#
7-
asgiref==3.7.2
7+
asgiref==3.8.1
88
# via
99
# -r requirements/quality.txt
1010
# django
11-
astroid==3.0.1
11+
astroid==3.1.0
1212
# via
1313
# -r requirements/quality.txt
1414
# pylint
1515
# pylint-celery
16-
build==1.0.3
16+
backports-zoneinfo==0.2.1 ; python_version < "3.9"
17+
# via
18+
# -c requirements/constraints.txt
19+
# -r requirements/quality.txt
20+
# django
21+
build==1.2.1
1722
# via
1823
# -r requirements/pip-tools.txt
1924
# pip-tools
@@ -31,58 +36,55 @@ click-log==0.4.0
3136
# via
3237
# -r requirements/quality.txt
3338
# edx-lint
34-
code-annotations==1.5.0
39+
code-annotations==1.7.0
3540
# via
3641
# -r requirements/quality.txt
3742
# edx-lint
38-
coverage[toml]==7.3.2
43+
coverage[toml]==7.4.4
3944
# via
4045
# -r requirements/quality.txt
41-
# coverage
4246
# pytest-cov
43-
diff-cover==8.0.1
47+
diff-cover==8.0.3
4448
# via -r requirements/dev.in
45-
dill==0.3.7
49+
dill==0.3.8
4650
# via
4751
# -r requirements/quality.txt
4852
# pylint
49-
distlib==0.3.7
53+
distlib==0.3.8
5054
# via
5155
# -r requirements/ci.txt
5256
# virtualenv
53-
django==3.2.23
54-
# via
55-
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
56-
# -r requirements/quality.txt
57+
django==4.2.11
58+
# via -r requirements/quality.txt
5759
edx-lint==5.3.6
5860
# via -r requirements/quality.txt
5961
exceptiongroup==1.2.0
6062
# via
6163
# -r requirements/quality.txt
6264
# pytest
63-
filelock==3.13.1
65+
filelock==3.13.3
6466
# via
6567
# -r requirements/ci.txt
6668
# tox
6769
# virtualenv
68-
importlib-metadata==7.0.0
70+
importlib-metadata==7.1.0
6971
# via
7072
# -r requirements/pip-tools.txt
7173
# build
7274
iniconfig==2.0.0
7375
# via
7476
# -r requirements/quality.txt
7577
# pytest
76-
isort==5.12.0
78+
isort==5.13.2
7779
# via
7880
# -r requirements/quality.txt
7981
# pylint
80-
jinja2==3.1.2
82+
jinja2==3.1.3
8183
# via
8284
# -r requirements/quality.txt
8385
# code-annotations
8486
# diff-cover
85-
markupsafe==2.1.3
87+
markupsafe==2.1.5
8688
# via
8789
# -r requirements/quality.txt
8890
# jinja2
@@ -92,7 +94,7 @@ mccabe==0.7.0
9294
# pylint
9395
mock==5.1.0
9496
# via -r requirements/quality.txt
95-
packaging==23.2
97+
packaging==24.0
9698
# via
9799
# -r requirements/ci.txt
98100
# -r requirements/pip-tools.txt
@@ -104,15 +106,15 @@ pbr==6.0.0
104106
# via
105107
# -r requirements/quality.txt
106108
# stevedore
107-
pip-tools==7.3.0
109+
pip-tools==7.4.1
108110
# via -r requirements/pip-tools.txt
109-
platformdirs==4.1.0
111+
platformdirs==4.2.0
110112
# via
111113
# -r requirements/ci.txt
112114
# -r requirements/quality.txt
113115
# pylint
114116
# virtualenv
115-
pluggy==1.3.0
117+
pluggy==1.4.0
116118
# via
117119
# -r requirements/ci.txt
118120
# -r requirements/quality.txt
@@ -129,7 +131,7 @@ pydocstyle==6.3.0
129131
# via -r requirements/quality.txt
130132
pygments==2.17.2
131133
# via diff-cover
132-
pylint==3.0.2
134+
pylint==3.1.0
133135
# via
134136
# -r requirements/quality.txt
135137
# edx-lint
@@ -153,20 +155,17 @@ pyproject-hooks==1.0.0
153155
# via
154156
# -r requirements/pip-tools.txt
155157
# build
156-
pytest==7.4.3
158+
# pip-tools
159+
pytest==8.1.1
157160
# via
158161
# -r requirements/quality.txt
159162
# pytest-cov
160-
pytest-cov==4.1.0
163+
pytest-cov==5.0.0
161164
# via -r requirements/quality.txt
162-
python-slugify==8.0.1
165+
python-slugify==8.0.4
163166
# via
164167
# -r requirements/quality.txt
165168
# code-annotations
166-
pytz==2023.3.post1
167-
# via
168-
# -r requirements/quality.txt
169-
# django
170169
pyyaml==6.0.1
171170
# via
172171
# -r requirements/quality.txt
@@ -185,7 +184,7 @@ sqlparse==0.4.4
185184
# via
186185
# -r requirements/quality.txt
187186
# django
188-
stevedore==5.1.0
187+
stevedore==5.2.0
189188
# via
190189
# -r requirements/quality.txt
191190
# code-annotations
@@ -205,29 +204,29 @@ tomli==2.0.1
205204
# pyproject-hooks
206205
# pytest
207206
# tox
208-
tomlkit==0.12.3
207+
tomlkit==0.12.4
209208
# via
210209
# -r requirements/quality.txt
211210
# pylint
212211
tox==3.28.0
213212
# via
214213
# -c requirements/constraints.txt
215214
# -r requirements/ci.txt
216-
typing-extensions==4.8.0
215+
typing-extensions==4.10.0
217216
# via
218217
# -r requirements/quality.txt
219218
# asgiref
220219
# astroid
221220
# pylint
222-
virtualenv==20.25.0
221+
virtualenv==20.25.1
223222
# via
224223
# -r requirements/ci.txt
225224
# tox
226-
wheel==0.42.0
225+
wheel==0.43.0
227226
# via
228227
# -r requirements/pip-tools.txt
229228
# pip-tools
230-
zipp==3.17.0
229+
zipp==3.18.1
231230
# via
232231
# -r requirements/pip-tools.txt
233232
# importlib-metadata

Diff for: ‎requirements/django.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
#
55
# make upgrade
66
#
7-
asgiref==3.7.2
7+
asgiref==3.8.1
88
# via django
9-
django==3.2.23
9+
backports-zoneinfo==0.2.1 ; python_version < "3.9"
1010
# via
11-
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
12-
# -r requirements/django.in
13-
pytz==2023.3.post1
14-
# via django
11+
# -c requirements/constraints.txt
12+
# django
13+
django==4.2.11
14+
# via -r requirements/django.in
1515
sqlparse==0.4.4
1616
# via django
17-
typing-extensions==4.8.0
17+
typing-extensions==4.10.0
1818
# via asgiref

0 commit comments

Comments
 (0)