From fc9d251e4e6296be063454c0822ef64b6681220d Mon Sep 17 00:00:00 2001
From: qued <64741807+qued@users.noreply.github.com>
Date: Fri, 1 Sep 2023 14:47:50 -0500
Subject: [PATCH] build(deps): Remove pillow pin (#1274)

Removed pin for `PIL` as `detectron2` repo has been updated, and so has
`unstructured-inference`.
---
 CHANGELOG.md                     | 4 +++-
 Makefile                         | 9 ++++++---
 requirements/constraints.in      | 3 ---
 requirements/dev.txt             | 2 +-
 requirements/extra-pdf-image.in  | 3 ---
 requirements/extra-pdf-image.txt | 4 +---
 requirements/extra-pptx.in       | 4 +++-
 requirements/extra-pptx.txt      | 8 +++-----
 requirements/ingest-gcs.txt      | 1 -
 requirements/test.txt            | 2 +-
 unstructured/__version__.py      | 2 +-
 11 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd80e05c24..b60bc38964 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,9 @@
-## 0.10.12-dev1
+## 0.10.12-dev2
 
 ### Enhancements
 
+* Removed PIL pin as issue has been resolved upstream
+
 ### Features
 
 ### Fixes
diff --git a/Makefile b/Makefile
index 1aa286ed85..afbb338d83 100644
--- a/Makefile
+++ b/Makefile
@@ -204,10 +204,13 @@ install-pandoc:
 ## pip-compile:             compiles all base/dev/test requirements
 .PHONY: pip-compile
 pip-compile:
-	@for file in $(shell ls requirements/*.in); \
-		do echo "running: pip-compile --upgrade $${file}" && \
+	@for file in $(shell ls requirements/*.in); do \
+		if [[ "$${file}" =~ "constraints" ]]; then \
+			continue; \
+		fi; \
+		echo "running: pip-compile --upgrade $${file}"; \
 		pip-compile --upgrade $${file}; \
-	 done
+	done
 	cp requirements/build.txt docs/requirements.txt
 
 
diff --git a/requirements/constraints.in b/requirements/constraints.in
index f0eb217c63..fdd8109ca3 100644
--- a/requirements/constraints.in
+++ b/requirements/constraints.in
@@ -19,9 +19,6 @@ pyparsing<3.1.0
 numpy<1.25.0
 scipy<1.11.0
 IPython<8.13
-# NOTE(robinson) - See this issue here
-# https://github.com/facebookresearch/detectron2/issues/5010
-Pillow<10.0.0
 # NOTE(alan) Pinned to avoid error that occurs with 2.4.3:
 # AttributeError: 'ResourcePath' object has no attribute 'collection'
 Office365-REST-Python-Client<2.4.3
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 185009ac0e..bfb6b900f3 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -294,7 +294,7 @@ pyzmq==25.1.1
     #   jupyter-console
     #   jupyter-server
     #   qtconsole
-qtconsole==5.4.3
+qtconsole==5.4.4
     # via jupyter
 qtpy==2.4.0
     # via qtconsole
diff --git a/requirements/extra-pdf-image.in b/requirements/extra-pdf-image.in
index b89ae5a602..ffb8c29274 100644
--- a/requirements/extra-pdf-image.in
+++ b/requirements/extra-pdf-image.in
@@ -3,7 +3,4 @@
 
 pdf2image
 pdfminer.six
-# NOTE(robinson) - See this issue here
-# https://github.com/facebookresearch/detectron2/issues/5010
-Pillow<10
 unstructured-inference
diff --git a/requirements/extra-pdf-image.txt b/requirements/extra-pdf-image.txt
index e53a5de473..854cc6ccd8 100644
--- a/requirements/extra-pdf-image.txt
+++ b/requirements/extra-pdf-image.txt
@@ -109,10 +109,8 @@ pdfminer-six==20221105
     #   pdfplumber
 pdfplumber==0.10.2
     # via layoutparser
-pillow==9.5.0
+pillow==10.0.0
     # via
-    #   -c requirements/constraints.in
-    #   -r requirements/extra-pdf-image.in
     #   layoutparser
     #   matplotlib
     #   pdf2image
diff --git a/requirements/extra-pptx.in b/requirements/extra-pptx.in
index 9f5499c689..0aec866a53 100644
--- a/requirements/extra-pptx.in
+++ b/requirements/extra-pptx.in
@@ -1,3 +1,5 @@
 -c "constraints.in"
 
-python-pptx
+# NOTE(alan): Pinned due to python-pptx 0.6.22 pinning Pillow to <= 0.9.5, and it seems more
+# important to use the new version of Pillow
+python-pptx<=0.6.21
diff --git a/requirements/extra-pptx.txt b/requirements/extra-pptx.txt
index fd91f8dac0..3506bbea72 100644
--- a/requirements/extra-pptx.txt
+++ b/requirements/extra-pptx.txt
@@ -6,11 +6,9 @@
 #
 lxml==4.9.3
     # via python-pptx
-pillow==9.5.0
-    # via
-    #   -c requirements/constraints.in
-    #   python-pptx
-python-pptx==0.6.22
+pillow==10.0.0
+    # via python-pptx
+python-pptx==0.6.21
     # via -r requirements/extra-pptx.in
 xlsxwriter==3.1.2
     # via python-pptx
diff --git a/requirements/ingest-gcs.txt b/requirements/ingest-gcs.txt
index 2af7e774f3..1527e36914 100644
--- a/requirements/ingest-gcs.txt
+++ b/requirements/ingest-gcs.txt
@@ -80,7 +80,6 @@ protobuf==4.23.4
     # via
     #   -c requirements/constraints.in
     #   google-api-core
-    #   googleapis-common-protos
 pyasn1==0.5.0
     # via
     #   pyasn1-modules
diff --git a/requirements/test.txt b/requirements/test.txt
index fe30df8ffe..bb83d7f4b9 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -97,7 +97,7 @@ requests==2.31.0
     # via
     #   -c requirements/base.txt
     #   label-studio-sdk
-ruff==0.0.286
+ruff==0.0.287
     # via -r requirements/test.in
 six==1.16.0
     # via python-dateutil
diff --git a/unstructured/__version__.py b/unstructured/__version__.py
index 9edd49c092..e6e3d9462b 100644
--- a/unstructured/__version__.py
+++ b/unstructured/__version__.py
@@ -1 +1 @@
-__version__ = "0.10.12-dev1"  # pragma: no cover
+__version__ = "0.10.12-dev2"  # pragma: no cover