Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: move openexr to runtime dependency #691

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -U -r requirements.txt
pip install -U openexr
pip install -U pytest coveralls
pip install -U flake8
pip install -U setuptools wheel
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tfg-main-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -U -r requirements.txt
pip install -U openexr
pip install -U pytest
pip install -U setuptools wheel
pip install -U twine
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tfg-nightly-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -U -r requirements.txt
pip install -U openexr
pip install -U pytest
pip install -U setuptools wheel
pip install -U twine
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tfg-test-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -U -r requirements.txt
pip install -U openexr
pip install -U pytest
pip install -U setuptools wheel
pip install -U twine
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ numpy >= 1.15.4
psutil >= 5.7.0
scipy >= 1.1.0
tqdm >= 4.45.0
OpenEXR >= 1.3.2
termcolor >= 1.1.0
trimesh >= 2.37.22
# Required by trimesh.
Expand Down
2 changes: 1 addition & 1 deletion tensorflow_graphics/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@
__all__.remove("util")
# pylint: enable=g-statement-before-imports,g-import-not-at-top

__version__ = "HEAD"
__version__ = "2022.6.9"
14 changes: 13 additions & 1 deletion tensorflow_graphics/io/exr.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.
"""Utility functions for reading and writing EXR image files as numpy arrays."""


# pylint: disable=c-extension-no-member

from __future__ import absolute_import
Expand All @@ -21,7 +22,18 @@

import Imath
import numpy as np
import OpenEXR
from packaging import version

try:
import OpenEXR
except ImportError:
raise ImportError('OpenEXR is required for reading and writing EXR files, please install it.')
else:
_min_version_openexr = "1.3.2"
if not version.parse(OpenEXR.__version__.decode("utf-8")) > version.parse(_min_version_openexr):
raise ImportError(
f"OpenEXR version {_min_version_openexr} is required, please upgrade it."
)
from six.moves import range
from six.moves import zip

Expand Down