Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds support for python 3.12 #61

Merged
merged 3 commits into from
Feb 29, 2024
Merged

Adds support for python 3.12 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c07d61
chore: Adds support for python 3.12
farhan Feb 21, 2024
b7f2435
chore: Updating Python Requirements (#64)
edx-requirements-bot Feb 26, 2024
b91c8f4
chore: fix bug
farhan Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
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: [py38-django32, quality]
python-version: ['3.8', '3.12']
toxenv: [py38-django42, quality]

steps:
- uses: actions/checkout@v3
Expand All @@ -36,7 +36,7 @@ jobs:
run: tox

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='py38-django32'
if: matrix.python-version == '3.8' && matrix.toxenv=='py38-django42'
uses: codecov/codecov-action@v3
with:
flags: unittests
Expand Down
17 changes: 10 additions & 7 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,18 @@ appdirs==1.4.4
# via fs
asgiref==3.7.2
# via django
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
boto3==1.34.49
# via fs-s3fs
botocore==1.34.49
# via
# boto3
# s3transfer
django==3.2.24
django==4.2.10
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# django-crum
# openedx-django-pyfs
# openedx-filters
Expand All @@ -35,8 +38,10 @@ jmespath==1.0.1
# botocore
lazy==1.6
# via xblock
lxml==5.1.0
# via xblock
lxml==4.9.4
# via
# -c requirements/constraints.txt
# xblock
mako==1.3.2
# via xblock
markupsafe==2.1.5
Expand All @@ -52,9 +57,7 @@ python-dateutil==2.8.2
# botocore
# xblock
pytz==2024.1
# via
# django
# xblock
# via xblock
pyyaml==6.0.1
# via xblock
s3transfer==0.10.0
Expand Down
14 changes: 9 additions & 5 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ astroid==3.1.0
# -r requirements/test.txt
# pylint
# pylint-celery
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# django
binaryornot==0.4.4
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -89,7 +94,7 @@ cryptography==42.0.5
# via
# -r requirements/test.txt
# secretstorage
ddt==1.7.1
ddt==1.7.2
# via -r requirements/test.txt
dill==0.3.8
# via
Expand All @@ -99,9 +104,8 @@ distlib==0.3.8
# via
# -r requirements/tox.txt
# virtualenv
django==3.2.24
django==4.2.10
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
# django-crum
# openedx-django-pyfs
Expand Down Expand Up @@ -187,8 +191,9 @@ lazy==1.6
# via
# -r requirements/test.txt
# xblock
lxml==5.1.0
lxml==4.9.4
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# xblock
# xblock-sdk
Expand Down Expand Up @@ -317,7 +322,6 @@ python-slugify==8.0.4
pytz==2024.1
# via
# -r requirements/test.txt
# django
# xblock
pyyaml==6.0.1
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
# pin when possible. Writing an issue against the offending project and
# linking to it here is good.

# Common constraints for edx repos
-c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
lxml<5.0.0
backports.zoneinfo;python_version<"3.9"
9 changes: 6 additions & 3 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ asgiref==3.7.2
# via
# -r requirements/base.txt
# django
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -r requirements/base.txt
# django
boto3==1.34.49
# via
# -r requirements/base.txt
Expand All @@ -21,7 +25,7 @@ botocore==1.34.49
# -r requirements/base.txt
# boto3
# s3transfer
django==3.2.24
django==4.2.10
# via
# -r requirements/base.txt
# django-crum
Expand Down Expand Up @@ -51,7 +55,7 @@ lazy==1.6
# via
# -r requirements/base.txt
# xblock
lxml==5.1.0
lxml==4.9.4
# via
# -r requirements/base.txt
# edx-i18n-tools
Expand Down Expand Up @@ -83,7 +87,6 @@ python-dateutil==2.8.2
pytz==2024.1
# via
# -r requirements/base.txt
# django
# xblock
pyyaml==6.0.1
# via
Expand Down
9 changes: 6 additions & 3 deletions requirements/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ babel==2.14.0
# via
# pydata-sphinx-theme
# sphinx
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -r requirements/base.txt
# django
beautifulsoup4==4.12.3
# via pydata-sphinx-theme
boto3==1.34.49
Expand All @@ -35,7 +39,7 @@ certifi==2024.2.2
# via requests
charset-normalizer==3.3.2
# via requests
django==3.2.24
django==4.2.10
# via
# -r requirements/base.txt
# django-crum
Expand Down Expand Up @@ -74,7 +78,7 @@ lazy==1.6
# via
# -r requirements/base.txt
# xblock
lxml==5.1.0
lxml==4.9.4
# via
# -r requirements/base.txt
# xblock
Expand Down Expand Up @@ -114,7 +118,6 @@ pytz==2024.1
# via
# -r requirements/base.txt
# babel
# django
# xblock
pyyaml==6.0.1
# via
Expand Down
14 changes: 9 additions & 5 deletions requirements/quality.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ astroid==3.1.0
# via
# pylint
# pylint-celery
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# django
binaryornot==0.4.4
# via cookiecutter
boto3==1.34.49
Expand Down Expand Up @@ -51,13 +56,12 @@ cookiecutter==2.6.0
# via xblock-sdk
cryptography==42.0.5
# via secretstorage
ddt==1.7.1
ddt==1.7.2
# via -r requirements/quality.in
dill==0.3.8
# via pylint
django==3.2.24
django==4.2.10
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.txt
# django-crum
# openedx-django-pyfs
Expand Down Expand Up @@ -111,8 +115,9 @@ lazy==1.6
# via
# -r requirements/base.txt
# xblock
lxml==5.1.0
lxml==4.9.4
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# xblock
# xblock-sdk
Expand Down Expand Up @@ -186,7 +191,6 @@ python-slugify==8.0.4
pytz==2024.1
# via
# -r requirements/base.txt
# django
# xblock
pyyaml==6.0.1
# via
Expand Down
14 changes: 9 additions & 5 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ astroid==3.1.0
# via
# pylint
# pylint-celery
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# django
binaryornot==0.4.4
# via cookiecutter
boto3==1.34.49
Expand Down Expand Up @@ -55,13 +60,12 @@ coveralls==3.3.1
# via -r requirements/test.in
cryptography==42.0.5
# via secretstorage
ddt==1.7.1
ddt==1.7.2
# via -r requirements/test.in
dill==0.3.8
# via pylint
django==3.2.24
django==4.2.10
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.txt
# django-crum
# openedx-django-pyfs
Expand Down Expand Up @@ -121,8 +125,9 @@ lazy==1.6
# via
# -r requirements/base.txt
# xblock
lxml==5.1.0
lxml==4.9.4
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# xblock
# xblock-sdk
Expand Down Expand Up @@ -207,7 +212,6 @@ python-slugify==8.0.4
pytz==2024.1
# via
# -r requirements/base.txt
# django
# xblock
pyyaml==6.0.1
# via
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def package_data(pkg, roots):

setup(
name='feedback-xblock',
version='1.3.0',
version='1.4.0',
description='XBlock for providing feedback on course content',
long_description=README,
long_description_content_type='text/x-rst',
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[tox]
envlist = py38-django{32}, quality
envlist = py{38,312}-django{42}, quality

[testenv]
allowlist_externals =
make

deps =
django32: Django>=3.2,<4.0
django40: Django>=4.0,<4.1
django42: Django>=4.2,<4.3
-r{toxinidir}/requirements/test.txt
commands =
make test
Expand Down
Loading