Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix NTSC rates in global start time test #58

Merged
merged 3 commits into from
Jan 29, 2025
Merged

Fix NTSC rates in global start time test #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c7f3fb
Fix NTSC rates in global start time test
jminor Dec 14, 2024
55343ed
Updated CI matrix to match OTIO core repo
jminor Jan 29, 2025
202b45f
Removed mingw64 from CI matrix
jminor Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,20 @@ jobs:
matrix:
# 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]
os: [ubuntu-latest, macos-13, windows-latest, macos-latest]
otio-version: ["main", "0.17.0"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
include:
- { os: ubuntu-latest, shell: bash }
- { os: ubuntu-22.04, shell: bash, python-version: 3.7 }
- { os: macos-latest, shell: bash }
- { os: macos-13, shell: bash }
- { os: windows-latest, shell: pwsh }
exclude:
- { os: macos-latest, python-version: 3.7 }
- { os: macos-latest, python-version: 3.8 }
- { os: macos-latest, python-version: 3.9 }
- { os: ubuntu-latest, python-version: 3.7 }

name: ${{ matrix.os }} py-${{ matrix.python-version }} otio-${{ matrix.otio-version }}
runs-on: ${{ matrix.os }}
Expand Down
6 changes: 3 additions & 3 deletions tests/test_aaf_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,12 +1931,12 @@ def test_aaf_writer_metadata_roundtrip(self):
expected)

def test_aaf_writer_global_start_time(self):
for tc, rate in [("01:00:00:00", 23.97),
for tc, rate in [("01:00:00:00", 24000 / 1001),
("01:00:00:00", 24),
("01:00:00:00", 25),
("01:00:00:00", 29.97),
("01:00:00:00", 30000 / 1001),
("01:00:00:00", 30),
("01:00:00:00", 59.94),
("01:00:00:00", 60000 / 1001),
("01:00:00:00", 60)]:

otio_timeline = otio.schema.Timeline()
Expand Down