From 4440afaa27b16f81cdf81215ce4d0b08e1424148 Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Mon, 24 Jun 2024 16:08:54 -0700 Subject: [PATCH] Release v0.17.0 (#1772) * - Froze CI Versions - Updated Contributors - Ran code formatting - Updated Version Map Signed-off-by: Eric Reinecke --------- Signed-off-by: Eric Reinecke --- .github/workflows/python-package.yml | 32 ++++++++++++------------- CONTRIBUTORS.md | 2 ++ Makefile | 2 +- setup.py | 2 +- src/opentime/rationalTime.h | 5 +++- src/opentimelineio/CORE_VERSION_MAP.cpp | 2 +- 6 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 812659649..cc713a8a2 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -6,7 +6,7 @@ name: OpenTimelineIO # for configuring which build will be a C++ coverage build / coverage report env: GH_COV_PY: "3.10" - GH_COV_OS: ubuntu-latest + GH_COV_OS: ubuntu-22.04 GH_DEPENDABOT: dependabot on: @@ -24,15 +24,15 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-13, macos-latest] + os: [ubuntu-22.04, windows-2022, macos-13, macos-14] # Unfortunately the CMake test target is OS dependent so we set it as # a variable here. include: - - os: ubuntu-latest + - os: ubuntu-22.04 OTIO_TEST_TARGET: test - - os: windows-latest + - os: windows-2022 OTIO_TEST_TARGET: RUN_TESTS - - os: macos-latest + - os: macos-14 OTIO_TEST_TARGET: test - os: macos-13 OTIO_TEST_TARGET: test @@ -94,18 +94,18 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-13, macos-latest] + os: [ubuntu-22.04, windows-2022, macos-13, macos-14] python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] include: - - { os: ubuntu-latest, shell: bash } - - { os: macos-latest, shell: bash } + - { os: ubuntu-22.04, shell: bash } + - { os: macos-14, shell: bash } - { os: macos-13, shell: bash } - - { os: windows-latest, shell: pwsh } - - { os: windows-latest, shell: msys2, python-version: 'mingw64' } + - { os: windows-2022, shell: pwsh } + - { os: windows-2022, shell: msys2, python-version: 'mingw64' } exclude: - - { os: macos-latest, python-version: 3.7 } - - { os: macos-latest, python-version: 3.8 } - - { os: macos-latest, python-version: 3.9 } + - { os: macos-14, python-version: 3.7 } + - { os: macos-14, python-version: 3.8 } + - { os: macos-14, python-version: 3.9 } defaults: run: @@ -175,10 +175,10 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-13, macos-latest] + os: [ubuntu-22.04, windows-2022, macos-13, macos-14] python-build: ['cp37*', 'cp38*', 'cp39*', 'cp310*', 'cp311*', 'cp312*'] exclude: - - { os: macos-latest, python-build: 'cp37*' } + - { os: macos-14, python-build: 'cp37*' } steps: - uses: actions/checkout@v4 @@ -199,7 +199,7 @@ jobs: package_sdist: needs: py_build_test - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index a4c8e418b..06e1a7c0b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -6,6 +6,7 @@ If you know of anyone missing from this list, please contact us: https://lists.a * Alex Schworer ([schworer](https://github.com/schworer)) * Alex Widener ([boredstiff](https://github.com/boredstiff)) * Andrew Moore ([andrewmoore-nz](https://github.com/andrewmoore-nz)) +* Anton Marini ([vade](https://github.com/vade)) * Ashley Whetter ([AWhetter](https://github.com/AWhetter)) * Bas Hesen ([bashesenaxis](https://github.com/bashesenaxis)) * Bonnie Tai ([bonpix](https://github.com/bonpix)) @@ -54,6 +55,7 @@ If you know of anyone missing from this list, please contact us: https://lists.a * Nick Porcino ([meshula](https://github.com/meshula)) * Pedro Labonia ([pedrolabonia](https://github.com/pedrolabonia)) * Peter Targett ([peter-targett](https://github.com/peter-targett)) +* Rob Osborne ([rosborne132](https://github.com/rosborne132)) * Robyn Rindge ([avrata](https://github.com/avrata)) * Roger Nelson ([rogernelson](https://github.com/rogernelson)) * Sasha Aleshchenko ([TheBigSasha](https://github.com/TheBigSasha)) diff --git a/Makefile b/Makefile index 9bac2aeb0..3953557ec 100644 --- a/Makefile +++ b/Makefile @@ -251,7 +251,7 @@ update-contributors: check-github-token @echo "Updating CONTRIBUTORS.md..." @python maintainers/fetch_contributors.py \ --repo AcademySoftwareFoundation/OpenTimelineIO \ - --token $(OTIO_RELEASE_GITHUB_TOKEN) + --token "${OTIO_RELEASE_GITHUB_TOKEN}" dev-python-install: @python setup.py install diff --git a/setup.py b/setup.py index ea3d4b820..658fde42f 100644 --- a/setup.py +++ b/setup.py @@ -218,7 +218,7 @@ def cmake_install(self): # Metadata that gets stamped into the __init__ files during the build phase. PROJECT_METADATA = { - "version": "0.17.0.dev2", + "version": "0.17.0", "author": 'Contributors to the OpenTimelineIO project', "author_email": 'otio-discussion@lists.aswf.io', "license": 'Apache 2.0 License', diff --git a/src/opentime/rationalTime.h b/src/opentime/rationalTime.h index 68c1fe35d..12dacbc3a 100644 --- a/src/opentime/rationalTime.h +++ b/src/opentime/rationalTime.h @@ -266,7 +266,10 @@ class RationalTime /// @brief Convert to the nearest timecode (e.g., "HH:MM:SS;FRAME"). std::string to_nearest_timecode(ErrorStatus* error_status = nullptr) const { - return to_nearest_timecode(_rate, IsDropFrameRate::InferFromRate, error_status); + return to_nearest_timecode( + _rate, + IsDropFrameRate::InferFromRate, + error_status); } /// @brief Return a string in the form "hours:minutes:seconds". diff --git a/src/opentimelineio/CORE_VERSION_MAP.cpp b/src/opentimelineio/CORE_VERSION_MAP.cpp index e0cc9c65d..257b693c1 100644 --- a/src/opentimelineio/CORE_VERSION_MAP.cpp +++ b/src/opentimelineio/CORE_VERSION_MAP.cpp @@ -110,7 +110,7 @@ const label_to_schema_version_map CORE_VERSION_MAP{ { "Transition", 1 }, { "UnknownSchema", 1 }, } }, - { "0.17.0.dev2", + { "0.17.0", { { "Adapter", 1 }, { "Clip", 2 },