From 30b37a75e3136aea167d68f478c28ef6379ecf5c Mon Sep 17 00:00:00 2001 From: Muhammad Soban Javed Date: Thu, 25 Apr 2024 19:08:48 +0500 Subject: [PATCH 1/3] chore!: upgrade Pillow to version 10.0.1 --- requirements/constraints.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 30247b3a9b..168f9a7dca 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -42,8 +42,8 @@ requests-toolbelt==0.10.1 # https://pypi.org/project/backports.zoneinfo/ backports.zoneinfo;python_version<"3.9" -# Pillow 10 is causing django-stdimage to break when accessing ANTIALIAS variable on Image -pillow < 10.0.0 +# Targetting 10.0.0 version for python 3.12, can be further upgraded later on +pillow < 10.1.0 # 4.2.0 is breaking django-elasticsearch-debug-toolbar # Awaiting fix https://github.com/Benoss/django-elasticsearch-debug-toolbar/pull/21 to be merged From 2c63a3ad8fcc4e8d33654c67b7b678b0466273c0 Mon Sep 17 00:00:00 2001 From: Muhammad Soban Javed Date: Thu, 25 Apr 2024 19:11:00 +0500 Subject: [PATCH 2/3] temp: only upgrade Pillow --- Makefile | 10 +++++----- requirements/base.in | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 17fc1893b3..3d7f850914 100644 --- a/Makefile +++ b/Makefile @@ -58,13 +58,13 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp mv requirements/common_constraints.tmp requirements/common_constraints.txt pip install -q -r requirements/pip_tools.txt - pip-compile --allow-unsafe --upgrade -o requirements/pip.txt requirements/pip.in - pip-compile --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in + pip-compile --allow-unsafe -o requirements/pip.txt requirements/pip.in + pip-compile -o requirements/pip_tools.txt requirements/pip_tools.in pip install -q -r requirements/pip.txt pip install -q -r requirements/pip_tools.txt - pip-compile --upgrade -o requirements/docs.txt requirements/docs.in - pip-compile --upgrade -o requirements/local.txt requirements/local.in - pip-compile --upgrade -o requirements/production.txt requirements/production.in + pip-compile -o requirements/docs.txt requirements/docs.in + pip-compile -o requirements/local.txt requirements/local.in + pip-compile -o requirements/production.txt requirements/production.in # Let tox control the Django version for tests grep -e "^django==" requirements/local.txt > requirements/django.txt sed -i.tmp '/^[dD]jango==/d' requirements/local.txt diff --git a/requirements/base.in b/requirements/base.in index e28c73844f..1b1f19d7af 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -66,7 +66,7 @@ lxml[html_clean] jsonfield markdown openedx-atlas -pillow +pillow==10.0.1 pycountry python-dateutil pytz From cfda73e950ad889cd7cd79bc577844214e729dd3 Mon Sep 17 00:00:00 2001 From: Muhammad Soban Javed Date: Thu, 25 Apr 2024 19:28:13 +0500 Subject: [PATCH 3/3] chore: python requirements update --- requirements/local.txt | 2 +- requirements/production.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/local.txt b/requirements/local.txt index d9ab3cd4d2..44e05279bb 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -576,7 +576,7 @@ pbr==6.0.0 # via stevedore peewee==3.17.3 # via semgrep -pillow==9.5.0 +pillow==10.0.1 # via # -c requirements/constraints.txt # -r requirements/base.in diff --git a/requirements/production.txt b/requirements/production.txt index 3c78f15084..0ecbe1d875 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -464,7 +464,7 @@ packaging==24.0 # snowflake-connector-python pbr==6.0.0 # via stevedore -pillow==9.5.0 +pillow==10.0.1 # via # -c requirements/constraints.txt # -r requirements/base.in