From 51e955473e6bcdb1a8f0899669c92e7cd326cf6d Mon Sep 17 00:00:00 2001 From: Cary Phillips Date: Tue, 13 Feb 2024 13:59:44 -0800 Subject: [PATCH] fix sdist; remove debugging Signed-off-by: Cary Phillips --- .github/workflows/ci_workflow.yml | 2 ++ .github/workflows/python-wheels-publish.yml | 4 +++- .github/workflows/python-wheels.yml | 6 ++++-- cmake/OpenEXRSetup.cmake | 6 ++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml index bc51851d7e..33670f472c 100644 --- a/.github/workflows/ci_workflow.yml +++ b/.github/workflows/ci_workflow.yml @@ -25,6 +25,7 @@ on: - 'website/src/**' - '!bazel/**' - '!src/wrappers/**' + - '!.github/workflows/python-**.yml' pull_request: branches-ignore: - RB-2.* @@ -38,6 +39,7 @@ on: - 'website/src/**' - '!bazel/**' - '!src/wrappers/**' + - '!.github/workflows/python-**.yml' permissions: contents: read diff --git a/.github/workflows/python-wheels-publish.yml b/.github/workflows/python-wheels-publish.yml index ca4b6fb2e5..2330847df3 100644 --- a/.github/workflows/python-wheels-publish.yml +++ b/.github/workflows/python-wheels-publish.yml @@ -59,7 +59,9 @@ jobs: uses: actions/upload-artifact@v4.0.0 with: name: wheels-${{ matrix.os }} - path: ./wheelhouse/*.whl + path: | + ./wheelhouse/*.whl + ./wheelhouse/*.tar.gz publish-to-pypi: name: Publish Python 🐍 distribution 📦 to PyPI diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml index fc254acd2d..516af01390 100644 --- a/.github/workflows/python-wheels.yml +++ b/.github/workflows/python-wheels.yml @@ -67,6 +67,8 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v4 with: - name: wheel-${{ matrix.os }} - path: wheelhouse/*.whl + name: wheels-${{ matrix.os }} + path: | + ./wheelhouse/*.whl + ./wheelhouse/*.tar.gz diff --git a/cmake/OpenEXRSetup.cmake b/cmake/OpenEXRSetup.cmake index d6735fa4c1..f3e84bf984 100644 --- a/cmake/OpenEXRSetup.cmake +++ b/cmake/OpenEXRSetup.cmake @@ -265,10 +265,8 @@ endif() option(OPENEXR_FORCE_INTERNAL_IMATH "Force using an internal imath" OFF) # Check to see if Imath is installed outside of the current build directory. -#set(OPENEXR_IMATH_REPO "https://github.com/AcademySoftwareFoundation/Imath.git" CACHE STRING "Repo for auto-build of Imath") -#set(OPENEXR_IMATH_TAG "main" CACHE STRING "Tag for auto-build of Imath (branch, tag, or SHA)") -set(OPENEXR_IMATH_REPO "https://github.com/cary-ilm/Imath.git" CACHE STRING "Repo for auto-build of Imath") -set(OPENEXR_IMATH_TAG "uninstall" CACHE STRING "Tag for auto-build of Imath (branch, tag, or SHA)") +set(OPENEXR_IMATH_REPO "https://github.com/AcademySoftwareFoundation/Imath.git" CACHE STRING "Repo for auto-build of Imath") +set(OPENEXR_IMATH_TAG "main" CACHE STRING "Tag for auto-build of Imath (branch, tag, or SHA)") if(NOT OPENEXR_FORCE_INTERNAL_IMATH) #TODO: ^^ Release should not clone from main, this is a place holder set(CMAKE_IGNORE_PATH "${CMAKE_CURRENT_BINARY_DIR}/_deps/imath-src/config;${CMAKE_CURRENT_BINARY_DIR}/_deps/imath-build/config")