Skip to content

Commit

Permalink
build(deps): pin opencv-python for linux compatibility (#18)
Browse files Browse the repository at this point in the history
  • Loading branch information
MthwRobinson authored Jan 13, 2023
1 parent a21325f commit 95d797f
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 23 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.2.3

* Pins the version of `opencv-python` for linux compatibility

## 0.2.2

* Add capability to process image files
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ install-dev:
## pip-compile: compiles all base/dev/test requirements
.PHONY: pip-compile
pip-compile:
pip-compile requirements/base.in
pip-compile -o requirements/base.txt
# NOTE(robinson) - We want the dependencies for detectron2 in the requirements.txt, but not
# the detectron2 repo itself. If detectron2 is in the requirements.txt file, an order of
# operations issue related to the torch library causes the install to fail
Expand Down
5 changes: 0 additions & 5 deletions requirements/base.in

This file was deleted.

20 changes: 11 additions & 9 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile requirements/base.in
# pip-compile --output-file=requirements/base.txt
#
antlr4-python3-runtime==4.9.3
# via omegaconf
Expand All @@ -27,7 +27,7 @@ cycler==0.11.0
effdet==0.3.0
# via layoutparser
fastapi==0.85.1
# via -r requirements/base.in
# via unstructured-inference (setup.py)
filelock==3.8.0
# via huggingface-hub
fonttools==4.37.4
Expand All @@ -36,8 +36,8 @@ h11==0.14.0
# via uvicorn
huggingface-hub==0.10.1
# via
# -r requirements/base.in
# timm
# unstructured-inference (setup.py)
idna==3.4
# via
# anyio
Expand All @@ -47,7 +47,7 @@ iopath==0.1.10
kiwisolver==1.4.4
# via matplotlib
layoutparser[layoutmodels,tesseract]==0.3.4
# via -r requirements/base.in
# via unstructured-inference (setup.py)
matplotlib==3.6.1
# via pycocotools
numpy==1.23.4
Expand All @@ -63,7 +63,9 @@ numpy==1.23.4
omegaconf==2.2.3
# via effdet
opencv-python==4.6.0.66
# via layoutparser
# via
# layoutparser
# unstructured-inference (setup.py)
packaging==21.3
# via
# huggingface-hub
Expand Down Expand Up @@ -104,7 +106,7 @@ python-dateutil==2.8.2
# matplotlib
# pandas
python-multipart==0.0.5
# via -r requirements/base.in
# via unstructured-inference (setup.py)
pytz==2022.5
# via pandas
pyyaml==6.0
Expand Down Expand Up @@ -155,6 +157,6 @@ typing-extensions==4.4.0
urllib3==1.26.12
# via requests
uvicorn==0.19.0
# via -r requirements/base.in
# via unstructured-inference (setup.py)
wand==0.6.10
# via pdfplumber
28 changes: 23 additions & 5 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile requirements/dev.in
#
anyio==3.6.1
# via jupyter-server
appnope==0.1.3
# via
# ipykernel
# ipython
argon2-cffi==21.3.0
# via
# jupyter-server
Expand Down Expand Up @@ -43,6 +47,10 @@ fastjsonschema==2.16.2
# via nbformat
idna==3.4
# via anyio
importlib-metadata==6.0.0
# via nbconvert
importlib-resources==5.10.2
# via jsonschema
ipykernel==6.16.0
# via
# ipywidgets
Expand All @@ -53,7 +61,7 @@ ipykernel==6.16.0
# qtconsole
ipython==8.8.0
# via
# -r dev.in
# -r requirements/dev.in
# ipykernel
# ipywidgets
# jupyter-console
Expand All @@ -75,7 +83,7 @@ jinja2==3.1.2
jsonschema==4.16.0
# via nbformat
jupyter==1.0.0
# via -r dev.in
# via -r requirements/dev.in
jupyter-client==7.4.2
# via
# ipykernel
Expand Down Expand Up @@ -160,7 +168,9 @@ pexpect==4.8.0
pickleshare==0.7.5
# via ipython
pip-tools==6.12.1
# via -r dev.in
# via -r requirements/dev.in
pkgutil-resolve-name==1.3.10
# via jsonschema
prometheus-client==0.15.0
# via
# jupyter-server
Expand Down Expand Up @@ -227,6 +237,10 @@ terminado==0.16.0
# notebook
tinycss2==1.2.1
# via nbconvert
tomli==2.0.1
# via
# build
# pep517
tornado==6.2
# via
# ipykernel
Expand Down Expand Up @@ -262,6 +276,10 @@ wheel==0.37.1
# via pip-tools
widgetsnbextension==4.0.3
# via ipywidgets
zipp==3.11.0
# via
# importlib-metadata
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
4 changes: 2 additions & 2 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile requirements/test.in
#
Expand Down
4 changes: 4 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
"python-multipart",
"uvicorn",
"huggingface-hub",
# NOTE(robinson) - later versions of opencv-python cause installation issues
# on RHEL7. We can remove this pin once the following issue from 12/2022 is resolved
# ref: https://github.com/opencv/opencv-python/issues/772
"opencv-python==4.6.0.66",
],
extras_require={},
)
2 changes: 1 addition & 1 deletion unstructured_inference/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.2.2" # pragma: no cover
__version__ = "0.2.3" # pragma: no cover

0 comments on commit 95d797f

Please sign in to comment.