From 6a084d55630d6992a73656c4a91c809601c9fcf8 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Thu, 28 Mar 2024 14:54:38 +0500 Subject: [PATCH] feat: add python 311 support --- .github/workflows/ci.yml | 8 +- openassessment/__init__.py | 2 +- requirements/base.txt | 11 +- requirements/constraints.txt | 10 +- requirements/pip-tools.txt | 2 +- requirements/quality.txt | 180 ++----------------------------- requirements/test-acceptance.txt | 180 ++----------------------------- requirements/test.txt | 123 ++------------------- setup.py | 2 +- tox.ini | 3 +- 10 files changed, 44 insertions(+), 477 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbf6cda61b..0c7bb45930 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,14 +15,14 @@ jobs: fail-fast: false matrix: os: [ubuntu-20.04] - python-version: ['3.8'] + python-version: ['3.8', '3.11'] node-version: [16] - toxenv: [quality, js, django32, django42] + toxenv: [quality, js, django42] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} diff --git a/openassessment/__init__.py b/openassessment/__init__.py index 8b5b87d35b..d4ff9301d8 100644 --- a/openassessment/__init__.py +++ b/openassessment/__init__.py @@ -2,4 +2,4 @@ Initialization Information for Open Assessment Module """ -__version__ = '6.5.1' +__version__ = '6.6.0' diff --git a/requirements/base.txt b/requirements/base.txt index 6a2cbfeb4c..50605463b6 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,6 +8,10 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # django bleach==6.1.0 # via -r requirements/base.in boto3==1.34.72 @@ -30,7 +34,7 @@ code-annotations==1.7.0 # via edx-toggles defusedxml==0.7.1 # via -r requirements/base.in -django==3.2.25 +django==4.2.11 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -148,7 +152,6 @@ python-swiftclient==3.13.1 pytz==2024.1 # via # -r requirements/base.in - # django # djangorestframework # edx-submissions # fs @@ -201,7 +204,9 @@ webencodings==0.5.1 webob==1.8.7 # via xblock xblock==1.10.0 - # via -r requirements/base.in + # via + # -c requirements/constraints.txt + # -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 023cc46862..6f183d2e77 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -1,7 +1,7 @@ # Version constraints for pip-installation. # Base dependencies -Django<4.0 # Stay on the latest LTS release of Django +Django<4.3 # Stay on the latest LTS release of Django fs<=2.0.18 # Constrained by edx-platform loremipsum<2.0.0 @@ -14,11 +14,10 @@ idna<2.9.0 # moto version moto==1.3.14 requires idna<2. fs-s3fs==0.1.8 # Constrained by edx-platform wrapt==1.11.* # Constrained by astroid freezegun<=0.3.14 # Test failures on 0.3.15 -# Moto 1.3.15 have build issues -moto<1.3.15 # Networkx 2.5 drops support for python 3.5 networkx<2.5 - +# Moto latest version has breaking changes. Needs the tests to be fixed. +moto<5.0 # path 13.2.0 drops support for Python 3.5 path<13.2.0 @@ -34,3 +33,6 @@ django-simple-history<=3.1.1 # xblock==1.10.0 upgrade causes test failures which need to be fixed separately xblock==1.10.0 + +# backports.zoneinfo is only needed for Python < 3.9 +backports.zoneinfo; python_version<'3.9' diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 8931dc2e50..1471eddf1c 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,7 +4,7 @@ # # make upgrade # -build==1.1.1 +build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools diff --git a/requirements/quality.txt b/requirements/quality.txt index 2883df5e9c..ac0bc2e1e2 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -8,10 +8,6 @@ amqp==5.2.0 # via # -r requirements/test.txt # kombu -annotated-types==0.6.0 - # via - # -r requirements/test.txt - # pydantic appdirs==1.4.4 # via # -r requirements/test.txt @@ -28,25 +24,12 @@ astroid==3.1.0 # via # pylint # pylint-celery -attrs==23.2.0 - # via - # -r requirements/test.txt - # jschema-to-python - # jsonschema - # referencing - # sarif-om -aws-sam-translator==1.86.0 - # via - # -r requirements/test.txt - # cfn-lint -aws-xray-sdk==2.13.0 - # via - # -r requirements/test.txt - # moto -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via + # -c requirements/constraints.txt # -r requirements/test.txt # celery + # django # kombu billiard==4.2.0 # via @@ -58,20 +41,14 @@ binaryornot==0.4.4 # cookiecutter bleach==6.1.0 # via -r requirements/test.txt -boto==2.49.0 - # via - # -r requirements/test.txt - # moto boto3==1.34.72 # via # -r requirements/test.txt - # aws-sam-translator # fs-s3fs # moto botocore==1.34.72 # via # -r requirements/test.txt - # aws-xray-sdk # boto3 # moto # s3transfer @@ -90,10 +67,6 @@ cffi==1.16.0 # -r requirements/test.txt # cryptography # pynacl -cfn-lint==0.86.1 - # via - # -r requirements/test.txt - # moto chardet==5.2.0 # via # -r requirements/test.txt @@ -150,15 +123,10 @@ cryptography==42.0.5 # via # -r requirements/test.txt # moto - # sshpubkeys ddt==1.0.0 # via # -c requirements/constraints.txt # -r requirements/test.txt -decorator==5.1.1 - # via - # -r requirements/test.txt - # networkx defusedxml==0.7.1 # via -r requirements/test.txt dill==0.3.8 @@ -167,7 +135,7 @@ distlib==0.3.8 # via # -r requirements/test.txt # virtualenv -django==3.2.25 +django==4.2.11 # via # -c requirements/constraints.txt # -r requirements/test.txt @@ -203,15 +171,6 @@ djangorestframework==3.14.0 # via # -r requirements/test.txt # edx-submissions -docker==7.0.0 - # via - # -r requirements/test.txt - # moto -ecdsa==0.18.0 - # via - # -r requirements/test.txt - # python-jose - # sshpubkeys edx-django-utils==5.11.0 # via # -r requirements/test.txt @@ -262,13 +221,7 @@ idna==2.8 # via # -c requirements/constraints.txt # -r requirements/test.txt - # moto # requests -importlib-resources==6.4.0 - # via - # -r requirements/test.txt - # jsonschema - # jsonschema-specifications iniconfig==2.0.0 # via # -r requirements/test.txt @@ -286,43 +239,10 @@ jmespath==1.0.1 # -r requirements/test.txt # boto3 # botocore -jschema-to-python==1.2.3 - # via - # -r requirements/test.txt - # cfn-lint -jsondiff==1.1.2 - # via - # -r requirements/test.txt - # moto jsonfield==3.1.0 # via # -r requirements/test.txt # edx-submissions -jsonpatch==1.33 - # via - # -r requirements/test.txt - # cfn-lint -jsonpickle==3.0.3 - # via - # -r requirements/test.txt - # jschema-to-python -jsonpointer==2.4 - # via - # -r requirements/test.txt - # jsonpatch -jsonschema==4.21.1 - # via - # -r requirements/test.txt - # aws-sam-translator - # cfn-lint -jsonschema-specifications==2023.12.1 - # via - # -r requirements/test.txt - # jsonschema -junit-xml==1.9 - # via - # -r requirements/test.txt - # cfn-lint kombu==5.3.6 # via # -r requirements/test.txt @@ -361,24 +281,13 @@ mdurl==0.1.2 # -r requirements/test.txt # markdown-it-py mock==5.1.0 - # via - # -r requirements/test.txt - # moto + # via -r requirements/test.txt more-itertools==10.2.0 # via -r requirements/test.txt -moto==1.3.14 +moto==4.2.14 # via # -c requirements/constraints.txt # -r requirements/test.txt -mpmath==1.3.0 - # via - # -r requirements/test.txt - # sympy -networkx==2.4 - # via - # -c requirements/constraints.txt - # -r requirements/test.txt - # cfn-lint newrelic==9.8.0 # via # -r requirements/test.txt @@ -386,7 +295,6 @@ newrelic==9.8.0 packaging==24.0 # via # -r requirements/test.txt - # docker # pyproject-api # pytest # tox @@ -401,13 +309,7 @@ path-py==12.5.0 pbr==6.0.0 # via # -r requirements/test.txt - # jschema-to-python - # sarif-om # stevedore -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/test.txt - # jsonschema platformdirs==4.2.0 # via # -r requirements/test.txt @@ -431,25 +333,12 @@ psutil==5.9.8 # via # -r requirements/test.txt # edx-django-utils -pyasn1==0.6.0 - # via - # -r requirements/test.txt - # python-jose - # rsa pycodestyle==2.11.1 # via -r requirements/quality.in pycparser==2.21 # via # -r requirements/test.txt # cffi -pydantic==2.6.4 - # via - # -r requirements/test.txt - # aws-sam-translator -pydantic-core==2.16.3 - # via - # -r requirements/test.txt - # pydantic pygments==2.17.2 # via # -r requirements/test.txt @@ -503,10 +392,6 @@ python-dateutil==2.9.0.post0 # freezegun # moto # xblock -python-jose==3.3.0 - # via - # -r requirements/test.txt - # moto python-slugify==8.0.4 # via # -r requirements/test.txt @@ -519,36 +404,22 @@ python-swiftclient==3.13.1 pytz==2024.1 # via # -r requirements/test.txt - # django # djangorestframework # edx-submissions # fs - # moto # xblock pyyaml==6.0.1 # via # -r requirements/test.txt - # cfn-lint # code-annotations # cookiecutter # edx-i18n-tools - # moto # responses # xblock -referencing==0.34.0 - # via - # -r requirements/test.txt - # jsonschema - # jsonschema-specifications -regex==2023.12.25 - # via - # -r requirements/test.txt - # cfn-lint requests==2.31.0 # via # -r requirements/test.txt # cookiecutter - # docker # moto # python-swiftclient # responses @@ -561,23 +432,10 @@ rich==13.7.1 # via # -r requirements/test.txt # cookiecutter -rpds-py==0.18.0 - # via - # -r requirements/test.txt - # jsonschema - # referencing -rsa==4.9 - # via - # -r requirements/test.txt - # python-jose s3transfer==0.10.1 # via # -r requirements/test.txt # boto3 -sarif-om==1.0.4 - # via - # -r requirements/test.txt - # cfn-lint simplejson==3.19.2 # via # -r requirements/test.txt @@ -587,34 +445,23 @@ six==1.16.0 # via # -r requirements/test.txt # bleach - # ecdsa # edx-lint # freezegun # fs # fs-s3fs # html5lib - # junit-xml - # moto # python-dateutil # python-swiftclient sqlparse==0.4.4 # via # -r requirements/test.txt # django -sshpubkeys==3.3.1 - # via - # -r requirements/test.txt - # moto stevedore==5.2.0 # via # -r requirements/test.txt # code-annotations # edx-django-utils # edx-opaque-keys -sympy==1.12 - # via - # -r requirements/test.txt - # cfn-lint testfixtures==8.1.0 # via -r requirements/test.txt text-unidecode==1.3 @@ -640,15 +487,11 @@ types-python-dateutil==2.9.0.20240316 typing-extensions==4.10.0 # via # -r requirements/test.txt - # annotated-types # asgiref # astroid - # aws-sam-translator # edx-opaque-keys # faker # kombu - # pydantic - # pydantic-core # pylint # rich tzdata==2024.1 @@ -660,7 +503,6 @@ urllib3==1.26.18 # via # -r requirements/test.txt # botocore - # docker # requests # responses vine==5.1.0 @@ -700,13 +542,9 @@ werkzeug==3.0.1 # via # -r requirements/test.txt # moto -wrapt==1.11.2 - # via - # -c requirements/constraints.txt - # -r requirements/test.txt - # aws-xray-sdk xblock==1.10.0 # via + # -c requirements/constraints.txt # -r requirements/test.txt # xblock-sdk xblock-sdk==0.7.0 @@ -715,10 +553,6 @@ xmltodict==0.13.0 # via # -r requirements/test.txt # moto -zipp==3.18.1 - # via - # -r requirements/test.txt - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/test-acceptance.txt b/requirements/test-acceptance.txt index 38451d7259..96a4011249 100644 --- a/requirements/test-acceptance.txt +++ b/requirements/test-acceptance.txt @@ -8,10 +8,6 @@ amqp==5.2.0 # via # -r requirements/test.txt # kombu -annotated-types==0.6.0 - # via - # -r requirements/test.txt - # pydantic appdirs==1.4.4 # via # -r requirements/test.txt @@ -24,25 +20,12 @@ asgiref==3.8.1 # via # -r requirements/test.txt # django -attrs==23.2.0 - # via - # -r requirements/test.txt - # jschema-to-python - # jsonschema - # referencing - # sarif-om -aws-sam-translator==1.86.0 - # via - # -r requirements/test.txt - # cfn-lint -aws-xray-sdk==2.13.0 - # via - # -r requirements/test.txt - # moto -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via + # -c requirements/constraints.txt # -r requirements/test.txt # celery + # django # kombu billiard==4.2.0 # via @@ -54,20 +37,14 @@ binaryornot==0.4.4 # cookiecutter bleach==6.1.0 # via -r requirements/test.txt -boto==2.49.0 - # via - # -r requirements/test.txt - # moto boto3==1.34.72 # via # -r requirements/test.txt - # aws-sam-translator # fs-s3fs # moto botocore==1.34.72 # via # -r requirements/test.txt - # aws-xray-sdk # boto3 # moto # s3transfer @@ -86,10 +63,6 @@ cffi==1.16.0 # -r requirements/test.txt # cryptography # pynacl -cfn-lint==0.86.1 - # via - # -r requirements/test.txt - # moto chardet==5.2.0 # via # -r requirements/test.txt @@ -141,23 +114,18 @@ cryptography==42.0.5 # via # -r requirements/test.txt # moto - # sshpubkeys ddt==1.0.0 # via # -c requirements/constraints.txt # -r requirements/test-acceptance.in # -r requirements/test.txt -decorator==5.1.1 - # via - # -r requirements/test.txt - # networkx defusedxml==0.7.1 # via -r requirements/test.txt distlib==0.3.8 # via # -r requirements/test.txt # virtualenv -django==3.2.25 +django==4.2.11 # via # -c requirements/constraints.txt # -r requirements/test.txt @@ -193,15 +161,6 @@ djangorestframework==3.14.0 # via # -r requirements/test.txt # edx-submissions -docker==7.0.0 - # via - # -r requirements/test.txt - # moto -ecdsa==0.18.0 - # via - # -r requirements/test.txt - # python-jose - # sshpubkeys edx-django-utils==5.11.0 # via # -r requirements/test.txt @@ -250,13 +209,7 @@ idna==2.8 # via # -c requirements/constraints.txt # -r requirements/test.txt - # moto # requests -importlib-resources==6.4.0 - # via - # -r requirements/test.txt - # jsonschema - # jsonschema-specifications iniconfig==2.0.0 # via # -r requirements/test.txt @@ -272,43 +225,10 @@ jmespath==1.0.1 # -r requirements/test.txt # boto3 # botocore -jschema-to-python==1.2.3 - # via - # -r requirements/test.txt - # cfn-lint -jsondiff==1.1.2 - # via - # -r requirements/test.txt - # moto jsonfield==3.1.0 # via # -r requirements/test.txt # edx-submissions -jsonpatch==1.33 - # via - # -r requirements/test.txt - # cfn-lint -jsonpickle==3.0.3 - # via - # -r requirements/test.txt - # jschema-to-python -jsonpointer==2.4 - # via - # -r requirements/test.txt - # jsonpatch -jsonschema==4.21.1 - # via - # -r requirements/test.txt - # aws-sam-translator - # cfn-lint -jsonschema-specifications==2023.12.1 - # via - # -r requirements/test.txt - # jsonschema -junit-xml==1.9 - # via - # -r requirements/test.txt - # cfn-lint kombu==5.3.6 # via # -r requirements/test.txt @@ -345,24 +265,13 @@ mdurl==0.1.2 # -r requirements/test.txt # markdown-it-py mock==5.1.0 - # via - # -r requirements/test.txt - # moto + # via -r requirements/test.txt more-itertools==10.2.0 # via -r requirements/test.txt -moto==1.3.14 +moto==4.2.14 # via # -c requirements/constraints.txt # -r requirements/test.txt -mpmath==1.3.0 - # via - # -r requirements/test.txt - # sympy -networkx==2.4 - # via - # -c requirements/constraints.txt - # -r requirements/test.txt - # cfn-lint newrelic==9.8.0 # via # -r requirements/test.txt @@ -370,7 +279,6 @@ newrelic==9.8.0 packaging==24.0 # via # -r requirements/test.txt - # docker # pyproject-api # pytest # tox @@ -385,13 +293,7 @@ path-py==12.5.0 pbr==6.0.0 # via # -r requirements/test.txt - # jschema-to-python - # sarif-om # stevedore -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/test.txt - # jsonschema platformdirs==4.2.0 # via # -r requirements/test.txt @@ -414,23 +316,10 @@ psutil==5.9.8 # via # -r requirements/test.txt # edx-django-utils -pyasn1==0.6.0 - # via - # -r requirements/test.txt - # python-jose - # rsa pycparser==2.21 # via # -r requirements/test.txt # cffi -pydantic==2.6.4 - # via - # -r requirements/test.txt - # aws-sam-translator -pydantic-core==2.16.3 - # via - # -r requirements/test.txt - # pydantic pygments==2.17.2 # via # -r requirements/test.txt @@ -473,10 +362,6 @@ python-dateutil==2.9.0.post0 # freezegun # moto # xblock -python-jose==3.3.0 - # via - # -r requirements/test.txt - # moto python-slugify==8.0.4 # via # -r requirements/test.txt @@ -489,36 +374,22 @@ python-swiftclient==3.13.1 pytz==2024.1 # via # -r requirements/test.txt - # django # djangorestframework # edx-submissions # fs - # moto # xblock pyyaml==6.0.1 # via # -r requirements/test.txt - # cfn-lint # code-annotations # cookiecutter # edx-i18n-tools - # moto # responses # xblock -referencing==0.34.0 - # via - # -r requirements/test.txt - # jsonschema - # jsonschema-specifications -regex==2023.12.25 - # via - # -r requirements/test.txt - # cfn-lint requests==2.31.0 # via # -r requirements/test.txt # cookiecutter - # docker # moto # python-swiftclient # responses @@ -531,23 +402,10 @@ rich==13.7.1 # via # -r requirements/test.txt # cookiecutter -rpds-py==0.18.0 - # via - # -r requirements/test.txt - # jsonschema - # referencing -rsa==4.9 - # via - # -r requirements/test.txt - # python-jose s3transfer==0.10.1 # via # -r requirements/test.txt # boto3 -sarif-om==1.0.4 - # via - # -r requirements/test.txt - # cfn-lint simplejson==3.19.2 # via # -r requirements/test.txt @@ -557,33 +415,22 @@ six==1.16.0 # via # -r requirements/test.txt # bleach - # ecdsa # freezegun # fs # fs-s3fs # html5lib - # junit-xml - # moto # python-dateutil # python-swiftclient sqlparse==0.4.4 # via # -r requirements/test.txt # django -sshpubkeys==3.3.1 - # via - # -r requirements/test.txt - # moto stevedore==5.2.0 # via # -r requirements/test.txt # code-annotations # edx-django-utils # edx-opaque-keys -sympy==1.12 - # via - # -r requirements/test.txt - # cfn-lint testfixtures==8.1.0 # via -r requirements/test.txt text-unidecode==1.3 @@ -606,14 +453,10 @@ types-python-dateutil==2.9.0.20240316 typing-extensions==4.10.0 # via # -r requirements/test.txt - # annotated-types # asgiref - # aws-sam-translator # edx-opaque-keys # faker # kombu - # pydantic - # pydantic-core # rich tzdata==2024.1 # via @@ -624,7 +467,6 @@ urllib3==1.26.18 # via # -r requirements/test.txt # botocore - # docker # requests # responses vine==5.1.0 @@ -664,13 +506,9 @@ werkzeug==3.0.1 # via # -r requirements/test.txt # moto -wrapt==1.11.2 - # via - # -c requirements/constraints.txt - # -r requirements/test.txt - # aws-xray-sdk xblock==1.10.0 # via + # -c requirements/constraints.txt # -r requirements/test.txt # xblock-sdk xblock-sdk==0.7.0 @@ -679,10 +517,6 @@ xmltodict==0.13.0 # via # -r requirements/test.txt # moto -zipp==3.18.1 - # via - # -r requirements/test.txt - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/test.txt b/requirements/test.txt index 9c36c1877e..bf3c713d13 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -6,8 +6,6 @@ # amqp==5.2.0 # via kombu -annotated-types==0.6.0 - # via pydantic appdirs==1.4.4 # via # -r requirements/base.txt @@ -18,19 +16,12 @@ asgiref==3.8.1 # via # -r requirements/base.txt # django -attrs==23.2.0 - # via - # jschema-to-python - # jsonschema - # referencing - # sarif-om -aws-sam-translator==1.86.0 - # via cfn-lint -aws-xray-sdk==2.13.0 - # via moto -backports-zoneinfo[tzdata]==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via + # -c requirements/constraints.txt + # -r requirements/base.txt # celery + # django # kombu billiard==4.2.0 # via celery @@ -38,18 +29,14 @@ binaryornot==0.4.4 # via cookiecutter bleach==6.1.0 # via -r requirements/base.txt -boto==2.49.0 - # via moto boto3==1.34.72 # via # -r requirements/base.txt - # aws-sam-translator # fs-s3fs # moto botocore==1.34.72 # via # -r requirements/base.txt - # aws-xray-sdk # boto3 # moto # s3transfer @@ -66,8 +53,6 @@ cffi==1.16.0 # -r requirements/base.txt # cryptography # pynacl -cfn-lint==0.86.1 - # via moto chardet==5.2.0 # via # binaryornot @@ -105,15 +90,11 @@ coverage[toml]==7.4.4 # -r requirements/test.in # pytest-cov cryptography==42.0.5 - # via - # moto - # sshpubkeys + # via moto ddt==1.0.0 # via # -c requirements/constraints.txt # -r requirements/test.in -decorator==5.1.1 - # via networkx defusedxml==0.7.1 # via -r requirements/base.txt distlib==0.3.8 @@ -152,12 +133,6 @@ django-waffle==4.1.0 # via # -r requirements/base.txt # edx-submissions -docker==7.0.0 - # via moto -ecdsa==0.18.0 - # via - # python-jose - # sshpubkeys edx-django-utils==5.11.0 # via # -r requirements/base.txt @@ -200,12 +175,7 @@ idna==2.8 # via # -c requirements/constraints.txt # -r requirements/base.txt - # moto # requests -importlib-resources==6.4.0 - # via - # jsonschema - # jsonschema-specifications iniconfig==2.0.0 # via pytest jinja2==3.1.3 @@ -219,28 +189,10 @@ jmespath==1.0.1 # -r requirements/base.txt # boto3 # botocore -jschema-to-python==1.2.3 - # via cfn-lint -jsondiff==1.1.2 - # via moto jsonfield==3.1.0 # via # -r requirements/base.txt # edx-submissions -jsonpatch==1.33 - # via cfn-lint -jsonpickle==3.0.3 - # via jschema-to-python -jsonpointer==2.4 - # via jsonpatch -jsonschema==4.21.1 - # via - # aws-sam-translator - # cfn-lint -jsonschema-specifications==2023.12.1 - # via jsonschema -junit-xml==1.9 - # via cfn-lint kombu==5.3.6 # via celery lazy==1.6 @@ -271,28 +223,19 @@ markupsafe==2.1.5 mdurl==0.1.2 # via markdown-it-py mock==5.1.0 - # via - # -r requirements/test.in - # moto + # via -r requirements/test.in more-itertools==10.2.0 # via -r requirements/test.in -moto==1.3.14 +moto==4.2.14 # via # -c requirements/constraints.txt # -r requirements/test.in -mpmath==1.3.0 - # via sympy -networkx==2.4 - # via - # -c requirements/constraints.txt - # cfn-lint newrelic==9.8.0 # via # -r requirements/base.txt # edx-django-utils packaging==24.0 # via - # docker # pyproject-api # pytest # tox @@ -307,11 +250,7 @@ path-py==12.5.0 pbr==6.0.0 # via # -r requirements/base.txt - # jschema-to-python - # sarif-om # stevedore -pkgutil-resolve-name==1.3.10 - # via jsonschema platformdirs==4.2.0 # via # tox @@ -330,18 +269,10 @@ psutil==5.9.8 # via # -r requirements/base.txt # edx-django-utils -pyasn1==0.6.0 - # via - # python-jose - # rsa pycparser==2.21 # via # -r requirements/base.txt # cffi -pydantic==2.6.4 - # via aws-sam-translator -pydantic-core==2.16.3 - # via pydantic pygments==2.17.2 # via rich pymongo==3.13.0 @@ -375,8 +306,6 @@ python-dateutil==2.9.0.post0 # freezegun # moto # xblock -python-jose==3.3.0 - # via moto python-slugify==8.0.4 # via # -r requirements/base.txt @@ -389,33 +318,22 @@ python-swiftclient==3.13.1 pytz==2024.1 # via # -r requirements/base.txt - # django # djangorestframework # edx-submissions # fs - # moto # xblock pyyaml==6.0.1 # via # -r requirements/base.txt - # cfn-lint # code-annotations # cookiecutter # edx-i18n-tools - # moto # responses # xblock -referencing==0.34.0 - # via - # jsonschema - # jsonschema-specifications -regex==2023.12.25 - # via cfn-lint requests==2.31.0 # via # -r requirements/base.txt # cookiecutter - # docker # moto # python-swiftclient # responses @@ -424,18 +342,10 @@ responses==0.25.0 # via moto rich==13.7.1 # via cookiecutter -rpds-py==0.18.0 - # via - # jsonschema - # referencing -rsa==4.9 - # via python-jose s3transfer==0.10.1 # via # -r requirements/base.txt # boto3 -sarif-om==1.0.4 - # via cfn-lint simplejson==3.19.2 # via # -r requirements/base.txt @@ -445,29 +355,22 @@ six==1.16.0 # via # -r requirements/base.txt # bleach - # ecdsa # freezegun # fs # fs-s3fs # html5lib - # junit-xml - # moto # python-dateutil # python-swiftclient sqlparse==0.4.4 # via # -r requirements/base.txt # django -sshpubkeys==3.3.1 - # via moto stevedore==5.2.0 # via # -r requirements/base.txt # code-annotations # edx-django-utils # edx-opaque-keys -sympy==1.12 - # via cfn-lint testfixtures==8.1.0 # via -r requirements/test.in text-unidecode==1.3 @@ -487,14 +390,10 @@ types-python-dateutil==2.9.0.20240316 typing-extensions==4.10.0 # via # -r requirements/base.txt - # annotated-types # asgiref - # aws-sam-translator # edx-opaque-keys # faker # kombu - # pydantic - # pydantic-core # rich tzdata==2024.1 # via @@ -504,7 +403,6 @@ urllib3==1.26.18 # via # -r requirements/base.txt # botocore - # docker # requests # responses vine==5.1.0 @@ -537,20 +435,15 @@ webob==1.8.7 # xblock-sdk werkzeug==3.0.1 # via moto -wrapt==1.11.2 - # via - # -c requirements/constraints.txt - # aws-xray-sdk xblock==1.10.0 # via + # -c requirements/constraints.txt # -r requirements/base.txt # xblock-sdk xblock-sdk==0.7.0 # via -r requirements/test.in xmltodict==0.13.0 # via moto -zipp==3.18.1 - # via importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/setup.py b/setup.py index b42cc9274c..a6ccd76700 100644 --- a/setup.py +++ b/setup.py @@ -63,13 +63,13 @@ def get_version(*file_paths): long_description_content_type='text/x-rst', classifiers=[ 'Development Status :: 5 - Production/Stable', - 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.2', 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU Affero General Public License v3', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.11', ], packages=find_packages(include=['openassessment*'], exclude=['*.test', '*.tests']), include_package_data=True, diff --git a/tox.ini b/tox.ini index ec9b845458..05a0be162d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,9 @@ [tox] -envlist = py38-django{32, 42}, js, quality +envlist = py{38, 311}-django{42}, js, quality [testenv] deps = -rrequirements/test.txt - django32: Django>=3.2,<4.0 django42: Django>=4.2,<5.0 commands =