diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 98b63e8..0981a22 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 diff --git a/requirements/base.txt b/requirements/base.txt index 4c1f843..839a6c4 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 @@ -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 @@ -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 diff --git a/requirements/ci.txt b/requirements/ci.txt index f264ae4..e506c49 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -317,7 +322,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/test.txt - # django # xblock pyyaml==6.0.1 # via diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 8f8ed18..391310a 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -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" diff --git a/requirements/dev.txt b/requirements/dev.txt index a4213ca..00bb78a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -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 @@ -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 @@ -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 @@ -83,7 +87,6 @@ python-dateutil==2.8.2 pytz==2024.1 # via # -r requirements/base.txt - # django # xblock pyyaml==6.0.1 # via diff --git a/requirements/docs.txt b/requirements/docs.txt index fbaa6b5..f375e94 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -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 @@ -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 @@ -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 @@ -114,7 +118,6 @@ pytz==2024.1 # via # -r requirements/base.txt # babel - # django # xblock pyyaml==6.0.1 # via diff --git a/requirements/quality.txt b/requirements/quality.txt index f0bc537..6e2af6b 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -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 @@ -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 @@ -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 @@ -186,7 +191,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/base.txt - # django # xblock pyyaml==6.0.1 # via diff --git a/requirements/test.txt b/requirements/test.txt index 87ece72..7e34d4a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -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 @@ -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 @@ -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 @@ -207,7 +212,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/base.txt - # django # xblock pyyaml==6.0.1 # via diff --git a/setup.py b/setup.py index 9dc7c25..6786449 100644 --- a/setup.py +++ b/setup.py @@ -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', diff --git a/tox.ini b/tox.ini index 043e0a6..5b1e8ce 100644 --- a/tox.ini +++ b/tox.ini @@ -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