Skip to content

Commit e7dfcea

Browse files
luhenryriseproject-dev[bot]
authored andcommitted
openimageio: update wheel dependency check for 3.2 (nanobind, libjxl, openjph, zstd)
3.2 binds with nanobind instead of pybind11 and builds libjxl, openjph and zstd, so the expected dependency set and staged licences no longer matched.
1 parent 591e2c0 commit e7dfcea

1 file changed

Lines changed: 17 additions & 13 deletions

File tree

‎.github/workflows/build-openimageio.yml‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,27 +73,30 @@ jobs:
7373
gh=https://raw.githubusercontent.com
7474
get expat "$gh/libexpat/libexpat/R_2_6_3/expat/COPYING"
7575
get fmt "$gh/fmtlib/fmt/12.1.0/LICENSE"
76-
get freetype "$gh/freetype/freetype/VER-2-14-1/LICENSE.TXT"
77-
get freetype-ftl "$gh/freetype/freetype/VER-2-14-1/docs/FTL.TXT"
76+
get freetype "$gh/freetype/freetype/VER-2-14-3/LICENSE.TXT"
77+
get freetype-ftl "$gh/freetype/freetype/VER-2-14-3/docs/FTL.TXT"
7878
get giflib "https://sourceforge.net/p/giflib/code/ci/5.2.1/tree/COPYING?format=raw"
79-
get imath "$gh/AcademySoftwareFoundation/Imath/v3.1.10/LICENSE.md"
79+
get imath "$gh/AcademySoftwareFoundation/Imath/v3.2.3/LICENSE.md"
8080
get libdeflate "$gh/ebiggers/libdeflate/v1.23/COPYING"
81+
get libjxl "$gh/libjxl/libjxl/v0.12.0/LICENSE"
8182
get libjpeg-turbo "$gh/libjpeg-turbo/libjpeg-turbo/3.1.2/LICENSE.md"
8283
get libjpeg-turbo-ijg "$gh/libjpeg-turbo/libjpeg-turbo/3.1.2/README.ijg"
83-
get libpng "$gh/pnggroup/libpng/v1.6.50/LICENSE"
84+
get libpng "$gh/pnggroup/libpng/v1.6.58/LICENSE"
8485
get libtiff "https://gitlab.com/libtiff/libtiff/-/raw/v4.7.1/LICENSE.md"
85-
get libuhdr "$gh/google/libultrahdr/v1.4.0/LICENSE"
86+
get libuhdr "$gh/google/libultrahdr/v1.5.1/LICENSE"
8687
get libwebp "$gh/webmproject/libwebp/v1.5.0/COPYING"
8788
get libwebp-patents "$gh/webmproject/libwebp/v1.5.0/PATENTS"
8889
get minizip-ng "$gh/zlib-ng/minizip-ng/4.0.10/LICENSE"
8990
get opencolorio "$gh/AcademySoftwareFoundation/OpenColorIO/v2.5.1/LICENSE"
9091
get opencolorio-third-party "$gh/AcademySoftwareFoundation/OpenColorIO/v2.5.1/THIRD-PARTY.md"
91-
get openexr "$gh/AcademySoftwareFoundation/OpenEXR/v3.3.5/LICENSE.md"
92+
get openexr "$gh/AcademySoftwareFoundation/OpenEXR/v3.5.0/LICENSE.md"
9293
get openjpeg "$gh/uclouvain/openjpeg/v2.5.4/LICENSE"
93-
get pybind11 "$gh/pybind/pybind11/v3.0.1/LICENSE"
94+
get nanobind "$gh/wjakob/nanobind/v3.1.0/LICENSE"
95+
get openjph "$gh/aous72/OpenJPH/0.32.0/LICENSE"
9496
get pystring "$gh/imageworks/pystring/v1.2.0/LICENSE"
95-
get robin-map "$gh/Tessil/robin-map/v1.4.0/LICENSE"
97+
get robin-map "$gh/Tessil/robin-map/v1.4.1/LICENSE"
9698
get yaml-cpp "$gh/jbeder/yaml-cpp/0.8.0/LICENSE"
99+
get zstd "$gh/facebook/zstd/v1.5.7/LICENSE"
97100
98101
- name: Write the smoke test
99102
run: |
@@ -169,15 +172,16 @@ jobs:
169172
deps = re.search(rb"BZip2 [^;\x00]*;[^\x00]*", z.read(lib)).group().decode()
170173
built = {name for name, _, ver in (d.partition(" ") for d in deps.split(";")) if ver and ver != "NONE"}
171174
expected = {"expat", "fmt", "Freetype", "GIF", "Imath", "JPEG", "libdeflate", "libjpeg-turbo",
172-
"libuhdr", "minizip-ng", "OpenColorIO", "OpenEXR", "OpenJPEG", "PNG", "pybind11",
173-
"Python3", "Robinmap", "TIFF", "WebP", "yaml-cpp", "ZLIB"}
175+
"libuhdr", "minizip-ng", "nanobind", "OpenColorIO", "OpenEXR", "OpenJPEG", "openjph",
176+
"PNG", "pystring", "Python3", "Robinmap", "TIFF", "WebP", "yaml-cpp", "ZLIB",
177+
"JXL", "zstd"}
174178
assert built == expected, (deps, sorted(built ^ expected))
175179
licences = {n.split(".dist-info/licenses/", 1)[1] for n in names
176180
if ".dist-info/licenses/" in n and not n.endswith("/")}
177181
staged = {"expat", "fmt", "freetype", "freetype-ftl", "giflib", "imath", "libdeflate",
178-
"libjpeg-turbo", "libjpeg-turbo-ijg", "libpng", "libtiff", "libuhdr", "libwebp",
179-
"libwebp-patents", "minizip-ng", "opencolorio", "opencolorio-third-party",
180-
"openexr", "openjpeg", "pybind11", "pystring", "robin-map", "yaml-cpp"}
182+
"libjpeg-turbo", "libjpeg-turbo-ijg", "libjxl", "libpng", "libtiff", "libuhdr", "libwebp",
183+
"libwebp-patents", "minizip-ng", "nanobind", "opencolorio", "opencolorio-third-party",
184+
"openexr", "openjpeg", "openjph", "pystring", "robin-map", "yaml-cpp", "zstd"}
181185
assert licences == {"LICENSE.md", "THIRD-PARTY.md"} | {"LICENSE." + s for s in staged}, licences
182186
print(sys.argv[1], "ok")
183187
EOF

0 commit comments

Comments
 (0)