diff --git a/requirements/base.txt b/requirements/base.txt index 5c0f429..7a37a79 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,7 +8,7 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django -django==4.2.16 +django==4.2.17 # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -16,9 +16,9 @@ fs==2.4.16 # via xblock lxml==5.3.0 # via xblock -mako==1.3.5 +mako==1.3.8 # via xblock -markupsafe==2.1.5 +markupsafe==3.0.2 # via # mako # xblock @@ -30,16 +30,16 @@ pyyaml==6.0.2 # via xblock simplejson==3.19.3 # via xblock -six==1.16.0 +six==1.17.0 # via # -r requirements/base.in # fs # python-dateutil -sqlparse==0.5.1 +sqlparse==0.5.3 # via django web-fragments==2.2.0 # via xblock -webob==1.8.8 +webob==1.8.9 # via xblock xblock==5.1.0 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index 41238bd..70bf573 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -8,41 +8,41 @@ cachetools==5.5.0 # via # -r requirements/tox.txt # tox -certifi==2024.8.30 +certifi==2024.12.14 # via requests chardet==5.2.0 # via # -r requirements/tox.txt # tox -charset-normalizer==3.3.2 +charset-normalizer==3.4.1 # via requests colorama==0.4.6 # via # -r requirements/tox.txt # tox -coverage[toml]==7.6.1 +coverage[toml]==7.6.10 # via coveralls coveralls==4.0.1 # via -r requirements/ci.in -distlib==0.3.8 +distlib==0.3.9 # via # -r requirements/tox.txt # virtualenv docopt==0.6.2 # via coveralls -filelock==3.16.0 +filelock==3.16.1 # via # -r requirements/tox.txt # tox # virtualenv -idna==3.8 +idna==3.10 # via requests -packaging==24.1 +packaging==24.2 # via # -r requirements/tox.txt # pyproject-api # tox -platformdirs==4.3.2 +platformdirs==4.3.6 # via # -r requirements/tox.txt # tox @@ -51,17 +51,17 @@ pluggy==1.5.0 # via # -r requirements/tox.txt # tox -pyproject-api==1.7.1 +pyproject-api==1.8.0 # via # -r requirements/tox.txt # tox requests==2.32.3 # via coveralls -tox==4.18.1 +tox==4.23.2 # via -r requirements/tox.txt -urllib3==2.2.2 +urllib3==2.3.0 # via requests -virtualenv==20.26.4 +virtualenv==20.28.1 # via # -r requirements/tox.txt # tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index e3bf8ea..a58adb9 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -11,22 +11,17 @@ # Note: Changes to this file will automatically be used by other repos, referencing # this file from Github directly. It does not require packaging in edx-lint. - # using LTS django version Django<5.0 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html +# See https://github.com/openedx/edx-platform/issues/35126 for more info elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected django-simple-history==3.0.0 -# opentelemetry requires version 6.x at the moment: -# https://github.com/open-telemetry/opentelemetry-python/issues/3570 -# Normally this could be added as a constraint in edx-django-utils, where we're -# adding the opentelemetry dependency. However, when we compile pip-tools.txt, -# that uses version 7.x, and then there's no undoing that when compiling base.txt. -# So we need to pin it globally, for now. -# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407 -importlib-metadata<7 +# Cause: https://github.com/openedx/edx-lint/issues/458 +# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved. +pip<24.3 diff --git a/requirements/pip.txt b/requirements/pip.txt index f313a9c..1e691ff 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,13 @@ # # make upgrade # -wheel==0.44.0 +wheel==0.45.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: pip==24.2 - # via -r requirements/pip.in -setuptools==74.1.2 + # via + # -c /home/runner/work/xblock-submit-and-compare/xblock-submit-and-compare/requirements/common_constraints.txt + # -r requirements/pip.in +setuptools==75.7.0 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 77d81ad..63a2799 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -4,19 +4,19 @@ # # make upgrade # -build==1.2.2 +build==1.2.2.post1 # via pip-tools -click==8.1.7 +click==8.1.8 # via pip-tools -packaging==24.1 +packaging==24.2 # via build pip-tools==7.4.1 # via -r requirements/pip_tools.in -pyproject-hooks==1.1.0 +pyproject-hooks==1.2.0 # via # build # pip-tools -wheel==0.44.0 +wheel==0.45.1 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/quality.txt b/requirements/quality.txt index 2f37b71..9cf2b06 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -12,17 +12,17 @@ asgiref==3.8.1 # via # -r requirements/base.txt # django -astroid==3.2.4 +astroid==3.3.8 # via pylint -coverage==7.6.1 +coverage==7.6.10 # via -r requirements/test.txt -dill==0.3.8 +dill==0.3.9 # via pylint -django==4.2.16 +django==4.2.17 # via # -c requirements/common_constraints.txt # -r requirements/base.txt -dnspython==2.6.1 +dnspython==2.7.0 # via # -r requirements/test.txt # pymongo @@ -38,11 +38,11 @@ lxml==5.3.0 # via # -r requirements/base.txt # xblock -mako==1.3.5 +mako==1.3.8 # via # -r requirements/base.txt # xblock -markupsafe==2.1.5 +markupsafe==3.0.2 # via # -r requirements/base.txt # mako @@ -55,13 +55,13 @@ pbr==6.1.0 # via # -r requirements/test.txt # stevedore -platformdirs==4.3.2 +platformdirs==4.3.6 # via pylint pycodestyle==2.12.1 # via -r requirements/quality.in -pylint==3.2.7 +pylint==3.3.3 # via -r requirements/quality.in -pymongo==4.8.0 +pymongo==4.10.1 # via # -r requirements/test.txt # edx-opaque-keys @@ -81,16 +81,16 @@ simplejson==3.19.3 # via # -r requirements/base.txt # xblock -six==1.16.0 +six==1.17.0 # via # -r requirements/base.txt # fs # python-dateutil -sqlparse==0.5.1 +sqlparse==0.5.3 # via # -r requirements/base.txt # django -stevedore==5.3.0 +stevedore==5.4.0 # via # -r requirements/test.txt # edx-opaque-keys @@ -104,7 +104,7 @@ web-fragments==2.2.0 # via # -r requirements/base.txt # xblock -webob==1.8.8 +webob==1.8.9 # via # -r requirements/base.txt # xblock diff --git a/requirements/test.txt b/requirements/test.txt index 00a237d..e02aefa 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,9 +4,9 @@ # # make upgrade # -coverage==7.6.1 +coverage==7.6.10 # via -r requirements/test.in -dnspython==2.6.1 +dnspython==2.7.0 # via pymongo edx-opaque-keys==2.11.0 # via -r requirements/test.in @@ -14,9 +14,9 @@ mock==5.1.0 # via -r requirements/test.in pbr==6.1.0 # via stevedore -pymongo==4.8.0 +pymongo==4.10.1 # via edx-opaque-keys -stevedore==5.3.0 +stevedore==5.4.0 # via edx-opaque-keys typing-extensions==4.12.2 # via edx-opaque-keys diff --git a/requirements/tox.txt b/requirements/tox.txt index c6769e2..04d05bd 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -10,25 +10,25 @@ chardet==5.2.0 # via tox colorama==0.4.6 # via tox -distlib==0.3.8 +distlib==0.3.9 # via virtualenv -filelock==3.16.0 +filelock==3.16.1 # via # tox # virtualenv -packaging==24.1 +packaging==24.2 # via # pyproject-api # tox -platformdirs==4.3.2 +platformdirs==4.3.6 # via # tox # virtualenv pluggy==1.5.0 # via tox -pyproject-api==1.7.1 +pyproject-api==1.8.0 # via tox -tox==4.18.1 +tox==4.23.2 # via -r requirements/tox.in -virtualenv==20.26.4 +virtualenv==20.28.1 # via tox diff --git a/submit_and_compare/mixins/fragment.py b/submit_and_compare/mixins/fragment.py index b3f47ce..0fda6a0 100644 --- a/submit_and_compare/mixins/fragment.py +++ b/submit_and_compare/mixins/fragment.py @@ -57,6 +57,7 @@ def student_view(self, context=None): ) return fragment + # pylint: disable=too-many-positional-arguments def build_fragment( self, template='',