From ac792bfdf7bc02cd0868f74aa3e73730fa6261aa Mon Sep 17 00:00:00 2001 From: Peter Targett Date: Mon, 7 Jul 2025 13:28:02 +0100 Subject: [PATCH 1/6] Add version header. Signed-off-by: Peter Targett --- CMakeLists.txt | 10 ++++++++++ src/OpenTimelineIO-Version.h.in | 4 ++++ 2 files changed, 14 insertions(+) create mode 100644 src/OpenTimelineIO-Version.h.in diff --git a/CMakeLists.txt b/CMakeLists.txt index e53f335c7..6da803161 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,6 +154,16 @@ if(OTIO_CXX_INSTALL) else() message(STATUS " Not installing header dependencies for C++ (OTIO_DEPENDENCIES_INSTALL=OFF)") endif() + configure_file( + ${PROJECT_SOURCE_DIR}/src/OpenTimelineIO-Version.h.in + ${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIO-Version.h + ) + install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIO-Version.h + DESTINATION + ${OTIO_RESOLVED_CXX_INSTALL_DIR}/include + ) else() message(STATUS "Install C++ bindings: OFF") endif() diff --git a/src/OpenTimelineIO-Version.h.in b/src/OpenTimelineIO-Version.h.in new file mode 100644 index 000000000..78b01e7e9 --- /dev/null +++ b/src/OpenTimelineIO-Version.h.in @@ -0,0 +1,4 @@ +#define OTIO_VERSION_MAJOR @OpenTimelineIO_VERSION_MAJOR@ +#define OTIO_VERSION_MINOR @OpenTimelineIO_VERSION_MINOR@ +#define OTIO_VERSION_PATCH @OpenTimelineIO_VERSION_PATCH@ +#define OTIO_VERSION @OpenTimelineIO_VERSION@ From 711e7b5c91d7a6e99bf3320e889db27a4be6ba5d Mon Sep 17 00:00:00 2001 From: Peter Targett Date: Mon, 7 Jul 2025 14:33:54 +0100 Subject: [PATCH 2/6] Make OTIO_VERSION a string. Signed-off-by: Peter Targett --- src/OpenTimelineIO-Version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTimelineIO-Version.h.in b/src/OpenTimelineIO-Version.h.in index 78b01e7e9..c55dcb6ef 100644 --- a/src/OpenTimelineIO-Version.h.in +++ b/src/OpenTimelineIO-Version.h.in @@ -1,4 +1,4 @@ #define OTIO_VERSION_MAJOR @OpenTimelineIO_VERSION_MAJOR@ #define OTIO_VERSION_MINOR @OpenTimelineIO_VERSION_MINOR@ #define OTIO_VERSION_PATCH @OpenTimelineIO_VERSION_PATCH@ -#define OTIO_VERSION @OpenTimelineIO_VERSION@ +#define OTIO_VERSION "@OpenTimelineIO_VERSION@" From 1847f6f458d8eb20952747365dbf299251cf1334 Mon Sep 17 00:00:00 2001 From: Peter Targett Date: Wed, 9 Jul 2025 12:23:13 +0100 Subject: [PATCH 3/6] Uae existing version.h headers to add the project version. Signed-off-by: Peter Targett --- CMakeLists.txt | 13 +----------- src/OpenTimelineIO-Version.h.in | 4 ---- src/opentime/CMakeLists.txt | 20 +++++++++++++++--- src/opentime/{version.h => version.h.in} | 2 +- src/opentimelineio/CMakeLists.txt | 21 +++++++++++++++---- .../{version.h => version.h.in} | 2 +- tests/CMakeLists.txt | 7 +++++-- tests/test_composition.cpp | 4 ++-- tests/test_serializableCollection.cpp | 6 +++--- tests/test_timeline.cpp | 6 +++--- tests/test_track.cpp | 6 +++--- 11 files changed, 53 insertions(+), 38 deletions(-) delete mode 100644 src/OpenTimelineIO-Version.h.in rename src/opentime/{version.h => version.h.in} (73%) rename src/opentimelineio/{version.h => version.h.in} (89%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6da803161..1df02297b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,7 @@ cmake_minimum_required(VERSION 3.18.2) set(OTIO_VERSION_MAJOR "0") set(OTIO_VERSION_MINOR "18") -set(OTIO_VERSION_PATCH "0") -set(OTIO_VERSION ${OTIO_VERSION_MAJOR}.${OTIO_VERSION_MINOR}.${OTIO_VERSION_PATCH}) +set(OTIO_VERSION ${OTIO_VERSION_MAJOR}.${OTIO_VERSION_MINOR}.0) set(OTIO_AUTHOR "Contributors to the OpenTimelineIO project") set(OTIO_AUTHOR_EMAIL "otio-discussion@lists.aswf.io") @@ -154,16 +153,6 @@ if(OTIO_CXX_INSTALL) else() message(STATUS " Not installing header dependencies for C++ (OTIO_DEPENDENCIES_INSTALL=OFF)") endif() - configure_file( - ${PROJECT_SOURCE_DIR}/src/OpenTimelineIO-Version.h.in - ${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIO-Version.h - ) - install( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIO-Version.h - DESTINATION - ${OTIO_RESOLVED_CXX_INSTALL_DIR}/include - ) else() message(STATUS "Install C++ bindings: OFF") endif() diff --git a/src/OpenTimelineIO-Version.h.in b/src/OpenTimelineIO-Version.h.in deleted file mode 100644 index c55dcb6ef..000000000 --- a/src/OpenTimelineIO-Version.h.in +++ /dev/null @@ -1,4 +0,0 @@ -#define OTIO_VERSION_MAJOR @OpenTimelineIO_VERSION_MAJOR@ -#define OTIO_VERSION_MINOR @OpenTimelineIO_VERSION_MINOR@ -#define OTIO_VERSION_PATCH @OpenTimelineIO_VERSION_PATCH@ -#define OTIO_VERSION "@OpenTimelineIO_VERSION@" diff --git a/src/opentime/CMakeLists.txt b/src/opentime/CMakeLists.txt index a973d03fa..3e159fa71 100644 --- a/src/opentime/CMakeLists.txt +++ b/src/opentime/CMakeLists.txt @@ -6,8 +6,7 @@ set(OPENTIME_HEADER_FILES rationalTime.h stringPrintf.h timeRange.h - timeTransform.h - version.h) + timeTransform.h) add_library(opentime ${OTIO_SHARED_OR_STATIC_LIB} errorStatus.cpp @@ -16,7 +15,12 @@ add_library(opentime ${OTIO_SHARED_OR_STATIC_LIB} add_library(OTIO::opentime ALIAS opentime) -target_include_directories(opentime PRIVATE "${PROJECT_SOURCE_DIR}/src") +target_include_directories( + opentime + PRIVATE + "${PROJECT_SOURCE_DIR}/src" + "${CMAKE_CURRENT_BINARY_DIR}/.." +) set_target_properties(opentime PROPERTIES DEBUG_POSTFIX "${OTIO_DEBUG_POSTFIX}" @@ -74,5 +78,15 @@ if(OTIO_CXX_INSTALL) DESTINATION ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentime ) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in + ${CMAKE_CURRENT_BINARY_DIR}/version.h + ) + install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/version.h + DESTINATION + "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentime" + ) endif() diff --git a/src/opentime/version.h b/src/opentime/version.h.in similarity index 73% rename from src/opentime/version.h rename to src/opentime/version.h.in index 58a822a04..91716538d 100644 --- a/src/opentime/version.h +++ b/src/opentime/version.h.in @@ -3,7 +3,7 @@ #pragma once -#define OPENTIME_VERSION v1_0 +#define OPENTIME_VERSION v@PROJECT_VERSION_MAJOR@_@OpenTimelineIO_VERSION_MINOR@ namespace opentime { namespace OPENTIME_VERSION { diff --git a/src/opentimelineio/CMakeLists.txt b/src/opentimelineio/CMakeLists.txt index cf5190c57..b7b7b104e 100644 --- a/src/opentimelineio/CMakeLists.txt +++ b/src/opentimelineio/CMakeLists.txt @@ -35,8 +35,7 @@ set(OPENTIMELINEIO_HEADER_FILES transition.h typeRegistry.h unknownSchema.h - vectorIndexing.h - version.h) + vectorIndexing.h) add_library(opentimelineio ${OTIO_SHARED_OR_STATIC_LIB} clip.cpp @@ -77,8 +76,12 @@ add_library(opentimelineio ${OTIO_SHARED_OR_STATIC_LIB} add_library(OTIO::opentimelineio ALIAS opentimelineio) -target_include_directories(opentimelineio - PRIVATE "${PROJECT_SOURCE_DIR}/src") +target_include_directories( + opentimelineio + PRIVATE + "${PROJECT_SOURCE_DIR}/src" + "${CMAKE_CURRENT_BINARY_DIR}/.." +) if(OTIO_FIND_RAPIDJSON) target_include_directories(opentimelineio @@ -151,4 +154,14 @@ if(OTIO_CXX_INSTALL) DESTINATION ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentimelineio ) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in + ${CMAKE_CURRENT_BINARY_DIR}/version.h + ) + install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/version.h + DESTINATION + "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentimelineio" + ) endif() diff --git a/src/opentimelineio/version.h b/src/opentimelineio/version.h.in similarity index 89% rename from src/opentimelineio/version.h rename to src/opentimelineio/version.h.in index ba26e7612..169a8e2ef 100644 --- a/src/opentimelineio/version.h +++ b/src/opentimelineio/version.h.in @@ -3,7 +3,7 @@ #pragma once -#define OPENTIMELINEIO_VERSION v1_0 +#define OPENTIMELINEIO_VERSION v@PROJECT_VERSION_MAJOR@_@OpenTimelineIO_VERSION_MINOR@ #include "opentime/rationalTime.h" #include "opentime/timeRange.h" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e5eb0b492..fcababd38 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,7 +1,10 @@ -include_directories(${PROJECT_SOURCE_DIR}/src +include_directories( + ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src/deps ${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include - ${PROJECT_SOURCE_DIR}/src/tests) + ${PROJECT_SOURCE_DIR}/src/tests + ${CMAKE_BINARY_DIR}/src +) list(APPEND tests_opentime test_opentime) foreach(test ${tests_opentime}) diff --git a/tests/test_composition.cpp b/tests/test_composition.cpp index 65471c479..7c6562b8e 100644 --- a/tests/test_composition.cpp +++ b/tests/test_composition.cpp @@ -28,7 +28,7 @@ main(int argc, char** argv) SerializableObject::Retainer item = new Item; comp->append_child(item); - opentimelineio::v1_0::ErrorStatus err; + OTIO_NS::ErrorStatus err; auto result = comp->find_children<>(&err); assertEqual(result.size(), 1); assertEqual(result[0].value, item.value); @@ -47,7 +47,7 @@ main(int argc, char** argv) track->append_child(transition); track->append_child(clip); - opentimelineio::v1_0::ErrorStatus err; + OTIO_NS::ErrorStatus err; auto items = stack->find_clips(&err); assertFalse(is_error(err)); assertEqual(items.size(), 1); diff --git a/tests/test_serializableCollection.cpp b/tests/test_serializableCollection.cpp index 0593ef8b6..b4ad9ff73 100644 --- a/tests/test_serializableCollection.cpp +++ b/tests/test_serializableCollection.cpp @@ -32,7 +32,7 @@ main(int argc, char** argv) otio::SerializableObject::Retainer sc = new otio::SerializableCollection(); sc->insert_child(0, tl); - opentimelineio::v1_0::ErrorStatus err; + OTIO_NS::ErrorStatus err; auto result = sc->find_children(&err, {}, false); assertEqual(result.size(), 1); assertEqual(result[0].value, cl.value); @@ -61,7 +61,7 @@ main(int argc, char** argv) otio::SerializableObject::Retainer sc = new otio::SerializableCollection(); sc->insert_child(0, tl); - opentimelineio::v1_0::ErrorStatus err; + OTIO_NS::ErrorStatus err; auto result = sc->find_children(&err, range); assertEqual(result.size(), 1); assertEqual(result[0].value, cl0.value); @@ -80,7 +80,7 @@ main(int argc, char** argv) otio::SerializableObject::Retainer sc = new otio::SerializableCollection(); sc->insert_child(0, tl); - opentimelineio::v1_0::ErrorStatus err; + OTIO_NS::ErrorStatus err; auto result = sc->find_children(&err, std::nullopt, true); assertEqual(result.size(), 0); result = sc->find_children(&err, std::nullopt, false); diff --git a/tests/test_timeline.cpp b/tests/test_timeline.cpp index bc63feafd..8887c5889 100644 --- a/tests/test_timeline.cpp +++ b/tests/test_timeline.cpp @@ -28,7 +28,7 @@ main(int argc, char** argv) otio::SerializableObject::Retainer tl = new otio::Timeline(); tl->tracks()->append_child(tr); - opentimelineio::v1_0::ErrorStatus err; + OTIO_NS::ErrorStatus err; auto result = tl->find_children(&err); assertEqual(result.size(), 1); assertEqual(result[0].value, cl.value); @@ -54,7 +54,7 @@ main(int argc, char** argv) otio::SerializableObject::Retainer tl = new otio::Timeline(); tl->tracks()->append_child(tr); - opentimelineio::v1_0::ErrorStatus err; + OTIO_NS::ErrorStatus err; auto result = tl->find_children(&err, range); assertEqual(result.size(), 1); assertEqual(result[0].value, cl0.value); @@ -70,7 +70,7 @@ main(int argc, char** argv) otio::SerializableObject::Retainer tl = new otio::Timeline(); tl->tracks()->append_child(tr); - opentimelineio::v1_0::ErrorStatus err; + OTIO_NS::ErrorStatus err; auto result = tl->find_children(&err, std::nullopt, true); assertEqual(result.size(), 0); result = tl->find_children(&err, std::nullopt, false); diff --git a/tests/test_track.cpp b/tests/test_track.cpp index 00e3c7e14..d58e67901 100644 --- a/tests/test_track.cpp +++ b/tests/test_track.cpp @@ -25,7 +25,7 @@ main(int argc, char** argv) otio::SerializableObject::Retainer tr = new otio::Track(); tr->append_child(cl); - opentimelineio::v1_0::ErrorStatus err; + OTIO_NS::ErrorStatus err; auto result = tr->find_children(&err); assertEqual(result.size(), 1); assertEqual(result[0].value, cl.value); @@ -48,7 +48,7 @@ main(int argc, char** argv) tr->append_child(cl0); tr->append_child(cl1); tr->append_child(cl2); - opentimelineio::v1_0::ErrorStatus err; + OTIO_NS::ErrorStatus err; auto result = tr->find_children( &err, TimeRange(RationalTime(0.0, 24.0), RationalTime(24.0, 24.0))); @@ -98,7 +98,7 @@ main(int argc, char** argv) new otio::Track(); tr->append_child(cl0); tr->append_child(st); - opentimelineio::v1_0::ErrorStatus err; + OTIO_NS::ErrorStatus err; auto result = tr->find_children(&err, std::nullopt, true); assertEqual(result.size(), 1); assertEqual(result[0].value, cl0.value); From 5d3d21559c4c8d327b67bfb8618205d7a8a115d9 Mon Sep 17 00:00:00 2001 From: Peter Targett Date: Mon, 14 Jul 2025 10:32:23 +0100 Subject: [PATCH 4/6] Put back variable to define patch value. Fix python builds. Signed-off-by: Peter Targett --- CMakeLists.txt | 3 ++- src/opentime/CMakeLists.txt | 10 ++++++---- src/opentime/version.h.in | 5 ++++- src/opentimelineio/CMakeLists.txt | 10 ++++++---- src/opentimelineio/version.h.in | 5 ++++- src/py-opentimelineio/opentime-bindings/CMakeLists.txt | 4 +++- .../opentimelineio-bindings/CMakeLists.txt | 1 + 7 files changed, 26 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1df02297b..e53f335c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,8 @@ cmake_minimum_required(VERSION 3.18.2) set(OTIO_VERSION_MAJOR "0") set(OTIO_VERSION_MINOR "18") -set(OTIO_VERSION ${OTIO_VERSION_MAJOR}.${OTIO_VERSION_MINOR}.0) +set(OTIO_VERSION_PATCH "0") +set(OTIO_VERSION ${OTIO_VERSION_MAJOR}.${OTIO_VERSION_MINOR}.${OTIO_VERSION_PATCH}) set(OTIO_AUTHOR "Contributors to the OpenTimelineIO project") set(OTIO_AUTHOR_EMAIL "otio-discussion@lists.aswf.io") diff --git a/src/opentime/CMakeLists.txt b/src/opentime/CMakeLists.txt index 3e159fa71..e86d41119 100644 --- a/src/opentime/CMakeLists.txt +++ b/src/opentime/CMakeLists.txt @@ -47,6 +47,11 @@ target_compile_options(opentime PRIVATE $<$: /EHsc> ) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in + ${CMAKE_CURRENT_BINARY_DIR}/version.h +) + if(OTIO_CXX_INSTALL) install(FILES ${OPENTIME_HEADER_FILES} DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentime") @@ -78,10 +83,7 @@ if(OTIO_CXX_INSTALL) DESTINATION ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentime ) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in - ${CMAKE_CURRENT_BINARY_DIR}/version.h - ) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/version.h diff --git a/src/opentime/version.h.in b/src/opentime/version.h.in index 91716538d..c1265faf4 100644 --- a/src/opentime/version.h.in +++ b/src/opentime/version.h.in @@ -3,7 +3,10 @@ #pragma once -#define OPENTIME_VERSION v@PROJECT_VERSION_MAJOR@_@OpenTimelineIO_VERSION_MINOR@ +#define OPENTIME_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ +#define OPENTIME_VERSION_MINOR @PROJECT_VERSION_MINOR@ +#define OPENTIME_VERSION_PATCH @PROJECT_VERSION_PATCH@ +#define OPENTIME_VERSION v@PROJECT_VERSION_MAJOR@_@PROJECT_VERSION_MINOR@_@PROJECT_VERSION_PATCH@ namespace opentime { namespace OPENTIME_VERSION { diff --git a/src/opentimelineio/CMakeLists.txt b/src/opentimelineio/CMakeLists.txt index b7b7b104e..02537c9bf 100644 --- a/src/opentimelineio/CMakeLists.txt +++ b/src/opentimelineio/CMakeLists.txt @@ -121,6 +121,11 @@ target_compile_options(opentimelineio PRIVATE $<$: /EHsc> ) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in + ${CMAKE_CURRENT_BINARY_DIR}/version.h +) + if(OTIO_CXX_INSTALL) install(FILES ${OPENTIMELINEIO_HEADER_FILES} DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentimelineio") @@ -154,10 +159,7 @@ if(OTIO_CXX_INSTALL) DESTINATION ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentimelineio ) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in - ${CMAKE_CURRENT_BINARY_DIR}/version.h - ) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/version.h diff --git a/src/opentimelineio/version.h.in b/src/opentimelineio/version.h.in index 169a8e2ef..cb69297e2 100644 --- a/src/opentimelineio/version.h.in +++ b/src/opentimelineio/version.h.in @@ -3,7 +3,10 @@ #pragma once -#define OPENTIMELINEIO_VERSION v@PROJECT_VERSION_MAJOR@_@OpenTimelineIO_VERSION_MINOR@ +#define OPENTIMELINEIO_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ +#define OPENTIMELINEIO_VERSION_MINOR @PROJECT_VERSION_MINOR@ +#define OPENTIMELINEIO_VERSION_PATCH @PROJECT_VERSION_PATCH@ +#define OPENTIMELINEIO_VERSION v@PROJECT_VERSION_MAJOR@_@PROJECT_VERSION_MINOR@_@PROJECT_VERSION_PATCH@ #include "opentime/rationalTime.h" #include "opentime/timeRange.h" diff --git a/src/py-opentimelineio/opentime-bindings/CMakeLists.txt b/src/py-opentimelineio/opentime-bindings/CMakeLists.txt index bd92bbfa0..a42f35f65 100644 --- a/src/py-opentimelineio/opentime-bindings/CMakeLists.txt +++ b/src/py-opentimelineio/opentime-bindings/CMakeLists.txt @@ -12,7 +12,9 @@ target_include_directories(_opentime PRIVATE pybind11/include PRIVATE "${PROJECT_SOURCE_DIR}/src" PRIVATE "${PROJECT_SOURCE_DIR}/src/deps" - PRIVATE "${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include") + PRIVATE "${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include" + PRIVATE "${CMAKE_BINARY_DIR}/src" +) target_link_libraries(_opentime PUBLIC opentimelineio opentime) diff --git a/src/py-opentimelineio/opentimelineio-bindings/CMakeLists.txt b/src/py-opentimelineio/opentimelineio-bindings/CMakeLists.txt index d37da3629..1114f96c4 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/CMakeLists.txt +++ b/src/py-opentimelineio/opentimelineio-bindings/CMakeLists.txt @@ -23,6 +23,7 @@ target_include_directories(_otio PRIVATE "${PROJECT_SOURCE_DIR}/src" PRIVATE "${PROJECT_SOURCE_DIR}/src/deps" PRIVATE "${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include" + PRIVATE "${CMAKE_BINARY_DIR}/src" ) target_link_libraries(_otio PUBLIC opentimelineio opentime) From 5aefedf5cf0b7a3a625242a51304fc1ce321779c Mon Sep 17 00:00:00 2001 From: Peter Targett Date: Mon, 4 Aug 2025 17:30:20 +0100 Subject: [PATCH 5/6] Fix typo raising error. Signed-off-by: Peter Targett --- src/py-opentimelineio/opentimelineio/adapters/otioz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/py-opentimelineio/opentimelineio/adapters/otioz.py b/src/py-opentimelineio/opentimelineio/adapters/otioz.py index 4ccba931c..e909204e6 100644 --- a/src/py-opentimelineio/opentimelineio/adapters/otioz.py +++ b/src/py-opentimelineio/opentimelineio/adapters/otioz.py @@ -49,7 +49,7 @@ def read_from_file( if not os.path.exists(extract_to_directory): raise exceptions.OTIOError( f"Directory '{extract_to_directory()}' does not exist, cannot" - " unpack otioz there." + f" unpack otioz there." ) if os.path.exists(output_media_directory): From c8b5c290024701c8beec007875e47e3759d43cf4 Mon Sep 17 00:00:00 2001 From: Peter Targett Date: Mon, 4 Aug 2025 18:26:47 +0100 Subject: [PATCH 6/6] Second error/typo. Signed-off-by: Peter Targett --- src/py-opentimelineio/opentimelineio/adapters/otioz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/py-opentimelineio/opentimelineio/adapters/otioz.py b/src/py-opentimelineio/opentimelineio/adapters/otioz.py index e909204e6..0fae0a294 100644 --- a/src/py-opentimelineio/opentimelineio/adapters/otioz.py +++ b/src/py-opentimelineio/opentimelineio/adapters/otioz.py @@ -48,7 +48,7 @@ def read_from_file( if not os.path.exists(extract_to_directory): raise exceptions.OTIOError( - f"Directory '{extract_to_directory()}' does not exist, cannot" + f"Directory '{extract_to_directory}' does not exist, cannot" f" unpack otioz there." )