From 892210e366902c4b40f54d184e50f5459d45544c Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Wed, 3 Sep 2025 00:22:20 -0400 Subject: [PATCH 1/3] Try to roll back to earlier docker image Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index c4dc88b480..ffb0c4c10e 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -57,7 +57,7 @@ jobs: container: # DockerHub: https://hub.docker.com/u/aswf # Source: https://github.com/AcademySoftwareFoundation/aswf-docker - image: aswf/ci-ocio:${{ matrix.vfx-cy }} + image: aswf/ci-ocio:${{ matrix.vfx-cy }}.1 strategy: fail-fast: true matrix: From d3389c98e7b267930169579347fcaaebfdf915de Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Wed, 3 Sep 2025 19:02:32 -0400 Subject: [PATCH 2/3] Use pip3 rather than pip Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 2 +- share/ci/scripts/linux/apt/install_docs_env.sh | 2 +- share/ci/scripts/linux/apt/install_tests_env.sh | 2 +- share/ci/scripts/linux/dnf/install_docs_env.sh | 2 +- share/ci/scripts/linux/dnf/install_tests_env.sh | 2 +- share/ci/scripts/linux/install_numpy.sh | 4 ++-- share/ci/scripts/macos/install_docs_env.sh | 2 +- share/ci/scripts/macos/install_tests_env.sh | 2 +- share/ci/scripts/windows/install_docs_env.sh | 2 +- share/ci/scripts/windows/install_tests_env.sh | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index ffb0c4c10e..c4dc88b480 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -57,7 +57,7 @@ jobs: container: # DockerHub: https://hub.docker.com/u/aswf # Source: https://github.com/AcademySoftwareFoundation/aswf-docker - image: aswf/ci-ocio:${{ matrix.vfx-cy }}.1 + image: aswf/ci-ocio:${{ matrix.vfx-cy }} strategy: fail-fast: true matrix: diff --git a/share/ci/scripts/linux/apt/install_docs_env.sh b/share/ci/scripts/linux/apt/install_docs_env.sh index 6460204155..c97f661b87 100755 --- a/share/ci/scripts/linux/apt/install_docs_env.sh +++ b/share/ci/scripts/linux/apt/install_docs_env.sh @@ -7,4 +7,4 @@ set -ex HERE=$(dirname $0) bash $HERE/install_doxygen.sh latest -pip install -r $HERE/../../../../../docs/requirements.txt +pip3 install -r $HERE/../../../../../docs/requirements.txt diff --git a/share/ci/scripts/linux/apt/install_tests_env.sh b/share/ci/scripts/linux/apt/install_tests_env.sh index da8b5d15a8..3b7037cedd 100755 --- a/share/ci/scripts/linux/apt/install_tests_env.sh +++ b/share/ci/scripts/linux/apt/install_tests_env.sh @@ -6,4 +6,4 @@ set -ex HERE=$(dirname $0) -pip install -r $HERE/../../../../../tests/python/requirements.txt +pip3 install -r $HERE/../../../../../tests/python/requirements.txt diff --git a/share/ci/scripts/linux/dnf/install_docs_env.sh b/share/ci/scripts/linux/dnf/install_docs_env.sh index 6460204155..c97f661b87 100755 --- a/share/ci/scripts/linux/dnf/install_docs_env.sh +++ b/share/ci/scripts/linux/dnf/install_docs_env.sh @@ -7,4 +7,4 @@ set -ex HERE=$(dirname $0) bash $HERE/install_doxygen.sh latest -pip install -r $HERE/../../../../../docs/requirements.txt +pip3 install -r $HERE/../../../../../docs/requirements.txt diff --git a/share/ci/scripts/linux/dnf/install_tests_env.sh b/share/ci/scripts/linux/dnf/install_tests_env.sh index da8b5d15a8..3b7037cedd 100755 --- a/share/ci/scripts/linux/dnf/install_tests_env.sh +++ b/share/ci/scripts/linux/dnf/install_tests_env.sh @@ -6,4 +6,4 @@ set -ex HERE=$(dirname $0) -pip install -r $HERE/../../../../../tests/python/requirements.txt +pip3 install -r $HERE/../../../../../tests/python/requirements.txt diff --git a/share/ci/scripts/linux/install_numpy.sh b/share/ci/scripts/linux/install_numpy.sh index 0b7038e3c6..ca52a1b4d5 100755 --- a/share/ci/scripts/linux/install_numpy.sh +++ b/share/ci/scripts/linux/install_numpy.sh @@ -13,7 +13,7 @@ else fi if [ "$NUMPY_VERSION" == "latest" ]; then - sudo pip install numpy + sudo pip3 install numpy else - sudo pip install numpy==${NUMPY_VERSION} + sudo pip3 install numpy==${NUMPY_VERSION} fi \ No newline at end of file diff --git a/share/ci/scripts/macos/install_docs_env.sh b/share/ci/scripts/macos/install_docs_env.sh index 30662eeb99..293c993e4e 100755 --- a/share/ci/scripts/macos/install_docs_env.sh +++ b/share/ci/scripts/macos/install_docs_env.sh @@ -7,4 +7,4 @@ set -ex HERE=$(dirname $0) bash $HERE/install_doxygen.sh latest -pip install -r $HERE/../../../../docs/requirements.txt +pip3 install -r $HERE/../../../../docs/requirements.txt diff --git a/share/ci/scripts/macos/install_tests_env.sh b/share/ci/scripts/macos/install_tests_env.sh index 7f8055e03b..adbdf61bd6 100755 --- a/share/ci/scripts/macos/install_tests_env.sh +++ b/share/ci/scripts/macos/install_tests_env.sh @@ -6,4 +6,4 @@ set -ex HERE=$(dirname $0) -pip install -r $HERE/../../../../tests/python/requirements.txt +pip3 install -r $HERE/../../../../tests/python/requirements.txt diff --git a/share/ci/scripts/windows/install_docs_env.sh b/share/ci/scripts/windows/install_docs_env.sh index db18dd2fb4..6ac8ff8d1e 100755 --- a/share/ci/scripts/windows/install_docs_env.sh +++ b/share/ci/scripts/windows/install_docs_env.sh @@ -8,4 +8,4 @@ HERE=$(dirname $0) DOXYGEN_LOCATION="$1" bash $HERE/install_doxygen.sh "$DOXYGEN_LOCATION" -pip install -r $HERE/../../../../docs/requirements.txt +pip3 install -r $HERE/../../../../docs/requirements.txt diff --git a/share/ci/scripts/windows/install_tests_env.sh b/share/ci/scripts/windows/install_tests_env.sh index 7f8055e03b..adbdf61bd6 100755 --- a/share/ci/scripts/windows/install_tests_env.sh +++ b/share/ci/scripts/windows/install_tests_env.sh @@ -6,4 +6,4 @@ set -ex HERE=$(dirname $0) -pip install -r $HERE/../../../../tests/python/requirements.txt +pip3 install -r $HERE/../../../../tests/python/requirements.txt From a5b20a0d4d3432259ae3b9777e97755f89ed2e07 Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Wed, 3 Sep 2025 19:25:52 -0400 Subject: [PATCH 3/3] Roll back container version again Signed-off-by: Doug Walker --- .github/workflows/ci_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index c4dc88b480..ffb0c4c10e 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -57,7 +57,7 @@ jobs: container: # DockerHub: https://hub.docker.com/u/aswf # Source: https://github.com/AcademySoftwareFoundation/aswf-docker - image: aswf/ci-ocio:${{ matrix.vfx-cy }} + image: aswf/ci-ocio:${{ matrix.vfx-cy }}.1 strategy: fail-fast: true matrix: