From 388ccc43e4ca0e5f9305eae636e4743f6342c796 Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Mon, 13 Jan 2025 14:51:29 -0800 Subject: [PATCH 1/3] Run python 3.7 on last supported ubuntu Signed-off-by: Eric Reinecke --- .github/workflows/python-package.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index c41ed255d1..881e182b2a 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -98,6 +98,7 @@ jobs: 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 } @@ -106,6 +107,7 @@ jobs: - { 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 } defaults: run: From aca71fbf261e23dafbb3d7fea4adb88aa9688a1d Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Mon, 13 Jan 2025 14:57:45 -0800 Subject: [PATCH 2/3] added explicit sphinx config path to readthedocs config Signed-off-by: Eric Reinecke --- .readthedocs.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index f0873ba44f..39b7ec9713 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,6 +1,10 @@ # required by RTD version: 2 +sphinx: + # Path to your Sphinx configuration file. + configuration: docs/conf.py + build: os: "ubuntu-20.04" tools: From 580f4433e85fd69f2fde39b1c3f4d28ed2bc3ccd Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Mon, 13 Jan 2025 15:28:26 -0800 Subject: [PATCH 3/3] Updated test that missed clip repr update Signed-off-by: Eric Reinecke --- tests/test_clip.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/test_clip.py b/tests/test_clip.py index cb2dafd7cf..f1712020ba 100644 --- a/tests/test_clip.py +++ b/tests/test_clip.py @@ -63,7 +63,8 @@ def test_str(self): self.assertMultiLineEqual( str(cl), - 'Clip("test_clip", MissingReference(\'\', None, None, {}), None, {})' + 'Clip("test_clip", ' + 'MissingReference(\'\', None, None, {}), None, {}, [], [])' ) self.assertMultiLineEqual( repr(cl), @@ -71,7 +72,9 @@ def test_str(self): "name='test_clip', " 'media_reference={}, ' 'source_range=None, ' - 'metadata={{}}' + 'metadata={{}}, ' + 'effects=[], ' + 'markers=[]' ')'.format( repr(cl.media_reference) ) @@ -87,7 +90,8 @@ def test_str_with_filepath(self): self.assertMultiLineEqual( str(cl), 'Clip(' - '"test_clip", ExternalReference("/var/tmp/foo.mov"), None, {}' + '"test_clip", ' + 'ExternalReference("/var/tmp/foo.mov"), None, {}, [], []' ')' ) self.assertMultiLineEqual( @@ -98,7 +102,9 @@ def test_str_with_filepath(self): "target_url='/var/tmp/foo.mov'" "), " 'source_range=None, ' - 'metadata={}' + 'metadata={}, ' + 'effects=[], ' + 'markers=[]' ')' )