From cea857449c5cd300249ee23790b99a4af5ccc3dd Mon Sep 17 00:00:00 2001 From: Thomas Mansencal Date: Mon, 29 Jul 2024 20:04:05 +1200 Subject: [PATCH] Setup 2.4.0 for *test.pypi.org*. --- .github/workflows/wheel_workflow.yml | 34 ++++++---------------------- CMakeLists.txt | 2 +- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/.github/workflows/wheel_workflow.yml b/.github/workflows/wheel_workflow.yml index 76838cbb49..531cb30655 100644 --- a/.github/workflows/wheel_workflow.yml +++ b/.github/workflows/wheel_workflow.yml @@ -4,29 +4,7 @@ name: Wheel -on: - push: - # Workflow run on tags for v2 only. - tags: - - v2.* - pull_request: - # Workflow run on pull_request only when related files change. - branches-ignore: - - RB-0.* - - RB-1.* - - gh-pages - tags-ignore: - - v0.* - - v1.* - paths: - - .github/workflows/wheel_workflow.yml - - MANIFEST.in - - pyproject.toml - - setup.cfg - - setup.py - schedule: - # Nightly build - - cron: "0 0 * * *" +on: [push] jobs: # Linux jobs run in Docker containers (manylinux), so the latest OS version @@ -45,9 +23,9 @@ jobs: name: Build SDist runs-on: ubuntu-latest # Don't run on OCIO forks - if: | - github.event_name != 'schedule' || - github.repository == 'AcademySoftwareFoundation/OpenColorIO' +# if: | +# github.event_name != 'schedule' || +# github.repository == 'AcademySoftwareFoundation/OpenColorIO' steps: @@ -308,6 +286,7 @@ jobs: env: CIBW_BUILD: ${{ matrix.python }} CIBW_ARCHS: ${{ matrix.arch }} + CIBW_TEST_SKIP: "*" - uses: actions/upload-artifact@v4 with: @@ -318,7 +297,7 @@ jobs: upload_pypi: needs: [sdist, linux, macos, windows] runs-on: ubuntu-latest - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') +# if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') steps: - uses: actions/setup-python@v5 @@ -332,3 +311,4 @@ jobs: with: user: __token__ password: ${{ secrets.PYPI_API_TOKEN }} + repository-url: https://test.pypi.org/legacy/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d2ad73654..9ca6ccbf4b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ project(OpenColorIO LANGUAGES CXX C) # "dev", "beta1", rc1", etc or "" for an official release. -set(OpenColorIO_VERSION_RELEASE_TYPE "dev") +set(OpenColorIO_VERSION_RELEASE_TYPE "dev4") ###############################################################################