diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1781174..cdfe7c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: - - '3.8' - - '3.11' + python-version: ['3.11', '3.12'] toxenv: [quality, django42] steps: diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 8edf516..ea81e83 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -15,7 +15,7 @@ jobs: - name: setup python uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.12 - name: Install pip run: pip install -r requirements/pip.txt diff --git a/requirements/base.txt b/requirements/base.txt index 6ec4476..0f2696d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -10,22 +10,15 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # celery - # django - # djangorestframework - # kombu -billiard==4.2.0 +billiard==4.2.1 # via celery -celery==5.3.6 +celery==5.4.0 # via edx-celeryutils -certifi==2024.2.2 +certifi==2024.8.30 # via requests -cffi==1.16.0 +cffi==1.17.1 # via pynacl -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests click==8.1.7 # via @@ -40,9 +33,9 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -django==4.2.11 +django==4.2.16 # via - # -c requirements/common_constraints.txt + # -c /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/common_constraints.txt # django-crum # django-model-utils # django-waffle @@ -56,60 +49,58 @@ django-crum==0.7.9 # via # edx-django-utils # super-csv -django-model-utils==4.4.0 +django-model-utils==5.0.0 # via # edx-bulk-grades # edx-celeryutils # super-csv django-waffle==4.1.0 # via edx-django-utils -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via super-csv -edx-bulk-grades==1.0.2 +dnspython==2.7.0 + # via pymongo +edx-bulk-grades==1.1.0 # via -r requirements/base.in -edx-celeryutils==1.2.5 +edx-celeryutils==1.3.0 # via super-csv -edx-django-utils==5.11.0 +edx-django-utils==7.0.0 # via super-csv -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.11.0 # via edx-bulk-grades fs==2.4.16 # via xblock -idna==3.6 +idna==3.10 # via requests -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # markdown jsonfield==3.1.0 # via edx-celeryutils -kombu==5.3.6 +kombu==5.4.2 # via celery -lxml==5.1.0 +lxml==5.3.0 # via xblock -mako==1.3.2 +mako==1.3.6 # via xblock -markdown==3.6 +markdown==3.7 # via -r requirements/base.in -markupsafe==2.1.5 +markupsafe==3.0.2 # via # mako # xblock -newrelic==9.8.0 +newrelic==10.2.0 # via edx-django-utils -path==16.10.0 +path==17.0.0 # via path-py path-py==12.5.0 # via -r requirements/base.in -pbr==6.0.0 +pbr==6.1.0 # via stevedore -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.48 # via click-repl -psutil==5.9.8 +psutil==6.1.0 # via edx-django-utils -pycparser==2.21 +pycparser==2.22 # via cffi -pymongo==3.13.0 +pymongo==4.10.1 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils @@ -117,14 +108,15 @@ python-dateutil==2.9.0.post0 # via # celery # xblock -pytz==2024.1 -pyyaml==6.0.1 +pytz==2024.2 + # via xblock +pyyaml==6.0.2 # via xblock -requests==2.31.0 +requests==2.32.3 # via # edx-bulk-grades # slumber -simplejson==3.19.2 +simplejson==3.19.3 # via # super-csv # xblock @@ -134,24 +126,21 @@ six==1.16.0 # python-dateutil slumber==0.7.1 # via edx-bulk-grades -sqlparse==0.4.4 +sqlparse==0.5.1 # via django -stevedore==5.2.0 +stevedore==5.3.0 # via # edx-django-utils # edx-opaque-keys -super-csv==3.1.0 +super-csv==3.2.0 # via edx-bulk-grades -typing-extensions==4.10.0 - # via - # asgiref - # edx-opaque-keys - # kombu -tzdata==2024.1 +typing-extensions==4.12.2 + # via edx-opaque-keys +tzdata==2024.2 # via - # backports-zoneinfo # celery -urllib3==2.2.1 + # kombu +urllib3==2.2.3 # via requests vine==5.1.0 # via @@ -160,16 +149,14 @@ vine==5.1.0 # kombu wcwidth==0.2.13 # via prompt-toolkit -web-fragments==2.1.0 +web-fragments==2.2.0 # via # -r requirements/base.in # xblock -webob==1.8.7 +webob==1.8.9 # via xblock -xblock==3.0.0 +xblock==5.1.0 # via -r requirements/base.in -zipp==3.18.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/ci.txt b/requirements/ci.txt index cc402fb..49809c6 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,58 +1,53 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -cachetools==5.3.3 +cachetools==5.5.0 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox chardet==5.2.0 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox colorama==0.4.6 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox -distlib==0.3.8 +distlib==0.3.9 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # virtualenv -filelock==3.13.3 +filelock==3.16.1 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox # virtualenv -packaging==24.0 +packaging==24.2 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # pyproject-api # tox -platformdirs==4.2.0 +platformdirs==4.3.6 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox -pyproject-api==1.6.1 +pyproject-api==1.8.0 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox six==1.16.0 # via -r requirements/ci.in -tomli==2.0.1 +tox==4.23.2 + # via -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt +virtualenv==20.27.1 # via - # -r requirements/tox.txt - # pyproject-api - # tox -tox==4.14.2 - # via -r requirements/tox.txt -virtualenv==20.25.1 - # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 069ddff..3b4a7d9 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,65 +1,58 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # amqp==5.2.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # kombu appdirs==1.4.4 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # fs asgiref==3.8.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # django -astroid==3.1.0 +astroid==3.3.5 # via # pylint # pylint-celery -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" +billiard==4.2.1 # via - # -c requirements/constraints.txt - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery - # django - # kombu -billiard==4.2.0 - # via - # -r requirements/base.txt - # celery -build==1.1.1 +build==1.2.2.post1 # via pip-tools -cachetools==5.3.3 +cachetools==5.5.0 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox -celery==5.3.6 +celery==5.4.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-celeryutils -certifi==2024.2.2 +certifi==2024.8.30 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # requests -cffi==1.16.0 +cffi==1.17.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # pynacl chardet==5.2.0 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # requests click==8.1.7 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery # click-didyoumean # click-log @@ -71,36 +64,36 @@ click==8.1.7 # pip-tools click-didyoumean==0.3.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery click-log==0.4.0 # via edx-lint click-plugins==1.1.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery click-repl==0.3.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery -code-annotations==1.7.0 +code-annotations==1.8.0 # via edx-lint colorama==0.4.6 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox -coverage[toml]==7.4.4 +coverage[toml]==7.6.4 # via pytest-cov -dill==0.3.8 +dill==0.3.9 # via pylint -distlib==0.3.8 +distlib==0.3.9 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # virtualenv -django==4.2.11 +django==4.2.16 # via - # -c requirements/common_constraints.txt - # -r requirements/base.txt + # -c /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/common_constraints.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # django-appconf # django-crum # django-model-utils @@ -117,153 +110,152 @@ django-appconf==1.0.6 # via django-statici18n django-crum==0.7.9 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-django-utils # super-csv -django-model-utils==4.4.0 +django-model-utils==5.0.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-bulk-grades # edx-celeryutils # super-csv -django-statici18n==2.4.0 +django-statici18n==2.5.0 # via -r requirements/dev.in django-waffle==4.1.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-django-utils -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # super-csv -edx-bulk-grades==1.0.2 +dnspython==2.7.0 + # via + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt + # pymongo +edx-bulk-grades==1.1.0 # via - # -r requirements/base.in - # -r requirements/base.txt -edx-celeryutils==1.2.5 + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.in + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt +edx-celeryutils==1.3.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # super-csv -edx-django-utils==5.11.0 +edx-django-utils==7.0.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # super-csv -edx-i18n-tools==1.3.0 +edx-i18n-tools==1.6.1 # via -r requirements/dev.in -edx-lint==5.3.6 - # via -r requirements/test.in -edx-opaque-keys==2.5.1 +edx-lint==5.4.1 + # via -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/test.in +edx-opaque-keys==2.11.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-bulk-grades -exceptiongroup==1.2.0 - # via pytest -filelock==3.13.3 +filelock==3.16.1 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox # virtualenv fs==2.4.16 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # xblock -idna==3.6 +idna==3.10 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # requests -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/base.txt - # build - # markdown iniconfig==2.0.0 # via pytest isort==5.13.2 # via pylint -jinja2==3.1.3 +jinja2==3.1.4 # via code-annotations jsonfield==3.1.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-celeryutils -kombu==5.3.6 +kombu==5.4.2 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery -lxml==5.1.0 +lxml[html-clean]==5.3.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-i18n-tools + # lxml-html-clean # xblock -mako==1.3.2 +lxml-html-clean==0.3.1 + # via lxml +mako==1.3.6 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # xblock -markdown==3.6 +markdown==3.7 # via - # -r requirements/base.in - # -r requirements/base.txt -markupsafe==2.1.5 + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.in + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt +markupsafe==3.0.2 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # jinja2 # mako # xblock mccabe==0.7.0 # via pylint -newrelic==9.8.0 +newrelic==10.2.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-django-utils -packaging==24.0 +packaging==24.2 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # build # pyproject-api # pytest # tox -path==16.10.0 +path==17.0.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-i18n-tools # path-py path-py==12.5.0 # via - # -r requirements/base.in - # -r requirements/base.txt -pbr==6.0.0 + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.in + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt +pbr==6.1.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # stevedore pip-tools==7.4.1 - # via -r requirements/pip_tools.in -platformdirs==4.2.0 + # via -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/pip_tools.in +platformdirs==4.3.6 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # pylint # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # pytest # tox polib==1.2.0 # via edx-i18n-tools -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.48 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # click-repl -psutil==5.9.8 +psutil==6.1.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-django-utils -pycparser==2.21 +pycparser==2.22 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # cffi -pylint==3.1.0 +pylint==3.3.1 # via # edx-lint # pylint-celery @@ -271,153 +263,134 @@ pylint==3.1.0 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.5 +pylint-django==2.6.1 # via edx-lint pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pymongo==3.13.0 +pymongo==4.10.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-opaque-keys pynacl==1.5.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-django-utils -pyproject-api==1.6.1 +pyproject-api==1.8.0 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox -pyproject-hooks==1.0.0 +pyproject-hooks==1.2.0 # via # build # pip-tools -pytest==8.1.1 +pytest==8.3.3 # via pytest-cov -pytest-cov==5.0.0 - # via -r requirements/test.in +pytest-cov==6.0.0 + # via -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/test.in python-dateutil==2.9.0.post0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery # xblock python-slugify==8.0.4 # via code-annotations -pytz==2024.1 +pytz==2024.2 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # xblock -pyyaml==6.0.1 +pyyaml==6.0.2 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # code-annotations # edx-i18n-tools # xblock -requests==2.31.0 +requests==2.32.3 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-bulk-grades # slumber -simplejson==3.19.2 +simplejson==3.19.3 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # super-csv # xblock six==1.16.0 # via - # -r requirements/base.txt - # -r requirements/ci.in + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/ci.in # edx-lint # fs # python-dateutil slumber==0.7.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-bulk-grades -sqlparse==0.4.4 +sqlparse==0.5.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # code-annotations # edx-django-utils # edx-opaque-keys -super-csv==3.1.0 +super-csv==3.2.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-bulk-grades text-unidecode==1.3 # via python-slugify -tomli==2.0.1 - # via - # -r requirements/tox.txt - # build - # coverage - # pip-tools - # pylint - # pyproject-api - # pyproject-hooks - # pytest - # tox -tomlkit==0.12.4 +tomlkit==0.13.2 # via pylint -tox==4.14.2 +tox==4.23.2 # via - # -r requirements/tox.in - # -r requirements/tox.txt -typing-extensions==4.10.0 + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.in + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt +typing-extensions==4.12.2 # via - # -r requirements/base.txt - # asgiref - # astroid + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-opaque-keys - # kombu - # pylint -tzdata==2024.1 +tzdata==2024.2 # via - # -r requirements/base.txt - # backports-zoneinfo + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery -urllib3==2.2.1 + # kombu +urllib3==2.2.3 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # requests vine==5.1.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # amqp # celery # kombu -virtualenv==20.25.1 +virtualenv==20.27.1 # via - # -r requirements/tox.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/tox.txt # tox wcwidth==0.2.13 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # prompt-toolkit -web-fragments==2.1.0 +web-fragments==2.2.0 # via - # -r requirements/base.in - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.in + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # xblock -webob==1.8.7 +webob==1.8.9 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # xblock -wheel==0.43.0 +wheel==0.45.0 # via pip-tools -xblock==3.0.0 - # via - # -r requirements/base.in - # -r requirements/base.txt -zipp==3.18.1 +xblock==5.1.0 # via - # -r requirements/base.txt - # importlib-metadata + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.in + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index cf44902..e5de68e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,14 +1,14 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -wheel==0.43.0 +wheel==0.45.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.0 +pip==24.3.1 # via -r requirements/pip.in -setuptools==69.2.0 +setuptools==75.4.0 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 3db2d4c..0990b02 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,34 +1,23 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -build==1.1.1 +build==1.2.2.post1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # build -packaging==24.0 +packaging==24.2 # via build pip-tools==7.4.1 # via -r requirements/pip_tools.in -pyproject-hooks==1.0.0 - # via - # build - # pip-tools -tomli==2.0.1 +pyproject-hooks==1.2.0 # via # build # pip-tools - # pyproject-hooks -wheel==0.43.0 +wheel==0.45.0 # via pip-tools -zipp==3.18.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/test.txt b/requirements/test.txt index 30a122c..b5ea2ea 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,55 +1,48 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # amqp==5.2.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # kombu appdirs==1.4.4 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # fs asgiref==3.8.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # django -astroid==3.1.0 +astroid==3.3.5 # via # pylint # pylint-celery -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" +billiard==4.2.1 # via - # -c requirements/constraints.txt - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery - # django - # kombu -billiard==4.2.0 - # via - # -r requirements/base.txt - # celery -celery==5.3.6 +celery==5.4.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-celeryutils -certifi==2024.2.2 +certifi==2024.8.30 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # requests -cffi==1.16.0 +cffi==1.17.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # pynacl -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # requests click==8.1.7 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery # click-didyoumean # click-log @@ -60,28 +53,28 @@ click==8.1.7 # edx-lint click-didyoumean==0.3.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery click-log==0.4.0 # via edx-lint click-plugins==1.1.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery click-repl==0.3.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery -code-annotations==1.7.0 +code-annotations==1.8.0 # via edx-lint -coverage[toml]==7.4.4 +coverage[toml]==7.6.4 # via pytest-cov -dill==0.3.8 +dill==0.3.9 # via pylint -django==4.2.11 +django==4.2.16 # via - # -c requirements/common_constraints.txt - # -r requirements/base.txt + # -c /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/common_constraints.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # django-crum # django-model-utils # django-waffle @@ -93,119 +86,116 @@ django==4.2.11 # super-csv django-crum==0.7.9 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-django-utils # super-csv -django-model-utils==4.4.0 +django-model-utils==5.0.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-bulk-grades # edx-celeryutils # super-csv django-waffle==4.1.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-django-utils -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # super-csv -edx-bulk-grades==1.0.2 - # via -r requirements/base.txt -edx-celeryutils==1.2.5 +dnspython==2.7.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt + # pymongo +edx-bulk-grades==1.1.0 + # via -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt +edx-celeryutils==1.3.0 + # via + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # super-csv -edx-django-utils==5.11.0 +edx-django-utils==7.0.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # super-csv -edx-lint==5.3.6 +edx-lint==5.4.1 # via -r requirements/test.in -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.11.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-bulk-grades -exceptiongroup==1.2.0 - # via pytest fs==2.4.16 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # xblock -idna==3.6 +idna==3.10 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # requests -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/base.txt - # markdown iniconfig==2.0.0 # via pytest isort==5.13.2 # via pylint -jinja2==3.1.3 +jinja2==3.1.4 # via code-annotations jsonfield==3.1.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-celeryutils -kombu==5.3.6 +kombu==5.4.2 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery -lxml==5.1.0 +lxml==5.3.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # xblock -mako==1.3.2 +mako==1.3.6 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # xblock -markdown==3.6 - # via -r requirements/base.txt -markupsafe==2.1.5 +markdown==3.7 + # via -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt +markupsafe==3.0.2 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # jinja2 # mako # xblock mccabe==0.7.0 # via pylint -newrelic==9.8.0 +newrelic==10.2.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-django-utils -packaging==24.0 +packaging==24.2 # via pytest -path==16.10.0 +path==17.0.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # path-py path-py==12.5.0 - # via -r requirements/base.txt -pbr==6.0.0 + # via -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt +pbr==6.1.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # stevedore -platformdirs==4.2.0 +platformdirs==4.3.6 # via pylint -pluggy==1.4.0 +pluggy==1.5.0 # via pytest -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.48 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # click-repl -psutil==5.9.8 +psutil==6.1.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-django-utils -pycparser==2.21 +pycparser==2.22 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # cffi -pylint==3.1.0 +pylint==3.3.1 # via # edx-lint # pylint-celery @@ -213,124 +203,111 @@ pylint==3.1.0 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.5 +pylint-django==2.6.1 # via edx-lint pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pymongo==3.13.0 +pymongo==4.10.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-opaque-keys pynacl==1.5.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-django-utils -pytest==8.1.1 +pytest==8.3.3 # via pytest-cov -pytest-cov==5.0.0 +pytest-cov==6.0.0 # via -r requirements/test.in python-dateutil==2.9.0.post0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery # xblock python-slugify==8.0.4 # via code-annotations -pytz==2024.1 +pytz==2024.2 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # xblock -pyyaml==6.0.1 +pyyaml==6.0.2 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # code-annotations # xblock -requests==2.31.0 +requests==2.32.3 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-bulk-grades # slumber -simplejson==3.19.2 +simplejson==3.19.3 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # super-csv # xblock six==1.16.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-lint # fs # python-dateutil slumber==0.7.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-bulk-grades -sqlparse==0.4.4 +sqlparse==0.5.1 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # code-annotations # edx-django-utils # edx-opaque-keys -super-csv==3.1.0 +super-csv==3.2.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-bulk-grades text-unidecode==1.3 # via python-slugify -tomli==2.0.1 - # via - # coverage - # pylint - # pytest -tomlkit==0.12.4 +tomlkit==0.13.2 # via pylint -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via - # -r requirements/base.txt - # asgiref - # astroid + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # edx-opaque-keys - # kombu - # pylint -tzdata==2024.1 +tzdata==2024.2 # via - # -r requirements/base.txt - # backports-zoneinfo + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # celery -urllib3==2.2.1 + # kombu +urllib3==2.2.3 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # requests vine==5.1.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # amqp # celery # kombu wcwidth==0.2.13 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # prompt-toolkit -web-fragments==2.1.0 +web-fragments==2.2.0 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # xblock -webob==1.8.7 +webob==1.8.9 # via - # -r requirements/base.txt + # -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # xblock -xblock==3.0.0 - # via -r requirements/base.txt -zipp==3.18.1 - # via - # -r requirements/base.txt - # importlib-metadata +xblock==5.1.0 + # via -r /Users/tayyab.tahir/Documents/MTTQ/xblock-dev/XBlocks/staff_graded-xblock/requirements/base.txt # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/tox.txt b/requirements/tox.txt index cc5293d..fbfdeef 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -1,38 +1,34 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -cachetools==5.3.3 +cachetools==5.5.0 # via tox chardet==5.2.0 # via tox colorama==0.4.6 # via tox -distlib==0.3.8 +distlib==0.3.9 # via virtualenv -filelock==3.13.3 +filelock==3.16.1 # via # tox # virtualenv -packaging==24.0 +packaging==24.2 # via # pyproject-api # tox -platformdirs==4.2.0 +platformdirs==4.3.6 # via # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via tox -pyproject-api==1.6.1 +pyproject-api==1.8.0 # via tox -tomli==2.0.1 - # via - # pyproject-api - # tox -tox==4.14.2 +tox==4.23.2 # via -r requirements/tox.in -virtualenv==20.25.1 +virtualenv==20.27.1 # via tox diff --git a/setup.py b/setup.py index df57455..7bf0db8 100644 --- a/setup.py +++ b/setup.py @@ -74,8 +74,8 @@ def get_version(file_path): 'Intended Audience :: Developers', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Framework :: Django', 'Framework :: Django :: 4.2', ], diff --git a/staff_graded/__init__.py b/staff_graded/__init__.py index ff3934e..223f8ad 100644 --- a/staff_graded/__init__.py +++ b/staff_graded/__init__.py @@ -2,4 +2,4 @@ from .staff_graded import StaffGradedXBlock -__version__ = '2.3.0' +__version__ = '3.0.0' diff --git a/staff_graded/staff_graded.py b/staff_graded/staff_graded.py index 20bddb1..865b24b 100644 --- a/staff_graded/staff_graded.py +++ b/staff_graded/staff_graded.py @@ -6,9 +6,9 @@ import io import json import logging +import os import markdown -import pkg_resources from web_fragments.fragment import Fragment from webob import Response from xblock.core import XBlock @@ -77,14 +77,15 @@ class StaffGradedXBlock(StudioEditableXBlockMixin, ScorableXBlockMixin, XBlock): editable_fields = ('display_name', 'instructions', 'weight') + loader = ResourceLoader(__name__) + def _get_current_username(self): return self.runtime.service(self, 'user').get_current_user().opt_attrs.get( 'edx-platform.username') def resource_string(self, path): """Handy helper for getting resources from our kit.""" - data = pkg_resources.resource_string(__name__, path) - return data.decode("utf8") + return self.loader.load_unicode(path) def student_view(self, context=None): """ @@ -93,7 +94,6 @@ def student_view(self, context=None): """ frag = Fragment() frag.add_css(self.resource_string("static/css/staff_graded.css")) - loader = ResourceLoader(__name__) _ = self.runtime.service(self, "i18n").ugettext # Add i18n js @@ -123,7 +123,7 @@ def student_view(self, context=None): context['export_url'] = self.runtime.handler_url(self, "csv_export_handler") context['poll_url'] = self.runtime.handler_url(self, "get_results_handler") context['csrf_token'] = get_token(get_current_request()) - frag.add_javascript(loader.load_unicode('static/js/src/staff_graded.js')) + frag.add_javascript(self.loader.load_unicode('static/js/src/staff_graded.js')) frag.initialize_js('StaffGradedProblem', json_args={k: context[k] for k @@ -140,7 +140,7 @@ def student_view(self, context=None): context['score_string'] = _('{score} / {total} points').format(score=grade, total=self.weight) else: context['score_string'] = _('{total} points possible').format(total=self.weight) - frag.add_content(loader.render_django_template('static/html/staff_graded.html', context)) + frag.add_content(self.loader.render_django_template('static/html/staff_graded.html', context)) return frag # TO-DO: change this to create the scenarios you'd like to see in the @@ -169,15 +169,16 @@ def _get_statici18n_js_url(): """ from django.utils import translation # pylint: disable=import-outside-toplevel locale_code = translation.get_language() + module_dir = os.path.dirname(__name__) if locale_code is None: return None text_js = 'public/js/translations/{locale_code}/text.js' lang_code = locale_code.split('-')[0] for code in (locale_code, lang_code, 'en'): - loader = ResourceLoader(__name__) - if pkg_resources.resource_exists( - loader.module_name, text_js.format(locale_code=code)): - return text_js.format(locale_code=code) + resource_name = text_js.format(locale_code=code) + resource_path = os.path.join(module_dir, resource_name) + if os.path.exists(resource_path): + return resource_name return None @staticmethod