diff --git a/qualtricssurvey/mixins/fragment.py b/qualtricssurvey/mixins/fragment.py index f0431af..2284adc 100644 --- a/qualtricssurvey/mixins/fragment.py +++ b/qualtricssurvey/mixins/fragment.py @@ -55,6 +55,7 @@ def student_view(self, context=None): def build_fragment( self, + *, template='', context=None, css=None, diff --git a/qualtricssurvey/models.py b/qualtricssurvey/models.py index 095c8dd..8230354 100644 --- a/qualtricssurvey/models.py +++ b/qualtricssurvey/models.py @@ -70,7 +70,6 @@ class QualtricsSurveyModelMixin: help=_('This is the name of your university.'), ) - # pylint: disable=no-member def get_anon_id(self): """ Return an anonymous user id diff --git a/requirements/base.txt b/requirements/base.txt index 1b178fc..51e24fa 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,26 +8,24 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django -django==3.2.25 +django==4.2.16 # via - # -c requirements/common_constraints.txt + # -c /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/common_constraints.txt # -r requirements/base.in fs==2.4.16 # via xblock lxml==5.3.0 # via xblock -mako==1.3.5 +mako==1.3.6 # via xblock -markupsafe==2.1.5 +markupsafe==3.0.2 # via # mako # xblock python-dateutil==2.9.0.post0 # via xblock pytz==2024.2 - # via - # django - # xblock + # via xblock pyyaml==6.0.2 # via xblock simplejson==3.19.3 @@ -40,7 +38,7 @@ sqlparse==0.5.1 # 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 f65d521..7b3a5dc 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -6,62 +6,62 @@ # cachetools==5.5.0 # via - # -r requirements/tox.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/tox.txt # tox certifi==2024.8.30 # via requests chardet==5.2.0 # via - # -r requirements/tox.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/tox.txt # tox -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests colorama==0.4.6 # via - # -r requirements/tox.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/tox.txt # tox -coverage[toml]==7.6.1 +coverage[toml]==7.6.4 # via coveralls coveralls==4.0.1 # via -r requirements/ci.in -distlib==0.3.8 +distlib==0.3.9 # via - # -r requirements/tox.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/tox.txt # virtualenv docopt==0.6.2 # via coveralls -filelock==3.16.0 +filelock==3.16.1 # via - # -r requirements/tox.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/tox.txt # tox # virtualenv idna==3.10 # via requests packaging==24.1 # via - # -r requirements/tox.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/tox.txt # pyproject-api # tox -platformdirs==4.3.3 +platformdirs==4.3.6 # via - # -r requirements/tox.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/tox.txt # tox # virtualenv pluggy==1.5.0 # via - # -r requirements/tox.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/tox.txt # tox -pyproject-api==1.7.1 +pyproject-api==1.8.0 # via - # -r requirements/tox.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/tox.txt # tox requests==2.32.3 # via coveralls -tox==4.18.1 - # via -r requirements/tox.txt +tox==4.23.2 + # via -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/tox.txt urllib3==2.2.3 # via requests -virtualenv==20.26.4 +virtualenv==20.27.0 # via - # -r requirements/tox.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/tox.txt # tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 15aafb2..31879f7 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -13,11 +13,19 @@ # using LTS django version -Django<4.0 +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 + +# Cause: https://github.com/openedx/event-tracking/pull/290 +# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform. +# We will pin event-tracking to do not break existing installations +# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586 +# has been resolved and edx-platform is running with pymongo>=4.4.0 +event-tracking<2.4.1 diff --git a/requirements/pip.txt b/requirements/pip.txt index ec02f2b..c8b5665 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.44.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.2 +pip==24.3.1 # via -r requirements/pip.in -setuptools==75.0.0 +setuptools==75.2.0 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 77d81ad..81e6fbc 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -4,7 +4,7 @@ # # make upgrade # -build==1.2.2 +build==1.2.2.post1 # via pip-tools click==8.1.7 # via pip-tools @@ -12,7 +12,7 @@ packaging==24.1 # 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 diff --git a/requirements/quality.txt b/requirements/quality.txt index 4b304f0..ea28b77 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -6,111 +6,110 @@ # appdirs==1.4.4 # via - # -r requirements/base.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # fs asgiref==3.8.1 # via - # -r requirements/base.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # django -astroid==3.2.4 +astroid==3.3.5 # via pylint -coverage==7.6.1 - # via -r requirements/test.txt -dill==0.3.8 +coverage==7.6.4 + # via -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/test.txt +dill==0.3.9 # via pylint -django==3.2.25 +django==4.2.16 # via - # -c requirements/common_constraints.txt - # -r requirements/base.txt -dnspython==2.6.1 + # -c /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/common_constraints.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt +dnspython==2.7.0 # via - # -r requirements/test.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/test.txt # pymongo edx-opaque-keys==2.11.0 - # via -r requirements/test.txt + # via -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/test.txt fs==2.4.16 # via - # -r requirements/base.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # xblock isort==5.13.2 # via pylint lxml==5.3.0 # via - # -r requirements/base.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # xblock -mako==1.3.5 +mako==1.3.6 # via - # -r requirements/base.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # xblock -markupsafe==2.1.5 +markupsafe==3.0.2 # via - # -r requirements/base.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # mako # xblock mccabe==0.7.0 # via pylint mock==5.1.0 - # via -r requirements/test.txt + # via -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/test.txt pbr==6.1.0 # via - # -r requirements/test.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/test.txt # stevedore -platformdirs==4.3.3 +platformdirs==4.3.6 # via pylint pycodestyle==2.12.1 # via -r requirements/quality.in -pylint==3.2.7 +pylint==3.3.1 # via -r requirements/quality.in -pymongo==4.8.0 +pymongo==4.10.1 # via - # -r requirements/test.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/test.txt # edx-opaque-keys python-dateutil==2.9.0.post0 # via - # -r requirements/base.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # xblock pytz==2024.2 # via - # -r requirements/base.txt - # django + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # xblock pyyaml==6.0.2 # via - # -r requirements/base.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # xblock simplejson==3.19.3 # via - # -r requirements/base.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # xblock six==1.16.0 # via - # -r requirements/base.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # fs # python-dateutil sqlparse==0.5.1 # via - # -r requirements/base.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # django stevedore==5.3.0 # via - # -r requirements/test.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/test.txt # edx-opaque-keys tomlkit==0.13.2 # via pylint typing-extensions==4.12.2 # via - # -r requirements/test.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/test.txt # edx-opaque-keys web-fragments==2.2.0 # via - # -r requirements/base.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # xblock -webob==1.8.8 +webob==1.8.9 # via - # -r requirements/base.txt + # -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # xblock xblock==5.1.0 - # via -r requirements/base.txt + # via -r /home/runner/work/xblock-qualtrics-survey/xblock-qualtrics-survey/requirements/base.txt # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/test.txt b/requirements/test.txt index 00a237d..f1c4d97 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,9 +4,9 @@ # # make upgrade # -coverage==7.6.1 +coverage==7.6.4 # 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,7 +14,7 @@ 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 # via edx-opaque-keys diff --git a/requirements/tox.txt b/requirements/tox.txt index 606ba12..7ffc0c1 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -10,9 +10,9 @@ 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 @@ -20,15 +20,15 @@ packaging==24.1 # via # pyproject-api # tox -platformdirs==4.3.3 +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.27.0 # via tox