diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 534fbd3..648bab1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: matrix: os: [ubuntu-20.04] python-version: [3.8] - toxenv: [django32-nutmeg, django32-latest, django41-latest, quality, pii_check] + toxenv: [django32-nutmeg, django32-latest, django42-latest, quality, pii_check] steps: - name: checkout repo diff --git a/.gitignore b/.gitignore index f139045..ef8a3d8 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ pip-log.txt coverage.xml htmlcov/ diff-cover.html +pii_report # Translations *.mo diff --git a/requirements/base.in b/requirements/base.in index f1e30f2..537a84b 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -2,5 +2,6 @@ -c constraints.txt xblock-utils +xblock[django] # xblock-utils is not installing openedx-django-pyfs bleach[css] Django diff --git a/requirements/base.txt b/requirements/base.txt index b1c2c12..86826ba 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -10,11 +10,29 @@ asgiref==3.7.2 # via django bleach[css]==6.0.0 # via -r requirements/base.in +boto3==1.28.21 + # via fs-s3fs +botocore==1.31.21 + # via + # boto3 + # s3transfer django==3.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in + # openedx-django-pyfs fs==2.4.16 + # via + # fs-s3fs + # openedx-django-pyfs + # xblock +fs-s3fs==1.1.1 + # via openedx-django-pyfs +jmespath==1.0.1 + # via + # boto3 + # botocore +lazy==1.5 # via xblock lxml==4.9.3 # via xblock @@ -24,20 +42,27 @@ markupsafe==2.1.3 # via # mako # xblock -python-dateutil==2.8.2 +openedx-django-pyfs==3.4.0 # via xblock +python-dateutil==2.8.2 + # via + # botocore + # xblock pytz==2023.3 # via # django # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via xblock +s3transfer==0.6.1 + # via boto3 simplejson==3.19.1 # via xblock-utils six==1.16.0 # via # bleach # fs + # fs-s3fs # python-dateutil sqlparse==0.4.4 # via django @@ -45,7 +70,9 @@ tinycss2==1.1.1 # via bleach typing-extensions==4.7.1 # via asgiref -web-fragments==2.0.0 +urllib3==1.26.16 + # via botocore +web-fragments==2.1.0 # via # xblock # xblock-utils @@ -55,9 +82,11 @@ webencodings==0.5.1 # tinycss2 webob==1.8.7 # via xblock -xblock==1.6.2 - # via xblock-utils -xblock-utils==3.2.0 +xblock[django]==1.7.0 + # via + # -r requirements/base.in + # xblock-utils +xblock-utils==3.4.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/ci.txt b/requirements/ci.txt index fee68c1..b43d9e2 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,7 +4,7 @@ # # make upgrade # -distlib==0.3.6 +distlib==0.3.7 # via virtualenv filelock==3.12.2 # via @@ -12,7 +12,7 @@ filelock==3.12.2 # virtualenv packaging==23.1 # via tox -platformdirs==3.9.1 +platformdirs==3.10.0 # via virtualenv pluggy==1.2.0 # via tox @@ -29,5 +29,5 @@ tox==3.28.0 # tox-battery tox-battery==0.6.1 # via -r requirements/ci.in -virtualenv==20.24.0 +virtualenv==20.24.2 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 659d6b7..657acfc 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -27,11 +27,11 @@ binaryornot==0.4.4 # cookiecutter bleach[css]==6.0.0 # via -r requirements/quality.txt -boto3==1.28.3 +boto3==1.28.21 # via # -r requirements/quality.txt # fs-s3fs -botocore==1.31.3 +botocore==1.31.21 # via # -r requirements/quality.txt # boto3 @@ -40,11 +40,11 @@ build==0.10.0 # via # -r requirements/pip-tools.txt # pip-tools -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/quality.txt # requests -chardet==5.1.0 +chardet==5.2.0 # via # -r requirements/quality.txt # binaryornot @@ -52,7 +52,7 @@ charset-normalizer==3.2.0 # via # -r requirements/quality.txt # requests -click==8.1.5 +click==8.1.6 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt @@ -65,11 +65,11 @@ click-log==0.4.0 # via # -r requirements/quality.txt # edx-lint -code-annotations==1.3.0 +code-annotations==1.5.0 # via # -r requirements/quality.txt # edx-lint -cookiecutter==2.2.3 +cookiecutter==2.3.0 # via # -r requirements/quality.txt # xblock-sdk @@ -77,11 +77,11 @@ coverage[toml]==7.2.7 # via # -r requirements/quality.txt # pytest-cov -dill==0.3.6 +dill==0.3.7 # via # -r requirements/quality.txt # pylint -distlib==0.3.6 +distlib==0.3.7 # via # -r requirements/ci.txt # virtualenv @@ -92,7 +92,7 @@ django==3.2.20 # edx-i18n-tools # openedx-django-pyfs # xblock-sdk -edx-i18n-tools==1.0.0 +edx-i18n-tools==1.1.0 # via -r requirements/quality.txt edx-lint==5.3.4 # via -r requirements/quality.txt @@ -155,6 +155,10 @@ mako==1.2.4 # via # -r requirements/quality.txt # xblock-utils +markdown-it-py==3.0.0 + # via + # -r requirements/quality.txt + # rich markupsafe==2.1.3 # via # -r requirements/quality.txt @@ -165,6 +169,10 @@ mccabe==0.7.0 # via # -r requirements/quality.txt # pylint +mdurl==0.1.2 + # via + # -r requirements/quality.txt + # markdown-it-py mock==5.1.0 # via -r requirements/quality.txt openedx-django-pyfs==3.4.0 @@ -187,9 +195,9 @@ pbr==5.11.1 # via # -r requirements/quality.txt # stevedore -pip-tools==7.0.0 +pip-tools==7.2.0 # via -r requirements/pip-tools.txt -platformdirs==3.9.1 +platformdirs==3.10.0 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -209,11 +217,15 @@ py==1.11.0 # via # -r requirements/ci.txt # tox -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/quality.txt pydocstyle==6.3.0 # via -r requirements/quality.txt -pylint==2.17.4 +pygments==2.16.1 + # via + # -r requirements/quality.txt + # rich +pylint==2.17.5 # via # -r requirements/quality.txt # edx-lint @@ -266,7 +278,7 @@ pytz==2023.3 # -r requirements/quality.txt # django # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/quality.txt # code-annotations @@ -278,6 +290,10 @@ requests==2.31.0 # -r requirements/quality.txt # cookiecutter # xblock-sdk +rich==13.5.2 + # via + # -r requirements/quality.txt + # cookiecutter s3transfer==0.6.1 # via # -r requirements/quality.txt @@ -329,7 +345,7 @@ tomli==2.0.1 # pyproject-hooks # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via # -r requirements/quality.txt # pylint @@ -346,16 +362,17 @@ typing-extensions==4.7.1 # asgiref # astroid # pylint + # rich urllib3==1.26.16 # via # -r requirements/quality.txt # botocore # requests -virtualenv==20.24.0 +virtualenv==20.24.2 # via # -r requirements/ci.txt # tox -web-fragments==2.0.0 +web-fragments==2.1.0 # via # -r requirements/quality.txt # xblock @@ -371,7 +388,7 @@ webob==1.8.7 # -r requirements/quality.txt # xblock # xblock-sdk -wheel==0.40.0 +wheel==0.41.1 # via # -r requirements/pip-tools.txt # pip-tools @@ -379,14 +396,14 @@ wrapt==1.15.0 # via # -r requirements/quality.txt # astroid -xblock[django]==1.6.2 +xblock[django]==1.7.0 # via # -r requirements/quality.txt # xblock-sdk # xblock-utils -xblock-sdk==0.6.0 +xblock-sdk==0.7.0 # via -r requirements/quality.txt -xblock-utils==3.2.0 +xblock-utils==3.4.0 # via -r requirements/quality.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 81f46a7..ed274ee 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -6,11 +6,11 @@ # build==0.10.0 # via pip-tools -click==8.1.5 +click==8.1.6 # via pip-tools packaging==23.1 # via build -pip-tools==7.0.0 +pip-tools==7.2.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via build @@ -19,7 +19,7 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.40.0 +wheel==0.41.1 # 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 bd9fb55..5e2f760 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.40.0 +wheel==0.41.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.2 +pip==23.2.1 # via -r requirements/pip.in setuptools==68.0.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index ddb7fab..ffde6a9 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -26,20 +26,20 @@ binaryornot==0.4.4 # cookiecutter bleach[css]==6.0.0 # via -r requirements/test.txt -boto3==1.28.3 +boto3==1.28.21 # via # -r requirements/test.txt # fs-s3fs -botocore==1.31.3 +botocore==1.31.21 # via # -r requirements/test.txt # boto3 # s3transfer -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/test.txt # requests -chardet==5.1.0 +chardet==5.2.0 # via # -r requirements/test.txt # binaryornot @@ -47,7 +47,7 @@ charset-normalizer==3.2.0 # via # -r requirements/test.txt # requests -click==8.1.5 +click==8.1.6 # via # -r requirements/test.txt # click-log @@ -56,11 +56,11 @@ click==8.1.5 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.3.0 +code-annotations==1.5.0 # via # -r requirements/test.txt # edx-lint -cookiecutter==2.2.3 +cookiecutter==2.3.0 # via # -r requirements/test.txt # xblock-sdk @@ -68,7 +68,7 @@ coverage[toml]==7.2.7 # via # -r requirements/test.txt # pytest-cov -dill==0.3.6 +dill==0.3.7 # via pylint django==3.2.20 # via @@ -77,7 +77,7 @@ django==3.2.20 # edx-i18n-tools # openedx-django-pyfs # xblock-sdk -edx-i18n-tools==1.0.0 +edx-i18n-tools==1.1.0 # via -r requirements/test.txt edx-lint==5.3.4 # via -r requirements/quality.in @@ -133,6 +133,10 @@ mako==1.2.4 # via # -r requirements/test.txt # xblock-utils +markdown-it-py==3.0.0 + # via + # -r requirements/test.txt + # rich markupsafe==2.1.3 # via # -r requirements/test.txt @@ -141,6 +145,10 @@ markupsafe==2.1.3 # xblock mccabe==0.7.0 # via pylint +mdurl==0.1.2 + # via + # -r requirements/test.txt + # markdown-it-py mock==5.1.0 # via -r requirements/test.txt openedx-django-pyfs==3.4.0 @@ -159,7 +167,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.9.1 +platformdirs==3.10.0 # via pylint pluggy==1.2.0 # via @@ -169,11 +177,15 @@ polib==1.2.0 # via # -r requirements/test.txt # edx-i18n-tools -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/quality.in pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==2.17.4 +pygments==2.16.1 + # via + # -r requirements/test.txt + # rich +pylint==2.17.5 # via # edx-lint # pylint-celery @@ -216,7 +228,7 @@ pytz==2023.3 # -r requirements/test.txt # django # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/test.txt # code-annotations @@ -228,6 +240,10 @@ requests==2.31.0 # -r requirements/test.txt # cookiecutter # xblock-sdk +rich==13.5.2 + # via + # -r requirements/test.txt + # cookiecutter s3transfer==0.6.1 # via # -r requirements/test.txt @@ -269,7 +285,7 @@ tomli==2.0.1 # coverage # pylint # pytest -tomlkit==0.11.8 +tomlkit==0.12.1 # via pylint typing-extensions==4.7.1 # via @@ -277,12 +293,13 @@ typing-extensions==4.7.1 # asgiref # astroid # pylint + # rich urllib3==1.26.16 # via # -r requirements/test.txt # botocore # requests -web-fragments==2.0.0 +web-fragments==2.1.0 # via # -r requirements/test.txt # xblock @@ -300,14 +317,14 @@ webob==1.8.7 # xblock-sdk wrapt==1.15.0 # via astroid -xblock[django]==1.6.2 +xblock[django]==1.7.0 # via # -r requirements/test.txt # xblock-sdk # xblock-utils -xblock-sdk==0.6.0 +xblock-sdk==0.7.0 # via -r requirements/test.txt -xblock-utils==3.2.0 +xblock-utils==3.4.0 # via -r requirements/test.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index b28dd8e..fb9a00a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -17,25 +17,28 @@ asgiref==3.7.2 binaryornot==0.4.4 # via cookiecutter # via -r requirements/base.txt -boto3==1.28.3 - # via fs-s3fs -botocore==1.31.3 +boto3==1.28.21 # via + # -r requirements/base.txt + # fs-s3fs +botocore==1.31.21 + # via + # -r requirements/base.txt # boto3 # s3transfer -certifi==2023.5.7 +certifi==2023.7.22 # via requests -chardet==5.1.0 +chardet==5.2.0 # via binaryornot charset-normalizer==3.2.0 # via requests -click==8.1.5 +click==8.1.6 # via # code-annotations # cookiecutter -code-annotations==1.3.0 +code-annotations==1.5.0 # via -r requirements/test.in -cookiecutter==2.2.3 +cookiecutter==2.3.0 # via xblock-sdk coverage[toml]==7.2.7 # via pytest-cov @@ -45,7 +48,7 @@ coverage[toml]==7.2.7 # edx-i18n-tools # openedx-django-pyfs # xblock-sdk -edx-i18n-tools==1.0.0 +edx-i18n-tools==1.1.0 # via -r requirements/test.in exceptiongroup==1.1.2 # via pytest @@ -57,6 +60,7 @@ fs==2.4.16 # xblock fs-s3fs==1.1.1 # via + # -r requirements/base.txt # openedx-django-pyfs # xblock-sdk idna==3.4 @@ -69,10 +73,13 @@ jinja2==3.1.2 # cookiecutter jmespath==1.0.1 # via + # -r requirements/base.txt # boto3 # botocore lazy==1.5 - # via xblock + # via + # -r requirements/base.txt + # xblock lxml==4.9.3 # via # -r requirements/base.txt @@ -82,16 +89,22 @@ mako==1.2.4 # via # -r requirements/base.txt # xblock-utils +markdown-it-py==3.0.0 + # via rich markupsafe==2.1.3 # via # -r requirements/base.txt # jinja2 # mako # xblock +mdurl==0.1.2 + # via markdown-it-py mock==5.1.0 # via -r requirements/test.in openedx-django-pyfs==3.4.0 - # via xblock + # via + # -r requirements/base.txt + # xblock packaging==23.1 # via pytest path==16.7.1 @@ -102,6 +115,8 @@ pluggy==1.2.0 # via pytest polib==1.2.0 # via edx-i18n-tools +pygments==2.16.1 + # via rich pypng==0.20220715.0 # via xblock-sdk pytest==7.4.0 @@ -127,7 +142,7 @@ pytz==2023.3 # -r requirements/base.txt # django # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/base.txt # code-annotations @@ -138,8 +153,12 @@ requests==2.31.0 # via # cookiecutter # xblock-sdk +rich==13.5.2 + # via cookiecutter s3transfer==0.6.1 - # via boto3 + # via + # -r requirements/base.txt + # boto3 simplejson==3.19.1 # via # -r requirements/base.txt @@ -172,11 +191,13 @@ typing-extensions==4.7.1 # via # -r requirements/base.txt # asgiref + # rich urllib3==1.26.16 # via + # -r requirements/base.txt # botocore # requests -web-fragments==2.0.0 +web-fragments==2.1.0 # via # -r requirements/base.txt # xblock @@ -192,14 +213,14 @@ webob==1.8.7 # -r requirements/base.txt # xblock # xblock-sdk -xblock[django]==1.6.2 +xblock[django]==1.7.0 # via # -r requirements/base.txt # xblock-sdk # xblock-utils -xblock-sdk==0.6.0 +xblock-sdk==0.7.0 # via -r requirements/test.in -xblock-utils==3.2.0 +xblock-utils==3.4.0 # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/tox.ini b/tox.ini index 547c273..228cd3a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = django{32,41}-{nutmeg,latest} +envlist = django{32,41}-{nutmeg,latest},quality,pii_check [pycodestyle] exclude = .git,.tox,migrations @@ -37,7 +37,7 @@ allowlist_externals = mkdir deps = django32: Django>=3.2,<4.0 - django41: Django>=4.1,<4.2 + django42: Django>=4.2,<5.0 nutmeg: bleach[css]==5.0.0 latest: bleach[css] -r{toxinidir}/requirements/test.txt