From 970d564a49891e9ec230f819bfc9591d70f1bf52 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 28 Jan 2024 19:19:41 -0500 Subject: [PATCH 1/3] chore: Updating Python Requirements --- requirements/base.txt | 8 ++++---- requirements/ci.txt | 2 +- requirements/test.txt | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 564977a..d4744a1 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,9 +8,9 @@ appdirs==1.4.4 # via fs asgiref==3.7.2 # via django -boto3==1.34.25 +boto3==1.34.29 # via fs-s3fs -botocore==1.34.25 +botocore==1.34.29 # via # boto3 # s3transfer @@ -38,7 +38,7 @@ lxml==5.1.0 # via # parsel # xblock -mako==1.3.1 +mako==1.3.0 # via xblock markupsafe==2.1.4 # via @@ -81,7 +81,7 @@ web-fragments==2.1.0 # via xblock webob==1.8.7 # via xblock -xblock[django]==1.9.1 +xblock[django]==1.10.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/ci.txt b/requirements/ci.txt index ebdfb1e..b20990d 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -24,7 +24,7 @@ platformdirs==4.1.0 # via # tox # virtualenv -pluggy==1.3.0 +pluggy==1.4.0 # via tox pyproject-api==1.6.1 # via tox diff --git a/requirements/test.txt b/requirements/test.txt index 8688317..452b07c 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -20,11 +20,11 @@ astroid==3.0.2 # pylint-celery binaryornot==0.4.4 # via cookiecutter -boto3==1.34.25 +boto3==1.34.29 # via # -r requirements/base.txt # fs-s3fs -botocore==1.34.25 +botocore==1.34.29 # via # -r requirements/base.txt # boto3 @@ -47,7 +47,7 @@ code-annotations==1.5.0 # via edx-lint cookiecutter==2.5.0 # via xblock-sdk -coverage[toml]==7.4.0 +coverage[toml]==7.4.1 # via # coverage # pytest-cov @@ -55,7 +55,7 @@ cssselect==1.2.0 # via # -r requirements/base.txt # parsel -dill==0.3.7 +dill==0.3.8 # via pylint # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt @@ -103,7 +103,7 @@ lxml==5.1.0 # parsel # xblock # xblock-sdk -mako==1.3.1 +mako==1.3.0 # via # -r requirements/base.txt # xblock @@ -136,7 +136,7 @@ pbr==6.0.0 # via stevedore platformdirs==4.1.0 # via pylint -pluggy==1.3.0 +pluggy==1.4.0 # via pytest pycodestyle==2.11.1 # via -r requirements/test.in @@ -158,7 +158,7 @@ pylint-plugin-utils==0.8.2 # pylint-django pypng==0.20220715.0 # via xblock-sdk -pytest==7.4.4 +pytest==8.0.0 # via # pytest-cov # pytest-django @@ -172,7 +172,7 @@ python-dateutil==2.8.2 # arrow # botocore # xblock -python-slugify==8.0.1 +python-slugify==8.0.2 # via # code-annotations # cookiecutter @@ -252,7 +252,7 @@ webob==1.8.7 # -r requirements/base.txt # xblock # xblock-sdk -xblock[django]==1.9.1 +xblock[django]==1.10.0 # via # -r requirements/base.txt # xblock From 2040e48fa246c2b43fa35679740f64e221c489fd Mon Sep 17 00:00:00 2001 From: Agrendalath Date: Tue, 30 Jan 2024 00:02:46 +0100 Subject: [PATCH 2/3] chore: Updating Python Requirements --- requirements/base.txt | 6 +++--- requirements/test.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index d4744a1..e11abdd 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,9 +8,9 @@ appdirs==1.4.4 # via fs asgiref==3.7.2 # via django -boto3==1.34.29 +boto3==1.34.30 # via fs-s3fs -botocore==1.34.29 +botocore==1.34.30 # via # boto3 # s3transfer @@ -54,7 +54,7 @@ python-dateutil==2.8.2 # via # botocore # xblock -pytz==2023.3.post1 +pytz==2023.4 # via # django # xblock diff --git a/requirements/test.txt b/requirements/test.txt index 452b07c..d375b6e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -20,11 +20,11 @@ astroid==3.0.2 # pylint-celery binaryornot==0.4.4 # via cookiecutter -boto3==1.34.29 +boto3==1.34.30 # via # -r requirements/base.txt # fs-s3fs -botocore==1.34.29 +botocore==1.34.30 # via # -r requirements/base.txt # boto3 @@ -176,7 +176,7 @@ python-slugify==8.0.2 # via # code-annotations # cookiecutter -pytz==2023.3.post1 +pytz==2023.4 # via # -r requirements/base.txt # django From 19d4c034081164000701c9eda67306b94d91c23e Mon Sep 17 00:00:00 2001 From: Agrendalath Date: Tue, 30 Jan 2024 00:03:40 +0100 Subject: [PATCH 3/3] fix: pin `parsel` to `1.6.0` --- image_explorer/__init__.py | 2 +- requirements/base.txt | 10 +++++----- requirements/constraints.txt | 4 ++++ requirements/test.txt | 9 ++++----- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/image_explorer/__init__.py b/image_explorer/__init__.py index 51a5d59..467efa7 100644 --- a/image_explorer/__init__.py +++ b/image_explorer/__init__.py @@ -22,4 +22,4 @@ """ from .image_explorer import ImageExplorerBlock -__version__ = '2.2.0' +__version__ = '2.2.1' diff --git a/requirements/base.txt b/requirements/base.txt index e11abdd..058dfdc 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -31,7 +31,6 @@ jmespath==1.0.1 # via # boto3 # botocore - # parsel lazy==1.6 # via xblock lxml==5.1.0 @@ -46,10 +45,10 @@ markupsafe==2.1.4 # xblock openedx-django-pyfs==3.4.1 # via xblock -packaging==23.2 - # via parsel -parsel==1.8.1 - # via -r requirements/base.in +parsel==1.6.0 + # via + # -c requirements/constraints.txt + # -r requirements/base.in python-dateutil==2.8.2 # via # botocore @@ -68,6 +67,7 @@ six==1.16.0 # via # fs # fs-s3fs + # parsel # python-dateutil sqlparse==0.4.4 # via django diff --git a/requirements/constraints.txt b/requirements/constraints.txt index a737d6f..d928eac 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -10,3 +10,7 @@ # Common constraints for edx repos -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + +# Newer versions fail with: +# `AttributeError: module 'openedx.core.lib.safe_lxml.etree' has no attribute '__version__'`. +parsel==1.6.0 diff --git a/requirements/test.txt b/requirements/test.txt index d375b6e..10aafcc 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -92,7 +92,6 @@ jmespath==1.0.1 # -r requirements/base.txt # boto3 # botocore - # parsel lazy==1.6 # via # -r requirements/base.txt @@ -126,12 +125,11 @@ openedx-django-pyfs==3.4.1 # -r requirements/base.txt # xblock packaging==23.2 + # via pytest +parsel==1.6.0 # via + # -c requirements/constraints.txt # -r requirements/base.txt - # parsel - # pytest -parsel==1.8.1 - # via -r requirements/base.txt pbr==6.0.0 # via stevedore platformdirs==4.1.0 @@ -208,6 +206,7 @@ six==1.16.0 # edx-lint # fs # fs-s3fs + # parsel # python-dateutil sqlparse==0.4.4 # via