diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36f282e..2c3695a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: matrix: os: [ ubuntu-20.04 ] python-version: [ '3.8' ] - toxenv: [django32, quality ] + toxenv: [django32, django42, quality] steps: - uses: actions/checkout@v2 continue-on-error: true diff --git a/Makefile b/Makefile index 0f229d2..69d8800 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,6 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) pip-compile --upgrade -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in requirements/test.in requirements/travis.in pip-compile --upgrade -o requirements/quality.txt requirements/base.in requirements/quality.in requirements/test.in pip-compile --upgrade -o requirements/test.txt requirements/base.in requirements/test.in - pip-compile --upgrade -o requirements/travis.txt requirements/travis.in pip-compile --upgrade -o requirements/ci.txt requirements/ci.in # Let tox control the Django version for tests grep -e "^django==" requirements/test.txt > requirements/django.txt diff --git a/requirements/ci.txt b/requirements/ci.txt index 1abdadf..f352ec9 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,69 +1,70 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -asgiref==3.5.2 +asgiref==3.7.2 # via django -certifi==2022.9.24 +certifi==2023.7.22 # via requests -charset-normalizer==2.1.1 +charset-normalizer==3.2.0 # via requests coverage==6.5.0 # via coveralls coveralls==3.3.1 # via -r requirements/ci.in -distlib==0.3.6 +distlib==0.3.7 # via virtualenv -django==3.2.16 +django==3.2.20 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt # edx-i18n-tools docopt==0.6.2 # via coveralls -edx-i18n-tools==0.9.2 +edx-i18n-tools==1.1.0 # via -r requirements/ci.in -filelock==3.8.0 +filelock==3.12.2 # via # tox # virtualenv idna==3.4 # via requests -packaging==21.3 +packaging==23.1 # via tox -path==16.5.0 +path==16.7.1 # via edx-i18n-tools -platformdirs==2.5.2 +platformdirs==3.10.0 # via virtualenv -pluggy==1.0.0 +pluggy==1.2.0 # via tox -polib==1.1.1 +polib==1.2.0 # via edx-i18n-tools py==1.11.0 # via tox -pyparsing==3.0.9 - # via packaging -pytz==2022.5 +pytz==2023.3 # via django -pyyaml==6.0 +pyyaml==6.0.1 # via edx-i18n-tools -requests==2.28.1 +requests==2.31.0 # via coveralls six==1.16.0 # via tox -sqlparse==0.4.3 +sqlparse==0.4.4 # via django tomli==2.0.1 # via tox -tox==3.26.0 +tox==3.28.0 # via + # -c requirements/common_constraints.txt # -r requirements/ci.in # tox-battery tox-battery==0.6.1 # via -r requirements/ci.in -urllib3==1.26.12 +typing-extensions==4.7.1 + # via asgiref +urllib3==2.0.4 # via requests -virtualenv==20.16.5 +virtualenv==20.24.2 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index b1dfdf0..afe6aa8 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -19,9 +19,9 @@ Django<4.0 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html elasticsearch<7.14.0 -# setuptools==60.0 had breaking changes and busted several service's pipeline. -# Details can be found here: https://github.com/pypa/setuptools/issues/2940 -setuptools<60 - # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected django-simple-history==3.0.0 + +# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. +# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 +tox<4.0.0 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index fa9c13f..1ea2c76 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -14,3 +14,5 @@ # Use latest Django LTS version Django<3.3.0 + +pylint==2.12.2 \ No newline at end of file diff --git a/requirements/dev.txt b/requirements/dev.txt index 7f3a6a2..f2d31b3 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,48 +1,44 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # appdirs==1.4.4 # via fs arrow==1.2.3 - # via jinja2-time -asgiref==3.5.2 + # via cookiecutter +asgiref==3.7.2 # via django astroid==2.9.3 # via # pylint # pylint-celery -attrs==22.1.0 - # via pytest -backports-functools-lru-cache==1.6.4 +backports-functools-lru-cache==1.6.6 # via caniusepython3 binaryornot==0.4.4 # via cookiecutter -bok-choy==1.1.1 +bok-choy==2.0.2 # via -r requirements/test.in -boto==2.49.0 - # via xblock-sdk -boto3==1.25.0 +boto3==1.28.18 # via fs-s3fs -botocore==1.28.0 +botocore==1.31.18 # via # boto3 # s3transfer -build==0.8.0 +build==0.10.0 # via pip-tools caniusepython3==7.3.0 # via -r requirements/quality.in -certifi==2022.9.24 +certifi==2023.7.22 # via requests -chardet==5.0.0 +chardet==5.2.0 # via # binaryornot # diff-cover -charset-normalizer==2.1.1 +charset-normalizer==3.2.0 # via requests -click==8.1.3 +click==8.1.6 # via # click-log # code-annotations @@ -51,9 +47,9 @@ click==8.1.3 # pip-tools click-log==0.4.0 # via edx-lint -code-annotations==1.3.0 +code-annotations==1.5.0 # via edx-lint -cookiecutter==2.1.1 +cookiecutter==2.2.3 # via xblock-sdk coverage[toml]==6.5.0 # via @@ -63,54 +59,50 @@ coveralls==3.3.1 # via -r requirements/travis.in ddt==1.6.0 # via -r requirements/test.in -diff-cover==7.0.1 +diff-cover==7.7.0 # via -r requirements/dev.in -distlib==0.3.6 +distlib==0.3.7 # via # caniusepython3 # virtualenv -django==3.2.16 +django==3.2.20 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.in - # django-pyfs # edx-i18n-tools - # xblock-sdk -django-pyfs==3.2.0 - # via - # xblock + # openedx-django-pyfs # xblock-sdk docopt==0.6.2 # via coveralls -edx-i18n-tools==0.9.2 +edx-i18n-tools==1.1.0 # via -r requirements/travis.in -edx-lint==5.3.0 +edx-lint==5.3.4 # via -r requirements/quality.in -exceptiongroup==1.0.0rc9 +exceptiongroup==1.1.2 # via pytest -filelock==3.8.0 +filelock==3.12.2 # via # tox # virtualenv fs==2.4.16 # via - # django-pyfs # fs-s3fs + # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via - # django-pyfs + # openedx-django-pyfs # xblock-sdk -gitdb==4.0.9 +gitdb==4.0.10 # via gitpython -gitpython==3.1.29 +gitpython==3.1.32 # via transifex-client idna==3.4 # via requests -iniconfig==1.1.1 +iniconfig==2.0.0 # via pytest -isort==5.10.1 +isort==5.12.0 # via # -r requirements/quality.in # pylint @@ -119,9 +111,6 @@ jinja2==3.1.2 # code-annotations # cookiecutter # diff-cover - # jinja2-time -jinja2-time==0.2.0 - # via cookiecutter jmespath==1.0.1 # via # boto3 @@ -130,63 +119,63 @@ lazy==1.5 # via # bok-choy # xblock - # xblock-sdk -lazy-object-proxy==1.7.1 +lazy-object-proxy==1.9.0 # via astroid -lxml==4.9.1 +lxml==4.9.3 # via # xblock # xblock-sdk -mako==1.2.3 +mako==1.2.4 # via # -r requirements/base.in # xblock-utils -markupsafe==2.1.1 +markupsafe==2.1.3 # via # jinja2 # mako # xblock mccabe==0.6.1 # via pylint -mock==4.0.3 +mock==5.1.0 # via -r requirements/test.in nose==1.3.7 # via -r requirements/test.in -packaging==21.3 +openedx-django-pyfs==3.4.0 + # via xblock +packaging==23.1 # via # build # caniusepython3 # pytest # tox -path==16.5.0 +path==16.7.1 # via edx-i18n-tools -pbr==5.11.0 +pbr==5.11.1 # via stevedore -pep517==0.13.0 - # via build -pip-tools==6.9.0 +pip-tools==7.2.0 # via -r requirements/dev.in -platformdirs==2.5.2 +platformdirs==3.10.0 # via # pylint # virtualenv -pluggy==1.0.0 +pluggy==1.2.0 # via # diff-cover # pytest # tox -polib==1.1.1 +polib==1.2.0 # via edx-i18n-tools py==1.11.0 # via tox -pycodestyle==2.9.1 +pycodestyle==2.11.0 # via -r requirements/quality.in -pydocstyle==6.1.1 +pydocstyle==6.3.0 # via -r requirements/quality.in -pygments==2.13.0 +pygments==2.15.1 # via diff-cover pylint==2.12.2 # via + # -c requirements/constraints.txt # edx-lint # pylint-celery # pylint-django @@ -195,22 +184,22 @@ pylint-celery==0.3 # via edx-lint pylint-django==2.5.3 # via edx-lint -pylint-plugin-utils==0.7 +pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pyparsing==3.0.9 - # via packaging pypng==0.20220715.0 # via # -r requirements/dev.in # xblock-sdk -pytest==7.2.0 +pyproject-hooks==1.0.0 + # via build +pytest==7.4.0 # via # -r requirements/test.in # pytest-cov # pytest-django -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/test.in pytest-django==4.5.2 # via -r requirements/test.in @@ -224,17 +213,17 @@ python-slugify==4.0.1 # code-annotations # cookiecutter # transifex-client -pytz==2022.5 +pytz==2023.3 # via # django # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # code-annotations # cookiecutter # edx-i18n-tools # xblock -requests==2.28.1 +requests==2.31.0 # via # -r requirements/base.in # caniusepython3 @@ -242,17 +231,16 @@ requests==2.28.1 # coveralls # transifex-client # xblock-sdk -s3transfer==0.6.0 +s3transfer==0.6.1 # via boto3 selenium==3.141.0 # via bok-choy -simplejson==3.17.6 +simplejson==3.19.1 # via # xblock-sdk # xblock-utils six==1.16.0 # via - # bok-choy # edx-lint # fs # fs-s3fs @@ -263,9 +251,9 @@ smmap==5.0.0 # via gitdb snowballstemmer==2.2.0 # via pydocstyle -sqlparse==0.4.3 +sqlparse==0.4.4 # via django -stevedore==4.1.0 +stevedore==5.1.0 # via code-annotations text-unidecode==1.3 # via python-slugify @@ -275,30 +263,33 @@ tomli==2.0.1 # via # build # coverage - # pep517 + # pip-tools + # pyproject-hooks # pytest # tox -tox==3.26.0 +tox==3.28.0 # via + # -c requirements/common_constraints.txt # -r requirements/travis.in # tox-battery tox-battery==0.6.1 # via -r requirements/travis.in transifex-client==0.14.4 # via -r requirements/dev.in -typing-extensions==4.4.0 +typing-extensions==4.7.1 # via + # asgiref # astroid # pylint -urllib3==1.26.12 +urllib3==1.26.16 # via # botocore # requests # selenium # transifex-client -virtualenv==20.16.5 +virtualenv==20.24.2 # via tox -web-fragments==2.0.0 +web-fragments==2.1.0 # via # xblock # xblock-sdk @@ -307,20 +298,20 @@ webob==1.8.7 # via # xblock # xblock-sdk -wheel==0.37.1 +wheel==0.41.0 # via pip-tools wrapt==1.13.3 # via astroid -xblock[django]==1.6.1 +xblock[django]==1.6.2 # via # -r requirements/base.in # xblock-sdk # xblock-utils -xblock-sdk==0.5.1 +xblock-sdk==0.7.0 # via # -r requirements/dev.in # -r requirements/test.in -xblock-utils==3.0.0 +xblock-utils==3.3.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/django.txt b/requirements/django.txt index e92ee8e..480c078 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==3.2.16 +django==3.2.20 diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index ad0968f..8167e08 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,26 +1,25 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -build==0.8.0 +build==0.10.0 # via pip-tools -click==8.1.3 +click==8.1.6 # via pip-tools -packaging==21.3 +packaging==23.1 # via build -pep517==0.13.0 - # via build -pip-tools==6.9.0 +pip-tools==7.2.0 # via -r requirements/pip-tools.in -pyparsing==3.0.9 - # via packaging +pyproject-hooks==1.0.0 + # via build tomli==2.0.1 # via # build - # pep517 -wheel==0.37.1 + # pip-tools + # pyproject-hooks +wheel==0.41.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index e50ba06..fb1908e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,16 +1,14 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -wheel==0.37.1 +wheel==0.41.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==22.3 +pip==23.2.1 + # via -r requirements/pip.in +setuptools==68.0.0 # via -r requirements/pip.in -setuptools==59.8.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index cf60511..b2e1474 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -1,48 +1,44 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # appdirs==1.4.4 # via fs arrow==1.2.3 - # via jinja2-time -asgiref==3.5.2 + # via cookiecutter +asgiref==3.7.2 # via django astroid==2.9.3 # via # pylint # pylint-celery -attrs==22.1.0 - # via pytest -backports-functools-lru-cache==1.6.4 +backports-functools-lru-cache==1.6.6 # via caniusepython3 binaryornot==0.4.4 # via cookiecutter -bok-choy==1.1.1 +bok-choy==2.0.2 # via -r requirements/test.in -boto==2.49.0 - # via xblock-sdk -boto3==1.25.0 +boto3==1.28.18 # via fs-s3fs -botocore==1.28.0 +botocore==1.31.18 # via # boto3 # s3transfer -build==0.8.0 +build==0.10.0 # via pip-tools caniusepython3==7.3.0 # via -r requirements/quality.in -certifi==2022.9.24 +certifi==2023.7.22 # via requests -chardet==5.0.0 +chardet==5.2.0 # via # binaryornot # diff-cover -charset-normalizer==2.1.1 +charset-normalizer==3.2.0 # via requests -click==8.1.3 +click==8.1.6 # via # click-log # code-annotations @@ -51,51 +47,47 @@ click==8.1.3 # pip-tools click-log==0.4.0 # via edx-lint -code-annotations==1.3.0 +code-annotations==1.5.0 # via edx-lint -cookiecutter==2.1.1 +cookiecutter==2.2.3 # via xblock-sdk -coverage[toml]==6.5.0 +coverage[toml]==7.2.7 # via pytest-cov ddt==1.6.0 # via -r requirements/test.in -diff-cover==7.0.1 +diff-cover==7.7.0 # via -r requirements/dev.in -distlib==0.3.6 +distlib==0.3.7 # via caniusepython3 -django==3.2.16 +django==3.2.20 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.in - # django-pyfs + # openedx-django-pyfs # xblock-sdk -django-pyfs==3.2.0 - # via - # xblock - # xblock-sdk -edx-lint==5.3.0 +edx-lint==5.3.4 # via -r requirements/quality.in -exceptiongroup==1.0.0rc9 +exceptiongroup==1.1.2 # via pytest fs==2.4.16 # via - # django-pyfs # fs-s3fs + # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via - # django-pyfs + # openedx-django-pyfs # xblock-sdk -gitdb==4.0.9 +gitdb==4.0.10 # via gitpython -gitpython==3.1.29 +gitpython==3.1.32 # via transifex-client idna==3.4 # via requests -iniconfig==1.1.1 +iniconfig==2.0.0 # via pytest -isort==5.10.1 +isort==5.12.0 # via # -r requirements/quality.in # pylint @@ -104,9 +96,6 @@ jinja2==3.1.2 # code-annotations # cookiecutter # diff-cover - # jinja2-time -jinja2-time==0.2.0 - # via cookiecutter jmespath==1.0.1 # via # boto3 @@ -115,53 +104,53 @@ lazy==1.5 # via # bok-choy # xblock - # xblock-sdk -lazy-object-proxy==1.7.1 +lazy-object-proxy==1.9.0 # via astroid -lxml==4.9.1 +lxml==4.9.3 # via # xblock # xblock-sdk -mako==1.2.3 +mako==1.2.4 # via # -r requirements/base.in # xblock-utils -markupsafe==2.1.1 +markupsafe==2.1.3 # via # jinja2 # mako # xblock mccabe==0.6.1 # via pylint -mock==4.0.3 +mock==5.1.0 # via -r requirements/test.in nose==1.3.7 # via -r requirements/test.in -packaging==21.3 +openedx-django-pyfs==3.4.0 + # via xblock +packaging==23.1 # via # build # caniusepython3 # pytest -pbr==5.11.0 +pbr==5.11.1 # via stevedore -pep517==0.13.0 - # via build -pip-tools==6.9.0 +pip-tools==7.2.0 # via -r requirements/dev.in -platformdirs==2.5.2 +platformdirs==3.10.0 # via pylint -pluggy==1.0.0 +pluggy==1.2.0 # via # diff-cover # pytest -pycodestyle==2.9.1 +pycodestyle==2.11.0 # via -r requirements/quality.in -pydocstyle==6.1.1 +pydocstyle==6.3.0 # via -r requirements/quality.in -pygments==2.13.0 +pygments==2.15.1 # via diff-cover pylint==2.12.2 # via + # -c requirements/constraints.txt # edx-lint # pylint-celery # pylint-django @@ -170,22 +159,22 @@ pylint-celery==0.3 # via edx-lint pylint-django==2.5.3 # via edx-lint -pylint-plugin-utils==0.7 +pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pyparsing==3.0.9 - # via packaging pypng==0.20220715.0 # via # -r requirements/dev.in # xblock-sdk -pytest==7.2.0 +pyproject-hooks==1.0.0 + # via build +pytest==7.4.0 # via # -r requirements/test.in # pytest-cov # pytest-django -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/test.in pytest-django==4.5.2 # via -r requirements/test.in @@ -199,33 +188,32 @@ python-slugify==4.0.1 # code-annotations # cookiecutter # transifex-client -pytz==2022.5 +pytz==2023.3 # via # django # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # code-annotations # cookiecutter # xblock -requests==2.28.1 +requests==2.31.0 # via # -r requirements/base.in # caniusepython3 # cookiecutter # transifex-client # xblock-sdk -s3transfer==0.6.0 +s3transfer==0.6.1 # via boto3 selenium==3.141.0 # via bok-choy -simplejson==3.17.6 +simplejson==3.19.1 # via # xblock-sdk # xblock-utils six==1.16.0 # via - # bok-choy # edx-lint # fs # fs-s3fs @@ -235,9 +223,9 @@ smmap==5.0.0 # via gitdb snowballstemmer==2.2.0 # via pydocstyle -sqlparse==0.4.3 +sqlparse==0.4.4 # via django -stevedore==4.1.0 +stevedore==5.1.0 # via code-annotations text-unidecode==1.3 # via python-slugify @@ -247,21 +235,23 @@ tomli==2.0.1 # via # build # coverage - # pep517 + # pip-tools + # pyproject-hooks # pytest transifex-client==0.14.4 # via -r requirements/dev.in -typing-extensions==4.4.0 +typing-extensions==4.7.1 # via + # asgiref # astroid # pylint -urllib3==1.26.12 +urllib3==1.26.16 # via # botocore # requests # selenium # transifex-client -web-fragments==2.0.0 +web-fragments==2.1.0 # via # xblock # xblock-sdk @@ -270,20 +260,20 @@ webob==1.8.7 # via # xblock # xblock-sdk -wheel==0.37.1 +wheel==0.41.0 # via pip-tools wrapt==1.13.3 # via astroid -xblock[django]==1.6.1 +xblock[django]==1.6.2 # via # -r requirements/base.in # xblock-sdk # xblock-utils -xblock-sdk==0.5.1 +xblock-sdk==0.7.0 # via # -r requirements/dev.in # -r requirements/test.in -xblock-utils==3.0.0 +xblock-utils==3.3.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index bdb0889..8f2e505 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,87 +1,76 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # appdirs==1.4.4 # via fs arrow==1.2.3 - # via jinja2-time -asgiref==3.5.2 + # via cookiecutter +asgiref==3.7.2 # via django -attrs==22.1.0 - # via pytest binaryornot==0.4.4 # via cookiecutter -bok-choy==1.1.1 +bok-choy==2.0.2 # via -r requirements/test.in -boto==2.49.0 - # via xblock-sdk -boto3==1.25.0 +boto3==1.28.18 # via fs-s3fs -botocore==1.28.0 +botocore==1.31.18 # via # boto3 # s3transfer -build==0.8.0 +build==0.10.0 # via pip-tools -certifi==2022.9.24 +certifi==2023.7.22 # via requests -chardet==5.0.0 +chardet==5.2.0 # via # binaryornot # diff-cover -charset-normalizer==2.1.1 +charset-normalizer==3.2.0 # via requests -click==8.1.3 +click==8.1.6 # via # cookiecutter # pip-tools -cookiecutter==2.1.1 +cookiecutter==2.2.3 # via xblock-sdk -coverage[toml]==6.5.0 +coverage[toml]==7.2.7 # via pytest-cov ddt==1.6.0 # via -r requirements/test.in -diff-cover==7.0.1 +diff-cover==7.7.0 # via -r requirements/dev.in # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.in - # django-pyfs - # xblock-sdk -django-pyfs==3.2.0 - # via - # xblock + # openedx-django-pyfs # xblock-sdk -exceptiongroup==1.0.0rc9 +exceptiongroup==1.1.2 # via pytest fs==2.4.16 # via - # django-pyfs # fs-s3fs + # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via - # django-pyfs + # openedx-django-pyfs # xblock-sdk -gitdb==4.0.9 +gitdb==4.0.10 # via gitpython -gitpython==3.1.29 +gitpython==3.1.32 # via transifex-client idna==3.4 # via requests -iniconfig==1.1.1 +iniconfig==2.0.0 # via pytest jinja2==3.1.2 # via # cookiecutter # diff-cover - # jinja2-time -jinja2-time==0.2.0 - # via cookiecutter jmespath==1.0.1 # via # boto3 @@ -90,50 +79,49 @@ lazy==1.5 # via # bok-choy # xblock - # xblock-sdk -lxml==4.9.1 +lxml==4.9.3 # via # xblock # xblock-sdk -mako==1.2.3 +mako==1.2.4 # via # -r requirements/base.in # xblock-utils -markupsafe==2.1.1 +markupsafe==2.1.3 # via # jinja2 # mako # xblock -mock==4.0.3 +mock==5.1.0 # via -r requirements/test.in nose==1.3.7 # via -r requirements/test.in -packaging==21.3 +openedx-django-pyfs==3.4.0 + # via xblock +packaging==23.1 # via # build # pytest -pep517==0.13.0 - # via build -pip-tools==6.9.0 +pip-tools==7.2.0 # via -r requirements/dev.in -pluggy==1.0.0 +pluggy==1.2.0 # via # diff-cover # pytest -pygments==2.13.0 +pygments==2.15.1 # via diff-cover -pyparsing==3.0.9 - # via packaging pypng==0.20220715.0 # via # -r requirements/dev.in # xblock-sdk -pytest==7.2.0 +pyproject-hooks==1.0.0 + # via build +pytest==7.4.0 # via # -r requirements/test.in # pytest-cov # pytest-django -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/test.in pytest-django==4.5.2 # via -r requirements/test.in @@ -146,38 +134,37 @@ python-slugify==4.0.1 # via # cookiecutter # transifex-client -pytz==2022.5 +pytz==2023.3 # via # django # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # cookiecutter # xblock -requests==2.28.1 +requests==2.31.0 # via # -r requirements/base.in # cookiecutter # transifex-client # xblock-sdk -s3transfer==0.6.0 +s3transfer==0.6.1 # via boto3 selenium==3.141.0 # via bok-choy -simplejson==3.17.6 +simplejson==3.19.1 # via # xblock-sdk # xblock-utils six==1.16.0 # via - # bok-choy # fs # fs-s3fs # python-dateutil # transifex-client smmap==5.0.0 # via gitdb -sqlparse==0.4.3 +sqlparse==0.4.4 # via django text-unidecode==1.3 # via python-slugify @@ -185,17 +172,20 @@ tomli==2.0.1 # via # build # coverage - # pep517 + # pip-tools + # pyproject-hooks # pytest transifex-client==0.14.4 # via -r requirements/dev.in -urllib3==1.26.12 +typing-extensions==4.7.1 + # via asgiref +urllib3==1.26.16 # via # botocore # requests # selenium # transifex-client -web-fragments==2.0.0 +web-fragments==2.1.0 # via # xblock # xblock-sdk @@ -204,18 +194,18 @@ webob==1.8.7 # via # xblock # xblock-sdk -wheel==0.37.1 +wheel==0.41.0 # via pip-tools -xblock[django]==1.6.1 +xblock[django]==1.6.2 # via # -r requirements/base.in # xblock-sdk # xblock-utils -xblock-sdk==0.5.1 +xblock-sdk==0.7.0 # via # -r requirements/dev.in # -r requirements/test.in -xblock-utils==3.0.0 +xblock-utils==3.3.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/travis.txt b/requirements/travis.txt index 3f82a49..ca0c54a 100644 --- a/requirements/travis.txt +++ b/requirements/travis.txt @@ -1,69 +1,70 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -asgiref==3.5.2 +asgiref==3.7.2 # via django -certifi==2022.9.24 +certifi==2023.7.22 # via requests -charset-normalizer==2.1.1 +charset-normalizer==3.2.0 # via requests coverage==6.5.0 # via coveralls coveralls==3.3.1 # via -r requirements/travis.in -distlib==0.3.6 +distlib==0.3.7 # via virtualenv -django==3.2.16 +django==3.2.20 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt # edx-i18n-tools docopt==0.6.2 # via coveralls -edx-i18n-tools==0.9.2 +edx-i18n-tools==1.0.0 # via -r requirements/travis.in -filelock==3.8.0 +filelock==3.12.2 # via # tox # virtualenv idna==3.4 # via requests -packaging==21.3 +packaging==23.1 # via tox -path==16.5.0 +path==16.7.1 # via edx-i18n-tools platformdirs==2.5.2 # via virtualenv -pluggy==1.0.0 +pluggy==1.2.0 # via tox -polib==1.1.1 +polib==1.2.0 # via edx-i18n-tools py==1.11.0 # via tox -pyparsing==3.0.9 - # via packaging -pytz==2022.5 +pytz==2023.3 # via django -pyyaml==6.0 +pyyaml==6.0.1 # via edx-i18n-tools -requests==2.28.1 +requests==2.31.0 # via coveralls six==1.16.0 # via tox -sqlparse==0.4.3 +sqlparse==0.4.4 # via django tomli==2.0.1 # via tox -tox==3.26.0 +tox==3.28.0 # via + # -c requirements/common_constraints.txt # -r requirements/travis.in # tox-battery tox-battery==0.6.1 # via -r requirements/travis.in -urllib3==1.26.12 +typing-extensions==4.7.1 + # via asgiref +urllib3==2.0.4 # via requests -virtualenv==20.16.5 +virtualenv==20.24.2 # via tox diff --git a/setup.py b/setup.py index b7e71bd..b909baf 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ def package_data(pkg, roots): setup( name='xblock-google-drive', - version='0.3.0', + version='0.4.0', description='An XBlock which allows embedding of Google documents and calendar within an edX course', packages=[ 'google_drive', diff --git a/tox.ini b/tox.ini index 908bc9d..2f7e033 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32},quality +envlist = py38-django{32,42},quality [pycodestyle] exclude = .git,.tox @@ -19,16 +19,16 @@ whitelist_externals = mkdir rm deps = - django31: Django>=3.1,<3.2 django32: Django>=3.2,<4.0 + django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt passenv = BOKCHOY_HEADLESS -setenv = +setenv = DJANGO_SETTINGS_MODULE = workbench.settings SCREENSHOT_DIR={toxinidir}/var/logs SELENIUM_DRIVER_LOG_DIR={toxinidir}/var/logs -commands = +commands = mkdir -p {toxinidir}/var/logs rm -rf {toxinidir}/var/logs/* pytest {posargs}