Skip to content

Commit

Permalink
Merge pull request #82 from openedx/jenkins/python312-support-7a9638c
Browse files Browse the repository at this point in the history
feat: add python312 support
  • Loading branch information
UsamaSadiq authored Mar 4, 2024
2 parents 7a9638c + 9bae056 commit a84d179
Show file tree
Hide file tree
Showing 13 changed files with 177 additions and 134 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [quality, django32, django42]
python-version: ['3.8', '3.12']
toxenv: [quality, django42]

steps:
- uses: actions/checkout@v2
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
pip install -qr requirements/pip-tools.txt
# Make sure to compile files after any other files they include!
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
pip-compile --upgrade --allow-unsafe -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -qr requirements/pip.txt
pip install -qr requirements/pip-tools.txt
pip-compile --upgrade -o requirements/base.txt requirements/base.in
pip-compile --upgrade -o requirements/test.txt requirements/test.in
pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
pip-compile --upgrade -o requirements/ci.txt requirements/ci.in
pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
pip-compile --upgrade --allow-unsafe -o requirements/base.txt requirements/base.in
pip-compile --upgrade --allow-unsafe -o requirements/test.txt requirements/test.in
pip-compile --upgrade --allow-unsafe -o requirements/quality.txt requirements/quality.in
pip-compile --upgrade --allow-unsafe -o requirements/ci.txt requirements/ci.in
pip-compile --upgrade --allow-unsafe -o requirements/dev.txt requirements/dev.in
# Let tox control the Django version for tests
sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
mv requirements/test.tmp requirements/test.txt
Expand Down
2 changes: 1 addition & 1 deletion milestones/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"""


__version__ = '0.5.0'
__version__ = '0.6.0'
2 changes: 2 additions & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ Django # Web application framework
django-model-utils # Provides TimeStampedModel abstract base class
edx-opaque-keys>=0.2.1 # Create and introspect course and xblock identities
six # Utilities for supporting Python 2 & 3 in the same codebase
setuptools
backports.zoneinfo; python_version<'3.9'
20 changes: 13 additions & 7 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,34 @@
#
asgiref==3.7.2
# via django
django==3.2.22
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -r requirements/base.in
# django
django==4.2.11
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
# django-model-utils
django-model-utils==4.3.1
django-model-utils==4.4.0
# via -r requirements/base.in
edx-opaque-keys==2.5.1
# via -r requirements/base.in
pbr==5.11.1
pbr==6.0.0
# via stevedore
pymongo==3.13.0
# via edx-opaque-keys
pytz==2023.3.post1
# via django
six==1.16.0
# via -r requirements/base.in
sqlparse==0.4.4
# via django
stevedore==5.1.0
stevedore==5.2.0
# via edx-opaque-keys
typing-extensions==4.8.0
typing-extensions==4.10.0
# via
# asgiref
# edx-opaque-keys

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.1.1
# via -r requirements/base.in
36 changes: 22 additions & 14 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,35 @@
#
# make upgrade
#
distlib==0.3.7
cachetools==5.3.3
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
filelock==3.12.4
filelock==3.13.1
# via
# tox
# virtualenv
packaging==23.2
# via
# pyproject-api
# tox
platformdirs==4.2.0
# via
# tox
# virtualenv
pluggy==1.4.0
# via tox
platformdirs==3.11.0
# via virtualenv
pluggy==1.3.0
# via tox
py==1.11.0
# via tox
six==1.16.0
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via tox
tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.in
virtualenv==20.24.5
# pyproject-api
# tox
tox==4.13.0
# via -r requirements/ci.in
virtualenv==20.25.1
# via tox
Loading

0 comments on commit a84d179

Please sign in to comment.