From 3982d243d2c8083fe4357e8c94872e05a1bed64b Mon Sep 17 00:00:00 2001 From: Elizabeth Thompson Date: Fri, 21 Jan 2022 16:47:16 -0800 Subject: [PATCH 1/2] bump pillow to major version --- requirements/development.in | 2 +- requirements/development.txt | 4 ++-- requirements/testing.txt | 2 ++ setup.py | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/requirements/development.in b/requirements/development.in index a1944b9c6faea..0138d97b7fc57 100644 --- a/requirements/development.in +++ b/requirements/development.in @@ -18,7 +18,7 @@ -r base.in flask-cors>=2.0.0 mysqlclient>=2.1.0 -pillow>=8.3.2,<9 +pillow>=9.0.0,<10 pydruid>=0.6.1,<0.7 pyhive[hive]>=0.6.1 psycopg2-binary==2.9.1 diff --git a/requirements/development.txt b/requirements/development.txt index ee6d2ab5bc31b..d5b8bd3aa9969 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -1,4 +1,4 @@ -# SHA1:c835350e502151c63817980505ce50b9e5b78a54 +# SHA1:9bd683cab1a1362e706e7329aceb030dacbec461 # # This file is autogenerated by pip-compile-multi # To update, run: @@ -40,7 +40,7 @@ mysqlclient==2.1.0 # via -r requirements/development.in openpyxl==3.0.7 # via tabulator -pillow==8.4.0 +pillow==9.0.0 # via -r requirements/development.in progress==1.6 # via -r requirements/development.in diff --git a/requirements/testing.txt b/requirements/testing.txt index 8eb0d4f3ec3a4..a02d250526edc 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -11,6 +11,8 @@ # via # -r requirements/base.in # -r requirements/testing.in +appnope==0.1.2 + # via ipython astroid==2.6.6 # via pylint backcall==0.2.0 diff --git a/setup.py b/setup.py index a2f32fd5d845b..ea165749c0d24 100644 --- a/setup.py +++ b/setup.py @@ -160,7 +160,7 @@ def get_git_sha() -> str: "snowflake-sqlalchemy==1.2.4" ], # PINNED! 1.2.5 introduced breaking changes requiring sqlalchemy>=1.4.0 "teradata": ["sqlalchemy-teradata==0.9.0.dev0"], - "thumbnails": ["Pillow>=8.3.2, <9.0.0"], + "thumbnails": ["Pillow>=9.0.0, <10.0.0"], "vertica": ["sqlalchemy-vertica-python>=0.5.9, < 0.6"], "netezza": ["nzalchemy>=11.0.2"], }, From 7ae73a774ab2cbe8837aa3d9105e414b0f807655 Mon Sep 17 00:00:00 2001 From: Elizabeth Thompson Date: Mon, 24 Jan 2022 17:06:19 -0800 Subject: [PATCH 2/2] make a wider range for pillow dependency versions --- requirements/development.in | 2 +- requirements/development.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/development.in b/requirements/development.in index 0138d97b7fc57..163bc5082ab6b 100644 --- a/requirements/development.in +++ b/requirements/development.in @@ -18,7 +18,7 @@ -r base.in flask-cors>=2.0.0 mysqlclient>=2.1.0 -pillow>=9.0.0,<10 +pillow>=8.3.2,<10 pydruid>=0.6.1,<0.7 pyhive[hive]>=0.6.1 psycopg2-binary==2.9.1 diff --git a/requirements/development.txt b/requirements/development.txt index d5b8bd3aa9969..8012be69b428d 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -1,4 +1,4 @@ -# SHA1:9bd683cab1a1362e706e7329aceb030dacbec461 +# SHA1:cb189e676baa2e397294abb48eaefba5bf408522 # # This file is autogenerated by pip-compile-multi # To update, run: diff --git a/setup.py b/setup.py index ea165749c0d24..2ee9012f1e86b 100644 --- a/setup.py +++ b/setup.py @@ -160,7 +160,7 @@ def get_git_sha() -> str: "snowflake-sqlalchemy==1.2.4" ], # PINNED! 1.2.5 introduced breaking changes requiring sqlalchemy>=1.4.0 "teradata": ["sqlalchemy-teradata==0.9.0.dev0"], - "thumbnails": ["Pillow>=9.0.0, <10.0.0"], + "thumbnails": ["Pillow>=8.3.2, <10.0.0"], "vertica": ["sqlalchemy-vertica-python>=0.5.9, < 0.6"], "netezza": ["nzalchemy>=11.0.2"], },