diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6084da693..d2d04ddd1 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.7 - 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-latest] + os: [ubuntu-22.04, windows-2022, macos-12] # 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-12 OTIO_TEST_TARGET: test env: @@ -92,13 +92,13 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-22.04, windows-2022, macos-12] python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] include: - - { os: ubuntu-latest, shell: bash } - - { os: macos-latest, shell: bash } - - { os: windows-latest, shell: pwsh } - - { os: windows-latest, shell: msys2, python-version: 'mingw64' } + - { os: ubuntu-22.04, shell: bash } + - { os: macos-12, shell: bash } + - { os: windows-2022, shell: pwsh } + - { os: windows-2022, shell: msys2, python-version: 'mingw64' } defaults: run: @@ -162,7 +162,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-22.04, windows-2022, macos-12] python-build: ['cp37*', 'cp38*', 'cp39*', 'cp310*', 'cp311*'] steps: - uses: actions/checkout@v3 @@ -184,7 +184,7 @@ jobs: package_sdist: needs: py_build_test - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 with: diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f7d70ce1..705f8c5c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.18.2) # TODO: read this information from a configuration file, here, and in setup.py set(OTIO_VERSION_MAJOR "0") -set(OTIO_VERSION_MINOR "16") +set(OTIO_VERSION_MINOR "17") set(OTIO_VERSION_PATCH "0") set(OTIO_VERSION ${OTIO_VERSION_MAJOR}.${OTIO_VERSION_MINOR}.${OTIO_VERSION_PATCH}) diff --git a/OTIO_VERSION.json b/OTIO_VERSION.json index 42f1608fc..f3b96869b 100644 --- a/OTIO_VERSION.json +++ b/OTIO_VERSION.json @@ -1 +1 @@ -{"version": ["0", "16", "0"]} \ No newline at end of file +{"version": ["0", "17", "0"]} \ No newline at end of file diff --git a/setup.py b/setup.py index 90406faef..32c697b7c 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.16.0.dev1", + "version": "0.17.0.dev1", "author": 'Contributors to the OpenTimelineIO project', "author_email": 'otio-discussion@lists.aswf.io', "license": 'Apache 2.0 License', diff --git a/src/opentimelineio/CORE_VERSION_MAP.cpp b/src/opentimelineio/CORE_VERSION_MAP.cpp index 7a8c21aec..30c7421c6 100644 --- a/src/opentimelineio/CORE_VERSION_MAP.cpp +++ b/src/opentimelineio/CORE_VERSION_MAP.cpp @@ -78,7 +78,7 @@ const label_to_schema_version_map CORE_VERSION_MAP{ { "Transition", 1 }, { "UnknownSchema", 1 }, } }, - { "0.16.0.dev1", + { "0.17.0.dev1", { { "Adapter", 1 }, { "Clip", 2 },