diff --git a/.gitignore b/.gitignore index f8817de..860defc 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,7 @@ venv/ node_modules/ -.tox \ No newline at end of file +.tox + +# transifex exe +tx diff --git a/Makefile b/Makefile index e2eea28..745b639 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .DEFAULT_GOAL := help .PHONY: clean dev.clean dev.build dev.run test quality requirements \ - quality-python test-js test-python + quality-python test-js test-python install_transifex_client REPO_NAME := staff_graded-xblock PACKAGE_NAME := staff_graded @@ -96,3 +96,7 @@ test-js: ## run tests using npm -npm test test: test-js test-python ## run tests + +install_transifex_client: ## Install the Transifex client + curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash + git checkout -- LICENSE README.md diff --git a/requirements/base.txt b/requirements/base.txt index 37e1817..b4e9f05 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,33 +4,36 @@ # # make upgrade # -amqp==5.0.9 +amqp==5.1.1 # via kombu appdirs==1.4.4 # via fs -asgiref==3.5.0 +asgiref==3.5.2 # via django billiard==3.6.4.0 # via celery -celery==5.2.3 +celery==5.2.6 # via edx-celeryutils -certifi==2021.10.8 +certifi==2022.5.18.1 # via requests +cffi==1.15.0 + # via pynacl charset-normalizer==2.0.12 # via requests -click==8.0.3 +click==8.1.3 # via # celery # click-didyoumean # click-plugins # click-repl + # edx-django-utils click-didyoumean==0.3.0 # via celery click-plugins==1.1.1 # via celery click-repl==0.2.0 # via celery -django==3.2.12 +django==3.2.13 # via # -c requirements/common_constraints.txt # django-crum @@ -50,7 +53,7 @@ django-model-utils==4.2.0 # edx-bulk-grades # edx-celeryutils # super-csv -django-waffle==2.3.0 +django-waffle==2.4.1 # via edx-django-utils djangorestframework==3.13.1 # via super-csv @@ -58,54 +61,57 @@ edx-bulk-grades==1.0.0 # via -r requirements/base.in edx-celeryutils==1.2.1 # via super-csv -edx-django-utils==4.5.0 +edx-django-utils==5.0.0 # via super-csv edx-opaque-keys==2.3.0 # via edx-bulk-grades -fs==2.4.15 +fs==2.4.16 # via xblock future==0.18.2 # via edx-celeryutils idna==3.3 # via requests -importlib-metadata==4.11.1 +importlib-metadata==4.11.4 # via markdown jsonfield==3.1.0 # via edx-celeryutils -kombu==5.2.3 +kombu==5.2.4 # via celery -lxml==4.7.1 +lxml==4.8.0 # via xblock -mako==1.1.6 +mako==1.2.0 # via xblock-utils -markdown==3.3.6 +markdown==3.3.7 # via -r requirements/base.in -markupsafe==2.0.1 +markupsafe==2.1.1 # via # mako # xblock -newrelic==7.4.0.172 +newrelic==7.10.0.175 # via edx-django-utils -path==16.3.0 - # via path.py -path.py==12.5.0 +path==16.4.0 + # via path-py +path-py==12.5.0 # via -r requirements/base.in -pbr==5.8.1 +pbr==5.9.0 # via stevedore -prompt-toolkit==3.0.28 +prompt-toolkit==3.0.29 # via click-repl -psutil==5.9.0 +psutil==5.9.1 # via edx-django-utils +pycparser==2.21 + # via cffi pymongo==3.12.3 # via edx-opaque-keys +pynacl==1.5.0 + # via edx-django-utils python-dateutil==2.8.2 # via xblock -pytz==2021.3 +pytz==2022.1 # via # celery # django # djangorestframework - # fs # xblock pyyaml==6.0 # via xblock @@ -130,9 +136,9 @@ stevedore==3.5.0 # via # edx-django-utils # edx-opaque-keys -super-csv==2.1.4 +super-csv==3.0.0 # via edx-bulk-grades -urllib3==1.26.8 +urllib3==1.26.9 # via requests vine==5.0.0 # via @@ -152,9 +158,9 @@ xblock==1.6.1 # via # -r requirements/base.in # xblock-utils -xblock-utils==2.2.0 +xblock-utils==3.0.0 # via -r requirements/base.in -zipp==3.7.0 +zipp==3.8.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/ci.txt b/requirements/ci.txt index 9523c59..86013f2 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,19 +4,19 @@ # # make upgrade # -certifi==2021.10.8 +certifi==2022.5.18.1 # via requests charset-normalizer==2.0.12 # via requests codecov==2.1.12 # via -r requirements/ci.in -coverage==6.3.1 +coverage==6.4 # via codecov distlib==0.3.4 # via # -r requirements/tox.txt # virtualenv -filelock==3.5.1 +filelock==3.7.0 # via # -r requirements/tox.txt # tox @@ -27,7 +27,7 @@ packaging==21.3 # via # -r requirements/tox.txt # tox -platformdirs==2.5.0 +platformdirs==2.5.2 # via # -r requirements/tox.txt # virtualenv @@ -39,7 +39,7 @@ py==1.11.0 # via # -r requirements/tox.txt # tox -pyparsing==3.0.7 +pyparsing==3.0.9 # via # -r requirements/tox.txt # packaging @@ -55,11 +55,11 @@ toml==0.10.2 # via # -r requirements/tox.txt # tox -tox==3.24.5 +tox==3.25.0 # via -r requirements/tox.txt -urllib3==1.26.8 +urllib3==1.26.9 # via requests -virtualenv==20.13.1 +virtualenv==20.14.1 # via # -r requirements/tox.txt # tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 7a77c82..cca3ccd 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -20,3 +20,6 @@ Django<4.0 elasticsearch<7.14.0 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 diff --git a/requirements/dev.in b/requirements/dev.in index d635db7..4316fd3 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -4,7 +4,6 @@ django-statici18n edx-i18n-tools -transifex-client -r base.in -r test.in diff --git a/requirements/dev.txt b/requirements/dev.txt index 6d0846b..8293b4e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,7 +4,7 @@ # # make upgrade # -amqp==5.0.9 +amqp==5.1.1 # via # -r requirements/base.txt # kombu @@ -12,11 +12,11 @@ appdirs==1.4.4 # via # -r requirements/base.txt # fs -asgiref==3.5.0 +asgiref==3.5.2 # via # -r requirements/base.txt # django -astroid==2.9.3 +astroid==2.11.5 # via # pylint # pylint-celery @@ -26,19 +26,23 @@ billiard==3.6.4.0 # via # -r requirements/base.txt # celery -celery==5.2.3 +celery==5.2.6 # via # -r requirements/base.txt # edx-celeryutils -certifi==2021.10.8 +certifi==2022.5.18.1 # via # -r requirements/base.txt # requests +cffi==1.15.0 + # via + # -r requirements/base.txt + # pynacl charset-normalizer==2.0.12 # via # -r requirements/base.txt # requests -click==8.0.3 +click==8.1.3 # via # -r requirements/base.txt # celery @@ -47,13 +51,14 @@ click==8.0.3 # click-plugins # click-repl # code-annotations + # edx-django-utils # edx-lint # pip-tools click-didyoumean==0.3.0 # via # -r requirements/base.txt # celery -click-log==0.3.2 +click-log==0.4.0 # via edx-lint click-plugins==1.1.1 # via @@ -67,15 +72,17 @@ code-annotations==1.3.0 # via edx-lint codecov==2.1.12 # via -r requirements/ci.in -coverage[toml]==6.3.1 +coverage[toml]==6.4 # via # codecov # pytest-cov +dill==0.3.5.1 + # via pylint distlib==0.3.4 # via # -r requirements/tox.txt # virtualenv -django==3.2.12 +django==3.2.13 # via # -c requirements/common_constraints.txt # -r requirements/base.txt @@ -105,7 +112,7 @@ django-model-utils==4.2.0 # super-csv django-statici18n==2.2.0 # via -r requirements/dev.in -django-waffle==2.3.0 +django-waffle==2.4.1 # via # -r requirements/base.txt # edx-django-utils @@ -121,24 +128,24 @@ edx-celeryutils==1.2.1 # via # -r requirements/base.txt # super-csv -edx-django-utils==4.5.0 +edx-django-utils==5.0.0 # via # -r requirements/base.txt # super-csv edx-i18n-tools==0.9.1 # via -r requirements/dev.in -edx-lint==5.2.1 +edx-lint==5.2.2 # via -r requirements/test.in edx-opaque-keys==2.3.0 # via # -r requirements/base.txt # edx-bulk-grades -filelock==3.5.1 +filelock==3.7.0 # via # -r requirements/tox.txt # tox # virtualenv -fs==2.4.15 +fs==2.4.16 # via # -r requirements/base.txt # xblock @@ -146,15 +153,11 @@ future==0.18.2 # via # -r requirements/base.txt # edx-celeryutils -gitdb==4.0.9 - # via gitpython -gitpython==3.1.26 - # via transifex-client idna==3.3 # via # -r requirements/base.txt # requests -importlib-metadata==4.11.1 +importlib-metadata==4.11.4 # via # -r requirements/base.txt # markdown @@ -162,39 +165,39 @@ iniconfig==1.1.1 # via pytest isort==5.10.1 # via pylint -jinja2==3.0.3 +jinja2==3.1.2 # via code-annotations jsonfield==3.1.0 # via # -r requirements/base.txt # edx-celeryutils -kombu==5.2.3 +kombu==5.2.4 # via # -r requirements/base.txt # celery lazy-object-proxy==1.7.1 # via astroid -lxml==4.7.1 +lxml==4.8.0 # via # -r requirements/base.txt # xblock -mako==1.1.6 +mako==1.2.0 # via # -r requirements/base.txt # xblock-utils -markdown==3.3.6 +markdown==3.3.7 # via # -r requirements/base.in # -r requirements/base.txt -markupsafe==2.0.1 +markupsafe==2.1.1 # via # -r requirements/base.txt # jinja2 # mako # xblock -mccabe==0.6.1 +mccabe==0.7.0 # via pylint -newrelic==7.4.0.172 +newrelic==7.10.0.175 # via # -r requirements/base.txt # edx-django-utils @@ -203,24 +206,24 @@ packaging==21.3 # -r requirements/tox.txt # pytest # tox -path==16.3.0 +path==16.4.0 # via # -r requirements/base.txt # edx-i18n-tools - # path.py -path.py==12.5.0 + # path-py +path-py==12.5.0 # via # -r requirements/base.in # -r requirements/base.txt -pbr==5.8.1 +pbr==5.9.0 # via # -r requirements/base.txt # stevedore pep517==0.12.0 # via pip-tools -pip-tools==6.5.1 +pip-tools==6.6.2 # via -r requirements/pip_tools.in -platformdirs==2.5.0 +platformdirs==2.5.2 # via # -r requirements/tox.txt # pylint @@ -232,11 +235,11 @@ pluggy==1.0.0 # tox polib==1.1.1 # via edx-i18n-tools -prompt-toolkit==3.0.28 +prompt-toolkit==3.0.29 # via # -r requirements/base.txt # click-repl -psutil==5.9.0 +psutil==5.9.1 # via # -r requirements/base.txt # edx-django-utils @@ -245,7 +248,11 @@ py==1.11.0 # -r requirements/tox.txt # pytest # tox -pylint==2.12.2 +pycparser==2.21 + # via + # -r requirements/base.txt + # cffi +pylint==2.13.9 # via # edx-lint # pylint-celery @@ -253,7 +260,7 @@ pylint==2.12.2 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.1 +pylint-django==2.5.3 # via edx-lint pylint-plugin-utils==0.7 # via @@ -263,11 +270,15 @@ pymongo==3.12.3 # via # -r requirements/base.txt # edx-opaque-keys -pyparsing==3.0.7 +pynacl==1.5.0 + # via + # -r requirements/base.txt + # edx-django-utils +pyparsing==3.0.9 # via # -r requirements/tox.txt # packaging -pytest==7.0.1 +pytest==7.1.2 # via pytest-cov pytest-cov==3.0.0 # via -r requirements/test.in @@ -275,17 +286,14 @@ python-dateutil==2.8.2 # via # -r requirements/base.txt # xblock -python-slugify==4.0.1 - # via - # code-annotations - # transifex-client -pytz==2021.3 +python-slugify==6.1.2 + # via code-annotations +pytz==2022.1 # via # -r requirements/base.txt # celery # django # djangorestframework - # fs # xblock pyyaml==6.0 # via @@ -299,7 +307,6 @@ requests==2.27.1 # codecov # edx-bulk-grades # slumber - # transifex-client simplejson==3.17.6 # via # -r requirements/base.txt @@ -315,14 +322,11 @@ six==1.16.0 # fs # python-dateutil # tox - # transifex-client # virtualenv slumber==0.7.1 # via # -r requirements/base.txt # edx-bulk-grades -smmap==5.0.0 - # via gitdb sqlparse==0.4.2 # via # -r requirements/base.txt @@ -333,7 +337,7 @@ stevedore==3.5.0 # code-annotations # edx-django-utils # edx-opaque-keys -super-csv==2.1.4 +super-csv==3.0.0 # via # -r requirements/base.txt # edx-bulk-grades @@ -342,35 +346,32 @@ text-unidecode==1.3 toml==0.10.2 # via # -r requirements/tox.txt - # pylint # tox tomli==2.0.1 # via # coverage # pep517 + # pylint # pytest -tox==3.24.5 +tox==3.25.0 # via # -r requirements/tox.in # -r requirements/tox.txt -transifex-client==0.14.4 - # via -r requirements/dev.in -typing-extensions==4.1.1 +typing-extensions==4.2.0 # via # astroid # pylint -urllib3==1.26.8 +urllib3==1.26.9 # via # -r requirements/base.txt # requests - # transifex-client vine==5.0.0 # via # -r requirements/base.txt # amqp # celery # kombu -virtualenv==20.13.1 +virtualenv==20.14.1 # via # -r requirements/tox.txt # tox @@ -390,18 +391,18 @@ webob==1.8.7 # xblock wheel==0.37.1 # via pip-tools -wrapt==1.13.3 +wrapt==1.14.1 # via astroid xblock==1.6.1 # via # -r requirements/base.in # -r requirements/base.txt # xblock-utils -xblock-utils==2.2.0 +xblock-utils==3.0.0 # via # -r requirements/base.in # -r requirements/base.txt -zipp==3.7.0 +zipp==3.8.0 # via # -r requirements/base.txt # importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index 5c9d458..8fa0000 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.37.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==22.0.3 +pip==22.1.1 # via -r requirements/pip.in -setuptools==60.9.2 +setuptools==62.3.2 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 6d571f6..4a6f82d 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -4,11 +4,11 @@ # # make upgrade # -click==8.0.3 +click==8.1.3 # via pip-tools pep517==0.12.0 # via pip-tools -pip-tools==6.5.1 +pip-tools==6.6.2 # via -r requirements/pip_tools.in tomli==2.0.1 # via pep517 diff --git a/requirements/test.txt b/requirements/test.txt index 2878b63..fb8d6ca 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,7 +4,7 @@ # # make upgrade # -amqp==5.0.9 +amqp==5.1.1 # via # -r requirements/base.txt # kombu @@ -12,11 +12,11 @@ appdirs==1.4.4 # via # -r requirements/base.txt # fs -asgiref==3.5.0 +asgiref==3.5.2 # via # -r requirements/base.txt # django -astroid==2.9.3 +astroid==2.11.5 # via # pylint # pylint-celery @@ -26,19 +26,23 @@ billiard==3.6.4.0 # via # -r requirements/base.txt # celery -celery==5.2.3 +celery==5.2.6 # via # -r requirements/base.txt # edx-celeryutils -certifi==2021.10.8 +certifi==2022.5.18.1 # via # -r requirements/base.txt # requests +cffi==1.15.0 + # via + # -r requirements/base.txt + # pynacl charset-normalizer==2.0.12 # via # -r requirements/base.txt # requests -click==8.0.3 +click==8.1.3 # via # -r requirements/base.txt # celery @@ -47,12 +51,13 @@ click==8.0.3 # click-plugins # click-repl # code-annotations + # edx-django-utils # edx-lint click-didyoumean==0.3.0 # via # -r requirements/base.txt # celery -click-log==0.3.2 +click-log==0.4.0 # via edx-lint click-plugins==1.1.1 # via @@ -64,9 +69,11 @@ click-repl==0.2.0 # celery code-annotations==1.3.0 # via edx-lint -coverage[toml]==6.3.1 +coverage[toml]==6.4 # via pytest-cov -django==3.2.12 +dill==0.3.5.1 + # via pylint +django==3.2.13 # via # -c requirements/common_constraints.txt # -r requirements/base.txt @@ -89,7 +96,7 @@ django-model-utils==4.2.0 # edx-bulk-grades # edx-celeryutils # super-csv -django-waffle==2.3.0 +django-waffle==2.4.1 # via # -r requirements/base.txt # edx-django-utils @@ -103,17 +110,17 @@ edx-celeryutils==1.2.1 # via # -r requirements/base.txt # super-csv -edx-django-utils==4.5.0 +edx-django-utils==5.0.0 # via # -r requirements/base.txt # super-csv -edx-lint==5.2.1 +edx-lint==5.2.2 # via -r requirements/test.in edx-opaque-keys==2.3.0 # via # -r requirements/base.txt # edx-bulk-grades -fs==2.4.15 +fs==2.4.16 # via # -r requirements/base.txt # xblock @@ -125,7 +132,7 @@ idna==3.3 # via # -r requirements/base.txt # requests -importlib-metadata==4.11.1 +importlib-metadata==4.11.4 # via # -r requirements/base.txt # markdown @@ -133,67 +140,71 @@ iniconfig==1.1.1 # via pytest isort==5.10.1 # via pylint -jinja2==3.0.3 +jinja2==3.1.2 # via code-annotations jsonfield==3.1.0 # via # -r requirements/base.txt # edx-celeryutils -kombu==5.2.3 +kombu==5.2.4 # via # -r requirements/base.txt # celery lazy-object-proxy==1.7.1 # via astroid -lxml==4.7.1 +lxml==4.8.0 # via # -r requirements/base.txt # xblock -mako==1.1.6 +mako==1.2.0 # via # -r requirements/base.txt # xblock-utils -markdown==3.3.6 +markdown==3.3.7 # via -r requirements/base.txt -markupsafe==2.0.1 +markupsafe==2.1.1 # via # -r requirements/base.txt # jinja2 # mako # xblock -mccabe==0.6.1 +mccabe==0.7.0 # via pylint -newrelic==7.4.0.172 +newrelic==7.10.0.175 # via # -r requirements/base.txt # edx-django-utils packaging==21.3 # via pytest -path==16.3.0 +path==16.4.0 # via # -r requirements/base.txt - # path.py -path.py==12.5.0 + # path-py +path-py==12.5.0 # via -r requirements/base.txt -pbr==5.8.1 +pbr==5.9.0 # via # -r requirements/base.txt # stevedore -platformdirs==2.5.0 +platformdirs==2.5.2 # via pylint pluggy==1.0.0 # via pytest -prompt-toolkit==3.0.28 +prompt-toolkit==3.0.29 # via # -r requirements/base.txt # click-repl -psutil==5.9.0 +psutil==5.9.1 # via # -r requirements/base.txt # edx-django-utils py==1.11.0 # via pytest -pylint==2.12.2 +pycparser==2.21 + # via + # -r requirements/base.txt + # cffi +pylint==2.13.9 # via # edx-lint # pylint-celery @@ -201,7 +212,7 @@ pylint==2.12.2 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.1 +pylint-django==2.5.3 # via edx-lint pylint-plugin-utils==0.7 # via @@ -211,9 +222,13 @@ pymongo==3.12.3 # via # -r requirements/base.txt # edx-opaque-keys -pyparsing==3.0.7 +pynacl==1.5.0 + # via + # -r requirements/base.txt + # edx-django-utils +pyparsing==3.0.9 # via packaging -pytest==7.0.1 +pytest==7.1.2 # via pytest-cov pytest-cov==3.0.0 # via -r requirements/test.in @@ -221,15 +236,14 @@ python-dateutil==2.8.2 # via # -r requirements/base.txt # xblock -python-slugify==5.0.2 +python-slugify==6.1.2 # via code-annotations -pytz==2021.3 +pytz==2022.1 # via # -r requirements/base.txt # celery # django # djangorestframework - # fs # xblock pyyaml==6.0 # via @@ -267,23 +281,22 @@ stevedore==3.5.0 # code-annotations # edx-django-utils # edx-opaque-keys -super-csv==2.1.4 +super-csv==3.0.0 # via # -r requirements/base.txt # edx-bulk-grades text-unidecode==1.3 # via python-slugify -toml==0.10.2 - # via pylint tomli==2.0.1 # via # coverage + # pylint # pytest -typing-extensions==4.1.1 +typing-extensions==4.2.0 # via # astroid # pylint -urllib3==1.26.8 +urllib3==1.26.9 # via # -r requirements/base.txt # requests @@ -306,15 +319,15 @@ webob==1.8.7 # via # -r requirements/base.txt # xblock -wrapt==1.13.3 +wrapt==1.14.1 # via astroid xblock==1.6.1 # via # -r requirements/base.txt # xblock-utils -xblock-utils==2.2.0 +xblock-utils==3.0.0 # via -r requirements/base.txt -zipp==3.7.0 +zipp==3.8.0 # via # -r requirements/base.txt # importlib-metadata diff --git a/requirements/tox.txt b/requirements/tox.txt index 1c59a34..5dbaebb 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -6,19 +6,19 @@ # distlib==0.3.4 # via virtualenv -filelock==3.5.1 +filelock==3.7.0 # via # tox # virtualenv packaging==21.3 # via tox -platformdirs==2.5.0 +platformdirs==2.5.2 # via virtualenv pluggy==1.0.0 # via tox py==1.11.0 # via tox -pyparsing==3.0.7 +pyparsing==3.0.9 # via packaging six==1.16.0 # via @@ -26,7 +26,7 @@ six==1.16.0 # virtualenv toml==0.10.2 # via tox -tox==3.24.5 +tox==3.25.0 # via -r requirements/tox.in -virtualenv==20.13.1 +virtualenv==20.14.1 # via tox