Skip to content

Commit

Permalink
Merge pull request #554 from edx/jenkins/python312-support-e272aa4
Browse files Browse the repository at this point in the history
feat: add python 3.12 support
  • Loading branch information
UsamaSadiq authored Feb 26, 2024
2 parents 21c2ed4 + 8b93b5a commit 063c3da
Show file tree
Hide file tree
Showing 17 changed files with 93 additions and 234 deletions.
25 changes: 13 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
tox-env: [django32, quality]
python-version: ['3.8', '3.12']
tox-env: [quality, django42]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.8'
architecture: x64
- name: Install requirements
run: pip install -r requirements/ci.txt
- name: Run tox
env:
TOXENV: ${{ matrix.tox-env }}
run: tox
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
architecture: x64
- name: Install requirements
run: pip install -r requirements/ci.txt
- name: Run tox
env:
TOXENV: ${{ matrix.tox-env }}
run: tox
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ Change Log
Unreleased
~~~~~~~~~~

[3.3.1] - 2024-02-26
~~~~~~~~~~~~~~~~~~~~
Added
_______
* Added support for ``Python 3.12``

[3.3.0] - 2024-01-23
~~~~~~~~~~~~~~~~~~~~
Changed
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ docs: ## generate Sphinx HTML documentation, including API docs
$(BROWSER)docs/_build/html/index.html

# Define CMD_PIP_COMPILE_OPTS=-v to get more information during make upgrade.
CMD_PIP_COMPILE ?= pip-compile --rebuild --upgrade $(CMD_PIP_COMPILE_OPTS)
CMD_PIP_COMPILE ?= pip-compile --rebuild --upgrade --allow-unsafe $(CMD_PIP_COMPILE_OPTS)

upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
pip install -qr requirements/pip-tools.txt
# Make sure to compile files after any other files they include!
$(CMD_PIP_COMPILE) --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
$(CMD_PIP_COMPILE) --rebuild -o requirements/pip.txt requirements/pip.in
$(CMD_PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -qr requirements/pip.txt
pip install -qr requirements/pip-tools.txt
Expand Down
2 changes: 1 addition & 1 deletion edx_arch_experiments/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
A plugin to include applications under development by the architecture team at 2U.
"""

__version__ = '3.3.0'
__version__ = '3.3.1'
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ def test_send_to_slack(self, slack_url, service_name, expected_message):
if expected_message is None:
mock_req.assert_not_called()
else:
assert mock_req.called_once()
mock_req.assert_called_once()
(call_args, call_kwargs) = mock_req.call_args_list[0]
assert json.loads(call_kwargs['data'])['text'] == expected_message
14 changes: 2 additions & 12 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
# SERIOUSLY.
#
# ------------------------------
# Generated by edx-lint version: 5.3.4
# Generated by edx-lint version: 5.3.6
# ------------------------------
[MASTER]
ignore = migrations
Expand Down Expand Up @@ -141,7 +141,6 @@ enable =
no-self-argument,
no-value-for-parameter,
non-iterator-returned,
non-parent-method-called,
nonexistent-operator,
not-a-mapping,
not-an-iterable,
Expand All @@ -161,13 +160,10 @@ enable =
return-outside-function,
signature-differs,
super-init-not-called,
super-method-not-called,
syntax-error,
test-inherits-tests,
too-few-format-args,
too-many-format-args,
too-many-function-args,
translation-of-non-string,
truncated-format-string,
undefined-all-variable,
undefined-loop-variable,
Expand Down Expand Up @@ -213,7 +209,6 @@ enable =
consider-using-enumerate,
global-at-module-level,
global-variable-not-assigned,
literal-used-as-attribute,
logging-format-interpolation,
logging-not-lazy,
multiple-imports,
Expand All @@ -224,7 +219,6 @@ enable =
redundant-unittest-assert,
reimported,
simplifiable-if-statement,
simplifiable-range,
singleton-comparison,
superfluous-parens,
unidiomatic-typecheck,
Expand All @@ -233,7 +227,6 @@ enable =
unnecessary-semicolon,
unneeded-not,
useless-else-on-loop,
wrong-assert-type,

deprecated-method,
deprecated-module,
Expand Down Expand Up @@ -283,9 +276,6 @@ disable =
unused-wildcard-import,
use-maxsplit-arg,

feature-toggle-needs-doc,
illegal-waffle-usage,

logging-fstring-interpolation,
invalid-name,
django-not-configured,
Expand Down Expand Up @@ -386,4 +376,4 @@ int-import-graph =
[EXCEPTIONS]
overgeneral-exceptions = builtins.Exception

# 3cb34afb74e2aafe0c7e4dbe243a24d908c1af5d
# 705beaa0a7838cb087019c51be357f5949892713
1 change: 1 addition & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ djangorestframework # Used by codejail_service app
edx-drf-extensions # Used by codejail_service app
edx-toggles # Used by codejail_service app
jsonschema # Parse and validate JSON; used by codejail_service app
setuptools
20 changes: 7 additions & 13 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# make upgrade
Expand Down Expand Up @@ -69,10 +69,6 @@ edx-toggles==5.1.1
# via -r requirements/base.in
idna==3.6
# via requests
importlib-resources==6.1.1
# via
# jsonschema
# jsonschema-specifications
jinja2==3.1.3
# via code-annotations
jsonschema==4.21.1
Expand All @@ -85,8 +81,6 @@ newrelic==9.7.0
# via edx-django-utils
pbr==6.0.0
# via stevedore
pkgutil-resolve-name==1.3.10
# via jsonschema
psutil==5.9.8
# via edx-django-utils
pycparser==2.21
Expand Down Expand Up @@ -130,11 +124,11 @@ stevedore==5.2.0
# edx-opaque-keys
text-unidecode==1.3
# via python-slugify
typing-extensions==4.9.0
# via
# asgiref
# edx-opaque-keys
typing-extensions==4.10.0
# via edx-opaque-keys
urllib3==2.2.1
# via requests
zipp==3.17.0
# via importlib-resources

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.1.1
# via -r requirements/base.in
6 changes: 1 addition & 5 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# make upgrade
Expand Down Expand Up @@ -28,10 +28,6 @@ pluggy==1.4.0
# via tox
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.13.0
# via -r requirements/ci.in
virtualenv==20.25.1
Expand Down
67 changes: 14 additions & 53 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# make upgrade
Expand All @@ -8,7 +8,7 @@ asgiref==3.7.2
# via
# -r requirements/quality.txt
# django
astroid==3.0.3
astroid==3.1.0
# via
# -r requirements/quality.txt
# pylint
Expand Down Expand Up @@ -74,8 +74,7 @@ cryptography==42.0.5
# via
# -r requirements/quality.txt
# pyjwt
# secretstorage
ddt==1.7.1
ddt==1.7.2
# via -r requirements/quality.txt
diff-cover==8.0.3
# via -r requirements/dev.in
Expand Down Expand Up @@ -142,10 +141,6 @@ edx-opaque-keys==2.5.1
# edx-drf-extensions
edx-toggles==5.1.1
# via -r requirements/quality.txt
exceptiongroup==1.2.0
# via
# -r requirements/quality.txt
# pytest
filelock==3.13.1
# via
# -r requirements/ci.txt
Expand All @@ -157,17 +152,8 @@ idna==3.6
# requests
importlib-metadata==7.0.1
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# build
# keyring
# twine
importlib-resources==6.1.1
# via
# -r requirements/quality.txt
# jsonschema
# jsonschema-specifications
# keyring
iniconfig==2.0.0
# via
# -r requirements/quality.txt
Expand All @@ -180,11 +166,6 @@ jaraco-classes==3.3.1
# via
# -r requirements/quality.txt
# keyring
jeepney==0.8.0
# via
# -r requirements/quality.txt
# keyring
# secretstorage
jinja2==3.1.3
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -251,10 +232,6 @@ pkginfo==1.9.6
# via
# -r requirements/quality.txt
# twine
pkgutil-resolve-name==1.3.10
# via
# -r requirements/quality.txt
# jsonschema
platformdirs==4.2.0
# via
# -r requirements/ci.txt
Expand Down Expand Up @@ -294,7 +271,7 @@ pyjwt[crypto]==2.8.0
# -r requirements/quality.txt
# drf-jwt
# edx-drf-extensions
pylint==3.0.4
pylint==3.1.0
# via
# -r requirements/quality.txt
# edx-lint
Expand Down Expand Up @@ -386,10 +363,6 @@ rpds-py==0.18.0
# -r requirements/quality.txt
# jsonschema
# referencing
secretstorage==3.3.3
# via
# -r requirements/quality.txt
# keyring
semantic-version==2.10.0
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -417,19 +390,6 @@ text-unidecode==1.3
# via
# -r requirements/quality.txt
# python-slugify
tomli==2.0.1
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# build
# coverage
# pip-tools
# pylint
# pyproject-api
# pyproject-hooks
# pytest
# tox
tomlkit==0.12.3
# via
# -r requirements/quality.txt
Expand All @@ -438,14 +398,10 @@ tox==4.13.0
# via -r requirements/ci.txt
twine==5.0.0
# via -r requirements/quality.txt
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# -r requirements/quality.txt
# asgiref
# astroid
# edx-opaque-keys
# pylint
# rich
urllib3==2.2.1
# via
# -r requirements/quality.txt
Expand All @@ -461,11 +417,16 @@ wheel==0.42.0
# pip-tools
zipp==3.17.0
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# importlib-metadata
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
pip==24.0
# via
# -r requirements/pip-tools.txt
# pip-tools
setuptools==69.1.1
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# pip-tools
Loading

0 comments on commit 063c3da

Please sign in to comment.