From 67269eb9e94749299f600f68b80b9360acbcbd65 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 19 May 2024 20:16:54 -0400 Subject: [PATCH 1/2] chore: Updating Python Requirements --- requirements/base.txt | 6 +++--- requirements/ci.txt | 4 ++-- requirements/dev.txt | 18 +++++++++--------- requirements/doc.txt | 14 +++++++------- requirements/pip-tools.txt | 2 +- requirements/quality.txt | 14 +++++++------- requirements/test.txt | 8 ++++---- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index ff61589..3cf4d2e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -84,16 +84,16 @@ jinja2==3.1.4 # via code-annotations kombu==5.3.7 # via celery -lxml==5.2.1 +lxml==5.2.2 # via xblock -mako==1.3.3 +mako==1.3.5 # via xblock markupsafe==2.1.5 # via # jinja2 # mako # xblock -newrelic==9.9.0 +newrelic==9.9.1 # via edx-django-utils oauthlib==3.2.2 # via requests-oauthlib diff --git a/requirements/ci.txt b/requirements/ci.txt index 2877eac..0008d40 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -20,7 +20,7 @@ packaging==24.0 # via # pyproject-api # tox -platformdirs==4.2.1 +platformdirs==4.2.2 # via # tox # virtualenv @@ -34,5 +34,5 @@ tomli==2.0.1 # tox tox==4.15.0 # via -r requirements/ci.in -virtualenv==20.26.1 +virtualenv==20.26.2 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index c303d5d..7616eb9 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -16,7 +16,7 @@ asgiref==3.8.1 # via # -r requirements/quality.txt # django -astroid==3.1.0 +astroid==3.2.2 # via # -r requirements/quality.txt # pylint @@ -207,7 +207,7 @@ kombu==5.3.7 # via # -r requirements/quality.txt # celery -lxml[html-clean]==5.2.1 +lxml[html-clean]==5.2.2 # via # -r requirements/quality.txt # edx-i18n-tools @@ -215,7 +215,7 @@ lxml[html-clean]==5.2.1 # xblock lxml-html-clean==0.1.1 # via lxml -mako==1.3.3 +mako==1.3.5 # via # -r requirements/quality.txt # xblock @@ -237,7 +237,7 @@ mypy-extensions==1.0.0 # via # -r requirements/quality.txt # black -newrelic==9.9.0 +newrelic==9.9.1 # via # -r requirements/quality.txt # edx-django-utils @@ -271,7 +271,7 @@ pbr==6.0.0 # stevedore pip-tools==7.4.1 # via -r requirements/pip-tools.txt -platformdirs==4.2.1 +platformdirs==4.2.2 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -306,7 +306,7 @@ pydocstyle==6.3.0 # via -r requirements/quality.txt pygments==2.18.0 # via diff-cover -pylint==3.1.0 +pylint==3.2.1 # via # -r requirements/quality.txt # edx-lint @@ -343,7 +343,7 @@ pyproject-hooks==1.1.0 # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.2.0 +pytest==8.2.1 # via # -r requirements/quality.txt # pytest-cov @@ -461,7 +461,7 @@ vine==5.1.0 # amqp # celery # kombu -virtualenv==20.26.1 +virtualenv==20.26.2 # via # -r requirements/ci.txt # tox @@ -483,7 +483,7 @@ wheel==0.43.0 # pip-tools xblock==4.0.1 # via -r requirements/quality.txt -zipp==3.18.1 +zipp==3.18.2 # via # -r requirements/pip-tools.txt # importlib-metadata diff --git a/requirements/doc.txt b/requirements/doc.txt index b7880e5..3e6e415 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -185,17 +185,17 @@ jinja2==3.1.4 # -r requirements/test.txt # code-annotations # sphinx -keyring==25.2.0 +keyring==25.2.1 # via twine kombu==5.3.7 # via # -r requirements/test.txt # celery -lxml==5.2.1 +lxml==5.2.2 # via # -r requirements/test.txt # xblock -mako==1.3.3 +mako==1.3.5 # via # -r requirements/test.txt # xblock @@ -217,7 +217,7 @@ more-itertools==10.2.0 # via # jaraco-classes # jaraco-functools -newrelic==9.9.0 +newrelic==9.9.1 # via # -r requirements/test.txt # edx-django-utils @@ -280,7 +280,7 @@ pynacl==1.5.0 # edx-django-utils pyproject-hooks==1.1.0 # via build -pytest==8.2.0 +pytest==8.2.1 # via # -r requirements/test.txt # pytest-cov @@ -395,7 +395,7 @@ tomli==2.0.1 # coverage # doc8 # pytest -twine==5.0.0 +twine==5.1.0 # via -r requirements/doc.in typing-extensions==4.11.0 # via @@ -436,7 +436,7 @@ webob==1.8.7 # xblock xblock==4.0.1 # via -r requirements/test.txt -zipp==3.18.1 +zipp==3.18.2 # via # importlib-metadata # importlib-resources diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 3f05628..dbb1ac7 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -26,7 +26,7 @@ tomli==2.0.1 # pip-tools wheel==0.43.0 # via pip-tools -zipp==3.18.1 +zipp==3.18.2 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/quality.txt b/requirements/quality.txt index 3867c12..aadc3b1 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -16,7 +16,7 @@ asgiref==3.8.1 # via # -r requirements/test.txt # django -astroid==3.1.0 +astroid==3.2.2 # via # pylint # pylint-celery @@ -161,11 +161,11 @@ kombu==5.3.7 # via # -r requirements/test.txt # celery -lxml==5.2.1 +lxml==5.2.2 # via # -r requirements/test.txt # xblock -mako==1.3.3 +mako==1.3.5 # via # -r requirements/test.txt # xblock @@ -183,7 +183,7 @@ model-bakery==1.18.0 # django-mock-queries mypy-extensions==1.0.0 # via black -newrelic==9.9.0 +newrelic==9.9.1 # via # -r requirements/test.txt # edx-django-utils @@ -206,7 +206,7 @@ pbr==6.0.0 # via # -r requirements/test.txt # stevedore -platformdirs==4.2.1 +platformdirs==4.2.2 # via # black # pylint @@ -230,7 +230,7 @@ pycparser==2.22 # cffi pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==3.1.0 +pylint==3.2.1 # via # edx-lint # pylint-celery @@ -252,7 +252,7 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==8.2.0 +pytest==8.2.1 # via # -r requirements/test.txt # pytest-cov diff --git a/requirements/test.txt b/requirements/test.txt index a47e007..de122b4 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -135,11 +135,11 @@ kombu==5.3.7 # via # -r requirements/base.txt # celery -lxml==5.2.1 +lxml==5.2.2 # via # -r requirements/base.txt # xblock -mako==1.3.3 +mako==1.3.5 # via # -r requirements/base.txt # xblock @@ -151,7 +151,7 @@ markupsafe==2.1.5 # xblock model-bakery==1.18.0 # via django-mock-queries -newrelic==9.9.0 +newrelic==9.9.1 # via # -r requirements/base.txt # edx-django-utils @@ -191,7 +191,7 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==8.2.0 +pytest==8.2.1 # via # pytest-cov # pytest-django From 8a7e01d8fcac99be65ae02b9b182291bc9ea3ba2 Mon Sep 17 00:00:00 2001 From: Brian Mesick Date: Mon, 20 May 2024 14:27:07 -0400 Subject: [PATCH 2/2] style: Fix linting issues uncovered in pylint upgrade --- .../management/commands/monitor_load_test_tracking.py | 1 + platform_plugin_aspects/tests/test_xblock.py | 1 + 2 files changed, 2 insertions(+) diff --git a/platform_plugin_aspects/management/commands/monitor_load_test_tracking.py b/platform_plugin_aspects/management/commands/monitor_load_test_tracking.py index fe4ba86..d1f902c 100644 --- a/platform_plugin_aspects/management/commands/monitor_load_test_tracking.py +++ b/platform_plugin_aspects/management/commands/monitor_load_test_tracking.py @@ -142,6 +142,7 @@ def run(self) -> None: while True: start = datetime.datetime.now() log.info(f"----------- {start} --------") + lag = None current_stats = {"clickhouse": self.get_clickhouse_stats()} if collect_redis_bus: diff --git a/platform_plugin_aspects/tests/test_xblock.py b/platform_plugin_aspects/tests/test_xblock.py index 354b52d..d890afc 100644 --- a/platform_plugin_aspects/tests/test_xblock.py +++ b/platform_plugin_aspects/tests/test_xblock.py @@ -99,6 +99,7 @@ def test_render_translations(self, mock_get_language, mock_resource_exists): mock_resource_exists.return_value = True xblock = make_an_xblock("instructor") student_view = xblock.student_view() + url_resource = None for resource in student_view.resources: if resource.kind == "url": url_resource = resource