Fix up some dependencies

- oiio doesn't use partio - ci-vfxall needs pybind11 transitively for ocio and materialx - pylint fix in test_builder.py Signed-off-by: Jean-Francois Panisset <[email protected]>
AcademySoftwareFoundation · Jul 15, 2024 · 03a1cb5 · 03a1cb5
1 parent 42bf6f3
commit 03a1cb5
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 8 deletions.
diff --git a/ci-oiio/Dockerfile b/ci-oiio/Dockerfile
diff --git a/ci-oiio/README.md b/ci-oiio/README.md
diff --git a/ci-oiio/image.yaml b/ci-oiio/image.yaml
@@ -12,7 +12,6 @@ packages:
   - ocio
   - openexr
   - openvdb
-  - partio
   - pybind11
   - ptex
   - qt

diff --git a/ci-vfxall/Dockerfile b/ci-vfxall/Dockerfile
diff --git a/ci-vfxall/README.md b/ci-vfxall/README.md
diff --git a/ci-vfxall/image.yaml b/ci-vfxall/image.yaml
@@ -19,6 +19,7 @@ packages:
   - alembic
   - oiio
   - ocio
+  - pybind11
   - opensubdiv
   - ptex
   - openvdb

diff --git a/python/aswfdocker/tests/test_builder.py b/python/aswfdocker/tests/test_builder.py
@@ -535,7 +535,8 @@ def test_builder_cli_allversions(self):
         bake_path = os.path.join(
             tempfile.gettempdir(),
             "docker-bake-IMAGE-common-1-clang10-1-clang6-1-clang7-1"
-            "-clang8-1-clang9-2-clang10-2-clang11-2-clang12-2-clang13-2-clang14-3-clang14-3-clang15-4-clang16-4-clang17.json",
+            "-clang8-1-clang9-2-clang10-2-clang11-2-clang12-2-clang13-2"
+            "-clang14-3-clang14-3-clang15-4-clang16-4-clang17.json",
         )
         cmd = f"docker buildx bake -f {bake_path} --progress auto"
         self.assertEqual(
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,6 @@ packages: @@
       - ocio
       - openexr
       - openvdb
-      - partio
       - pybind11
       - ptex
       - qt
@@ Expand Down @@