From 070ebf4f794e1a166447bb6ab6ea461b0b1a3952 Mon Sep 17 00:00:00 2001 From: apetrynet Date: Thu, 13 Jun 2024 21:11:00 +0200 Subject: [PATCH 1/4] Prep for 0.17.0 release Removed `--pre` flag, Set dependency to 0.17.0 and added exclusion of old python versions for macos-latest Signed-off-by: apetrynet --- .github/workflows/ci.yaml | 6 +++++- pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dc39b2d..0795b41 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -67,6 +67,10 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] otio-version: ["main", "0.17.0"] python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + exclude: + - { os: macos-latest, python-version: 3.7 } + - { os: macos-latest, python-version: 3.8 } + - { os: macos-latest, python-version: 3.9 } name: ${{ matrix.os }} py-${{ matrix.python-version }} otio-${{ matrix.otio-version }} runs-on: ${{ matrix.os }} @@ -93,7 +97,7 @@ jobs: if [[ "${{ matrix.otio-version }}" == "main" ]]; then pip install "git+https://github.com/AcademySoftwareFoundation/OpenTimelineIO.git@extract_adapters" else - pip install OpenTimelineIO>=${{ matrix.otio-version }} --pre --only-binary :all: + pip install OpenTimelineIO>=${{ matrix.otio-version }} --only-binary :all: fi - name: Run Unit Tests diff --git a/pyproject.toml b/pyproject.toml index 3106da3..ab86781 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ license = { file="LICENSE.txt" } readme = "README.md" requires-python = ">=3.7" dependencies = [ - "opentimelineio >= 0.17.0.dev1", + "opentimelineio >= 0.17.0", "pyaaf2>=1.4.0" ] From 08dfaa6d6bd9dfae7ce369b1e2d7540dba368725 Mon Sep 17 00:00:00 2001 From: apetrynet Date: Thu, 13 Jun 2024 22:58:09 +0200 Subject: [PATCH 2/4] pinned macos-13 to make use of pre-built wheels removed exclusion of python versions for macos-latest Signed-off-by: apetrynet --- .github/workflows/ci.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0795b41..5e4893a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -64,13 +64,11 @@ jobs: plugin_name: "otio_aaf_plugin" strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + # Use macos-13 so we'll be on intel hardware and can pull a pre-built wheel + # When OTIO has an Apple Silicon build we can switch back to macos-latest for that version + os: [ubuntu-latest, macos-13, windows-latest] otio-version: ["main", "0.17.0"] python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - exclude: - - { os: macos-latest, python-version: 3.7 } - - { os: macos-latest, python-version: 3.8 } - - { os: macos-latest, python-version: 3.9 } name: ${{ matrix.os }} py-${{ matrix.python-version }} otio-${{ matrix.otio-version }} runs-on: ${{ matrix.os }} From 9bc063b9858597e48b378a4b4b922c8c99ed5510 Mon Sep 17 00:00:00 2001 From: apetrynet Date: Mon, 24 Jun 2024 22:30:59 +0200 Subject: [PATCH 3/4] version bump Signed-off-by: apetrynet --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ab86781..9690f07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "otio-aaf-adapter" -version = "1.1.0.dev1" +version = "1.1.0" description = "OpenTimelineIO AAF Adapter" authors = [ { name="Contributors to the OpenTimelineIO project", email="otio-discussion@lists.aswf.io" }, From 33259d856ba9bfe4088c219d92549b0df8535e46 Mon Sep 17 00:00:00 2001 From: apetrynet Date: Tue, 25 Jun 2024 02:02:23 +0200 Subject: [PATCH 4/4] checkout main branch Signed-off-by: apetrynet --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5e4893a..b0b5dac 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -93,7 +93,7 @@ jobs: python -m pip install --upgrade pip pip install pytest pytest-cov wheel -V pyaaf2 if [[ "${{ matrix.otio-version }}" == "main" ]]; then - pip install "git+https://github.com/AcademySoftwareFoundation/OpenTimelineIO.git@extract_adapters" + pip install "git+https://github.com/AcademySoftwareFoundation/OpenTimelineIO.git" else pip install OpenTimelineIO>=${{ matrix.otio-version }} --only-binary :all: fi