Skip to content

Commit 764f14a

Browse files
authored
Fixes for the Wheel workflow (#2190)
* Turn off failing stuff Signed-off-by: Doug Walker <[email protected]> * Turn off ociolutimage Signed-off-by: Doug Walker <[email protected]> * Uninstall the runner EXR Signed-off-by: Doug Walker <[email protected]> * Bump EXR min version to 3.1.6 Signed-off-by: Doug Walker <[email protected]> * Bump EXR recommended version to 3.1.6 Signed-off-by: Doug Walker <[email protected]> * Minor clean up Signed-off-by: Doug Walker <[email protected]> --------- Signed-off-by: Doug Walker <[email protected]>
1 parent 1dfa6aa commit 764f14a

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/workflows/wheel_workflow.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,10 @@ jobs:
259259
with:
260260
python-version: '3.9'
261261

262+
- name: Remove brew OpenEXR/Imath
263+
run: |
264+
brew uninstall --ignore-dependencies openexr imath || true
265+
262266
- name: Build wheels
263267
uses: pypa/[email protected]
264268
env:
@@ -382,7 +386,7 @@ jobs:
382386

383387

384388
upload_pypi:
385-
needs: [sdist, linux, macos, macos-arm, windows]
389+
needs: [sdist, linux, linux-arm, macos, macos-arm, windows]
386390
runs-on: ubuntu-latest
387391
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
388392
steps:

share/cmake/modules/FindExtPackages.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ if(OCIO_BUILD_PYTHON OR OCIO_BUILD_DOCS)
184184
endif()
185185

186186
# Set OpenEXR Minimum version as a variable since it it used at multiple places.
187-
set(OpenEXR_MININUM_VERSION "3.0.5")
187+
set(OpenEXR_MININUM_VERSION "3.1.6")
188188
if((OCIO_BUILD_APPS AND OCIO_USE_OIIO_FOR_APPS) OR OCIO_BUILD_TESTS)
189189
# OpenImageIO is required for OSL unit test and optional for apps.
190190

@@ -260,7 +260,7 @@ if(OCIO_BUILD_APPS)
260260
# Calling find_package in CONFIG mode using PREFER_CONFIG option.
261261
ocio_handle_dependency( OpenEXR PREFER_CONFIG ALLOW_INSTALL
262262
MIN_VERSION ${OpenEXR_MININUM_VERSION}
263-
RECOMMENDED_VERSION 3.1.5
263+
RECOMMENDED_VERSION 3.1.6
264264
RECOMMENDED_VERSION_REASON "Latest version tested with OCIO"
265265
PROMOTE_TARGET OpenEXR::OpenEXR)
266266

0 commit comments

Comments
 (0)