Skip to content

Commit

Permalink
Merge pull request #485 from openedx/upgrade-pythons
Browse files Browse the repository at this point in the history
build: add python 311 support.
  • Loading branch information
Feanil Patel authored Apr 19, 2024
2 parents edc955a + 068832d commit f0559ab
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 16 deletions.
6 changes: 3 additions & 3 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: [django32, django42, quality]
python-version: ['3.8', '3.11']
toxenv: [django42, quality]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:

- name: Install Dependencies
run: |
pip install "Django<4.0"
pip install "Django>=4.2,<4.3"
pip install -r requirements/ci.txt
pip install -r requirements/test.txt
Expand Down
2 changes: 1 addition & 1 deletion edxval/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
init
"""

__version__ = '2.4.4'
__version__ = '2.5.0'
3 changes: 3 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@

# Common constraints for edx repos
-c common_constraints.txt

# For python greater than or equal to 3.9 backports.zoneinfo is causing failures
backports.zoneinfo;python_version<"3.9"
3 changes: 2 additions & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ astroid==3.1.0
# pylint-celery
backports-tarfile==1.1.0
# via jaraco-context
backports-zoneinfo==0.2.1
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
# djangorestframework
cachetools==5.3.3
Expand Down
3 changes: 2 additions & 1 deletion requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ astroid==3.1.0
# pylint-celery
backports-tarfile==1.1.0
# via jaraco-context
backports-zoneinfo==0.2.1
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
# djangorestframework
certifi==2024.2.2
Expand Down
3 changes: 2 additions & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ appdirs==1.4.4
# via fs
asgiref==3.8.1
# via django
backports-zoneinfo==0.2.1
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
# djangorestframework
certifi==2024.2.2
Expand Down
15 changes: 6 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
[tox]
envlist = py38-django{32,42}, quality
envlist = py{38,311}-django{42}, quality

[testenv]
deps =
django32: Django>=3.2,<4.0
django40: Django>=4.0,<4.1
deps =
django42: Django>=4.2,<4.3
-r{toxinidir}/requirements/test.txt
commands =
commands =
python -Wd -m pytest {posargs}

[testenv:quality]
basepython = python3.8
allowlist_externals =
allowlist_externals =
make
deps =
deps =
-r{toxinidir}/requirements/quality.txt
commands =
commands =
pylint edxval
pycodestyle edxval
pydocstyle edxval
isort --check-only edxval manage.py setup.py
make selfcheck
python setup.py sdist bdist_wheel
twine check dist/*

0 comments on commit f0559ab

Please sign in to comment.