Skip to content

Commit b59cd64

Browse files
remiaremia
authored
Add Python 3.14 wheels and minor fixes (#2218)
* Enable Python 3.14 wheels Signed-off-by: Rémi Achard <[email protected]> * Replace macos-13 by macos-15-intel Signed-off-by: Rémi Achard <[email protected]> * Allow find_package CONFIG mode with Package_ROOT Signed-off-by: Rémi Achard <[email protected]> --------- Signed-off-by: Rémi Achard <[email protected]>
1 parent 125af7d commit b59cd64

File tree

8 files changed

+53
-63
lines changed

8 files changed

+53
-63
lines changed

‎.github/workflows/ci_workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ jobs:
459459
if: |
460460
github.event_name == 'push' ||
461461
github.event.pull_request.head.repo.full_name != github.repository
462-
runs-on: macos-13
462+
runs-on: macos-15-intel
463463
strategy:
464464
matrix:
465465
build: [1, 2, 3, 4, 5]

‎.github/workflows/wheel_workflow.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ jobs:
101101
manylinux: manylinux_2_28
102102
python: cp313-manylinux_x86_64
103103
arch: x86_64
104-
# - build: CPython 3.14 64 bits manylinux_2_28
105-
# manylinux: manylinux_2_28
106-
# python: cp314-manylinux_x86_64
107-
# arch: x86_64
104+
- build: CPython 3.14 64 bits manylinux_2_28
105+
manylinux: manylinux_2_28
106+
python: cp314-manylinux_x86_64
107+
arch: x86_64
108108
# -------------------------------------------------------------------
109109
# CPython 64 bits manylinux2014
110110
# -------------------------------------------------------------------
@@ -128,10 +128,10 @@ jobs:
128128
manylinux: manylinux2014
129129
python: cp313-manylinux_x86_64
130130
arch: x86_64
131-
# - build: CPython 3.14 64 bits manylinux2014
132-
# manylinux: manylinux2014
133-
# python: cp314-manylinux_x86_64
134-
# arch: x86_64
131+
- build: CPython 3.14 64 bits manylinux2014
132+
manylinux: manylinux2014
133+
python: cp314-manylinux_x86_64
134+
arch: x86_64
135135

136136
steps:
137137
- uses: actions/checkout@v4
@@ -142,7 +142,7 @@ jobs:
142142
python-version: '3.11'
143143

144144
- name: Build wheels
145-
uses: pypa/cibuildwheel@v3.1.4
145+
uses: pypa/cibuildwheel@v3.3.0
146146
env:
147147
CIBW_BUILD: ${{ matrix.python }}
148148
CIBW_ARCHS: ${{ matrix.arch }}
@@ -190,10 +190,10 @@ jobs:
190190
manylinux: manylinux2014
191191
python: cp313-manylinux_aarch64
192192
arch: aarch64
193-
# - build: CPython 3.14 ARM 64 bits manylinux2014
194-
# manylinux: manylinux2014
195-
# python: cp314-manylinux_aarch64
196-
# arch: aarch64
193+
- build: CPython 3.14 ARM 64 bits manylinux2014
194+
manylinux: manylinux2014
195+
python: cp314-manylinux_aarch64
196+
arch: aarch64
197197

198198
steps:
199199
- uses: actions/checkout@v4
@@ -204,7 +204,7 @@ jobs:
204204
python-version: '3.11'
205205

206206
- name: Build wheels
207-
uses: pypa/cibuildwheel@v3.1.4
207+
uses: pypa/cibuildwheel@v3.3.0
208208
env:
209209
CIBW_BUILD: ${{ matrix.python }}
210210
CIBW_ARCHS: ${{ matrix.arch }}
@@ -221,7 +221,7 @@ jobs:
221221

222222
macos:
223223
name: Build wheels on macOS
224-
runs-on: macos-13
224+
runs-on: macos-15-intel
225225
# Don't run on OCIO forks
226226
if: |
227227
github.event_name != 'schedule' ||
@@ -247,9 +247,9 @@ jobs:
247247
- build: CPython 3.13 64 bits
248248
python: cp313-macosx_x86_64
249249
arch: x86_64
250-
# - build: CPython 3.14 64 bits
251-
# python: cp314-macosx_x86_64
252-
# arch: x86_64
250+
- build: CPython 3.14 64 bits
251+
python: cp314-macosx_x86_64
252+
arch: x86_64
253253

254254
steps:
255255
- uses: actions/checkout@v4
@@ -264,7 +264,7 @@ jobs:
264264
brew uninstall --ignore-dependencies openexr imath || true
265265
266266
- name: Build wheels
267-
uses: pypa/cibuildwheel@v3.1.4
267+
uses: pypa/cibuildwheel@v3.3.0
268268
env:
269269
CIBW_BUILD: ${{ matrix.python }}
270270
CIBW_ARCHS: ${{ matrix.arch }}
@@ -306,9 +306,9 @@ jobs:
306306
- build: CPython 3.13 ARM 64 bits
307307
python: cp313-macosx_arm64
308308
arch: arm64
309-
# - build: CPython 3.14 ARM 64 bits
310-
# python: cp314-macosx_arm64
311-
# arch: arm64
309+
- build: CPython 3.14 ARM 64 bits
310+
python: cp314-macosx_arm64
311+
arch: arm64
312312

313313
steps:
314314
- uses: actions/checkout@v4
@@ -319,7 +319,7 @@ jobs:
319319
python-version: '3.11'
320320

321321
- name: Build wheels
322-
uses: pypa/cibuildwheel@v3.1.4
322+
uses: pypa/cibuildwheel@v3.3.0
323323
env:
324324
CIBW_BUILD: ${{ matrix.python }}
325325
CIBW_ARCHS: ${{ matrix.arch }}
@@ -361,9 +361,9 @@ jobs:
361361
- build: CPython 3.13 64 bits
362362
python: cp313-win_amd64
363363
arch: AMD64
364-
# - build: CPython 3.14 64 bits
365-
# python: cp314-win_amd64
366-
# arch: AMD64
364+
- build: CPython 3.14 64 bits
365+
python: cp314-win_amd64
366+
arch: AMD64
367367

368368
steps:
369369
- uses: actions/checkout@v4
@@ -374,7 +374,7 @@ jobs:
374374
python-version: '3.11'
375375

376376
- name: Build wheels
377-
uses: pypa/cibuildwheel@v3.1.4
377+
uses: pypa/cibuildwheel@v3.3.0
378378
env:
379379
CIBW_BUILD: ${{ matrix.python }}
380380
CIBW_ARCHS: ${{ matrix.arch }}

‎share/cmake/modules/FindImath.cmake‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,8 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
4040
set(_Imath_REQUIRED_VARS Imath_LIBRARY)
4141
set(_Imath_LIB_VER "${Imath_FIND_VERSION_MAJOR}_${Imath_FIND_VERSION_MINOR}")
4242

43-
if(NOT DEFINED Imath_ROOT)
44-
# Search for ImathConfig.cmake
45-
find_package(Imath ${Imath_FIND_VERSION} CONFIG QUIET)
46-
endif()
43+
# Search for ImathConfig.cmake
44+
find_package(Imath ${Imath_FIND_VERSION} CONFIG QUIET)
4745

4846
if(Imath_FOUND)
4947
get_target_property(Imath_LIBRARY Imath::Imath LOCATION)

‎share/cmake/modules/FindOSL.cmake‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@
2929
###############################################################################
3030
### Try to find package ###
3131

32-
if(NOT DEFINED OSL_ROOT)
33-
find_package(OSL ${OSL_FIND_VERSION} CONFIG QUIET)
34-
35-
set(OSL_SHADERS_INCLUDE_DIR ${OSL_INCLUDE_DIR}/../share)
36-
# Variable used by the OSL unit tests.
37-
set(OSL_SHADERS_DIR ${OSL_SHADERS_INCLUDE_DIR}/OSL/shaders)
38-
39-
include (FindPackageHandleStandardArgs)
40-
find_package_handle_standard_args (OSL
41-
REQUIRED_VARS
42-
OSL_INCLUDE_DIR
43-
OSL_LIB_DIR
44-
VERSION_VAR
45-
OSL_VERSION
46-
)
47-
else()
32+
find_package(OSL ${OSL_FIND_VERSION} CONFIG QUIET)
33+
34+
set(OSL_SHADERS_INCLUDE_DIR ${OSL_INCLUDE_DIR}/../share)
35+
# Variable used by the OSL unit tests.
36+
set(OSL_SHADERS_DIR ${OSL_SHADERS_INCLUDE_DIR}/OSL/shaders)
37+
38+
include (FindPackageHandleStandardArgs)
39+
find_package_handle_standard_args (OSL
40+
REQUIRED_VARS
41+
OSL_INCLUDE_DIR
42+
OSL_LIB_DIR
43+
VERSION_VAR
44+
OSL_VERSION
45+
)
46+
47+
if(NOT OSL_FOUND)
4848
set(OSL_INCLUDE_DIR ${OSL_ROOT}/include)
4949
set(OSL_VERSION_HEADER "${OSL_INCLUDE_DIR}/OSL/oslversion.h")
5050

‎share/cmake/modules/Findexpat.cmake‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@ endif()
3939
if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
4040
set(_expat_REQUIRED_VARS expat_LIBRARY)
4141

42-
if(NOT DEFINED expat_ROOT)
43-
# Search for expat-config.cmake
44-
find_package(expat ${expat_FIND_VERSION} CONFIG QUIET)
45-
endif()
42+
# Search for expat-config.cmake
43+
find_package(expat ${expat_FIND_VERSION} CONFIG QUIET)
4644

4745
if(expat_FOUND)
4846
if (TARGET expat::libexpat)

‎share/cmake/modules/Findminizip-ng.cmake‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ if(CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]")
4545
endif()
4646

4747
if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
48-
if(NOT DEFINED minizip-ng_ROOT)
49-
# Search for minizip-ng-config.cmake
50-
find_package(minizip-ng ${minizip-ng_FIND_VERSION} CONFIG QUIET)
51-
endif()
48+
# Search for minizip-ng-config.cmake
49+
find_package(minizip-ng ${minizip-ng_FIND_VERSION} CONFIG QUIET)
5250

5351
if (minizip-ng_FOUND)
5452
get_target_property(minizip-ng_INCLUDE_DIR MINIZIP::minizip-ng INTERFACE_INCLUDE_DIRECTORIES)

‎share/cmake/modules/Findpybind11.cmake‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@
2424
### Try to find package ###
2525

2626
if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
27-
if(NOT DEFINED pybind11_ROOT)
28-
# Search for pybind11Config.cmake
29-
find_package(pybind11 ${pybind11_FIND_VERSION} CONFIG QUIET)
30-
endif()
27+
# Search for pybind11Config.cmake
28+
find_package(pybind11 ${pybind11_FIND_VERSION} CONFIG QUIET)
3129

3230
if(NOT pybind11_FOUND)
3331
# Find include directory

‎share/cmake/modules/Findyaml-cpp.cmake‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
4444
set(_yaml-cpp_REQUIRED_VARS yaml-cpp_LIBRARY)
4545

4646
# Search for yaml-cpp-config.cmake
47-
if(NOT DEFINED yaml-cpp_ROOT)
48-
find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG ${quiet})
49-
endif()
47+
find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG ${quiet})
5048

5149
if(yaml-cpp_FOUND)
5250
# Alias target for yaml-cpp < 0.8 compatibility

0 commit comments

Comments
 (0)