diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a5f65d2b46..63ad6379eb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,13 +22,16 @@ The OpenTimelineIO Project Committers (alphabetically by last name) are: ## Contributor License Agreement -Before contributing code to OpenTimelineIO, we ask that you sign a Contributor License Agreement (CLA). At the root of the repo you can find the two possible CLAs: +Before contributing code to OpenTimelineIO, we ask that you sign a Contributor License Agreement (CLA). +When you create a pull request, the Linux Foundation's EasyCLA system will guide you through the process of signing the CLA. + +If you are unable to use the EasyCLA system, you can send a signed CLA to `opentimelineio-tsc@aswf.io` (please make sure to include your github username) and wait for confirmation that we've received it. + +Here are the two possible CLAs: * [OTIO_CLA_Corporate.pdf](https://github.com/PixarAnimationStudios/OpenTimelineIO/raw/main/OTIO_CLA_Corporate.pdf): please sign this one for corporate use * [OTIO_CLA_Individual.pdf](https://github.com/PixarAnimationStudios/OpenTimelineIO/raw/main/OTIO_CLA_Individual.pdf): please sign this one if you're an individual contributor -Once your CLA is signed, send it to `opentimelineio-tsc@aswf.io` (please make sure to include your github username) and wait for confirmation that we've received it. After that, you can submit pull requests. - ## Coding Conventions Please follow the coding convention and style in each file and in each library when adding new files. diff --git a/LICENSE.txt b/LICENSE.txt index 50aee0c0d6..261eeb9e9f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ - - Modified Apache 2.0 License - + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -136,9 +136,9 @@ with Licensor regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor - and its affiliates, except as required to comply with Section 4(c) of - the License and to reproduce the content of the NOTICE file. + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each @@ -173,4 +173,29 @@ incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. -OpenTimelineIO bundles ffmpeg_burnins.py, which is available under the MIT License. For details contrib/adapters. + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/OTIO_CLA_Corporate.pdf b/OTIO_CLA_Corporate.pdf index e2f19ad4b3..b285186b3f 100644 Binary files a/OTIO_CLA_Corporate.pdf and b/OTIO_CLA_Corporate.pdf differ diff --git a/OTIO_CLA_Individual.pdf b/OTIO_CLA_Individual.pdf index 1741072593..c5d13faefd 100644 Binary files a/OTIO_CLA_Individual.pdf and b/OTIO_CLA_Individual.pdf differ diff --git a/contrib/opentimelineio_contrib/__init__.py b/contrib/opentimelineio_contrib/__init__.py index cddf1086b7..9d4c65d09d 100644 --- a/contrib/opentimelineio_contrib/__init__.py +++ b/contrib/opentimelineio_contrib/__init__.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Unsupported contrib code for OpenTimelineIO.""" diff --git a/contrib/opentimelineio_contrib/adapters/__init__.py b/contrib/opentimelineio_contrib/adapters/__init__.py index e69de29bb2..686a8cb5fd 100644 --- a/contrib/opentimelineio_contrib/adapters/__init__.py +++ b/contrib/opentimelineio_contrib/adapters/__init__.py @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project diff --git a/contrib/opentimelineio_contrib/adapters/aaf_adapter/__init__.py b/contrib/opentimelineio_contrib/adapters/aaf_adapter/__init__.py index e69de29bb2..686a8cb5fd 100644 --- a/contrib/opentimelineio_contrib/adapters/aaf_adapter/__init__.py +++ b/contrib/opentimelineio_contrib/adapters/aaf_adapter/__init__.py @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project diff --git a/contrib/opentimelineio_contrib/adapters/aaf_adapter/aaf_writer.py b/contrib/opentimelineio_contrib/adapters/aaf_adapter/aaf_writer.py index 2150f4bcf3..eab58e0b77 100644 --- a/contrib/opentimelineio_contrib/adapters/aaf_adapter/aaf_writer.py +++ b/contrib/opentimelineio_contrib/adapters/aaf_adapter/aaf_writer.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """AAF Adapter Transcriber diff --git a/contrib/opentimelineio_contrib/adapters/advanced_authoring_format.py b/contrib/opentimelineio_contrib/adapters/advanced_authoring_format.py index 343ca398bb..80310af300 100644 --- a/contrib/opentimelineio_contrib/adapters/advanced_authoring_format.py +++ b/contrib/opentimelineio_contrib/adapters/advanced_authoring_format.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """OpenTimelineIO Advanced Authoring Format (AAF) Adapter diff --git a/contrib/opentimelineio_contrib/adapters/ale.py b/contrib/opentimelineio_contrib/adapters/ale.py index 338075d22f..228beb5d00 100644 --- a/contrib/opentimelineio_contrib/adapters/ale.py +++ b/contrib/opentimelineio_contrib/adapters/ale.py @@ -1,27 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# - __doc__ = """OpenTimelineIO Avid Log Exchange (ALE) Adapter""" diff --git a/contrib/opentimelineio_contrib/adapters/burnins.py b/contrib/opentimelineio_contrib/adapters/burnins.py index d6fd5399ec..748bb673fa 100644 --- a/contrib/opentimelineio_contrib/adapters/burnins.py +++ b/contrib/opentimelineio_contrib/adapters/burnins.py @@ -1,26 +1,6 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# + """FFMPEG Burnins Adapter""" import os import sys diff --git a/contrib/opentimelineio_contrib/adapters/extern_maya_sequencer.py b/contrib/opentimelineio_contrib/adapters/extern_maya_sequencer.py index f320a4d637..8ef5c0c24b 100644 --- a/contrib/opentimelineio_contrib/adapters/extern_maya_sequencer.py +++ b/contrib/opentimelineio_contrib/adapters/extern_maya_sequencer.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import os import sys diff --git a/contrib/opentimelineio_contrib/adapters/extern_rv.py b/contrib/opentimelineio_contrib/adapters/extern_rv.py index 57b64bb396..ebba629f2c 100755 --- a/contrib/opentimelineio_contrib/adapters/extern_rv.py +++ b/contrib/opentimelineio_contrib/adapters/extern_rv.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """RV External Adapter component. diff --git a/contrib/opentimelineio_contrib/adapters/fcpx_xml.py b/contrib/opentimelineio_contrib/adapters/fcpx_xml.py index 4b757d1882..0e29bd5390 100644 --- a/contrib/opentimelineio_contrib/adapters/fcpx_xml.py +++ b/contrib/opentimelineio_contrib/adapters/fcpx_xml.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """OpenTimelineIO Final Cut Pro X XML Adapter. """ import os diff --git a/contrib/opentimelineio_contrib/adapters/ffmpeg_burnins.py b/contrib/opentimelineio_contrib/adapters/ffmpeg_burnins.py index 4f8174f3f1..08b52dd648 100644 --- a/contrib/opentimelineio_contrib/adapters/ffmpeg_burnins.py +++ b/contrib/opentimelineio_contrib/adapters/ffmpeg_burnins.py @@ -1,26 +1,6 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# + """ This module provides an interface to allow users to easily build out an FFMPEG command with all the correct filters diff --git a/contrib/opentimelineio_contrib/adapters/hls_playlist.py b/contrib/opentimelineio_contrib/adapters/hls_playlist.py index a702f91957..7612fca272 100644 --- a/contrib/opentimelineio_contrib/adapters/hls_playlist.py +++ b/contrib/opentimelineio_contrib/adapters/hls_playlist.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """HLS Playlist OpenTimelineIO adapter diff --git a/contrib/opentimelineio_contrib/adapters/kdenlive.py b/contrib/opentimelineio_contrib/adapters/kdenlive.py index 55fa54bf02..41bb527383 100644 --- a/contrib/opentimelineio_contrib/adapters/kdenlive.py +++ b/contrib/opentimelineio_contrib/adapters/kdenlive.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Kdenlive (MLT XML) Adapter.""" import re diff --git a/contrib/opentimelineio_contrib/adapters/maya_sequencer.py b/contrib/opentimelineio_contrib/adapters/maya_sequencer.py index aded36fb5d..6ea9bd6dd8 100644 --- a/contrib/opentimelineio_contrib/adapters/maya_sequencer.py +++ b/contrib/opentimelineio_contrib/adapters/maya_sequencer.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Maya Sequencer Adapter Harness""" diff --git a/contrib/opentimelineio_contrib/adapters/rv.py b/contrib/opentimelineio_contrib/adapters/rv.py index a0d1f2df56..1f196ba2a4 100644 --- a/contrib/opentimelineio_contrib/adapters/rv.py +++ b/contrib/opentimelineio_contrib/adapters/rv.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """RvSession Adapter harness""" diff --git a/contrib/opentimelineio_contrib/adapters/tests/__init__.py b/contrib/opentimelineio_contrib/adapters/tests/__init__.py index e69de29bb2..686a8cb5fd 100644 --- a/contrib/opentimelineio_contrib/adapters/tests/__init__.py +++ b/contrib/opentimelineio_contrib/adapters/tests/__init__.py @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_aaf_adapter.py b/contrib/opentimelineio_contrib/adapters/tests/test_aaf_adapter.py index 8c202f91b6..a8c5d0db98 100644 --- a/contrib/opentimelineio_contrib/adapters/tests/test_aaf_adapter.py +++ b/contrib/opentimelineio_contrib/adapters/tests/test_aaf_adapter.py @@ -1,27 +1,6 @@ # -*- coding: utf-8 -*- -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test the AAF adapter.""" diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_ale_adapter.py b/contrib/opentimelineio_contrib/adapters/tests/test_ale_adapter.py index 8c0a96ee4a..c8549b61e5 100644 --- a/contrib/opentimelineio_contrib/adapters/tests/test_ale_adapter.py +++ b/contrib/opentimelineio_contrib/adapters/tests/test_ale_adapter.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test the ALE adapter.""" diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_burnins.py b/contrib/opentimelineio_contrib/adapters/tests/test_burnins.py index 7257ded1d2..622ec5a11a 100644 --- a/contrib/opentimelineio_contrib/adapters/tests/test_burnins.py +++ b/contrib/opentimelineio_contrib/adapters/tests/test_burnins.py @@ -1,26 +1,6 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# + """Unit tests for the rv session file adapter""" import unittest diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_fcpx_adapter.py b/contrib/opentimelineio_contrib/adapters/tests/test_fcpx_adapter.py index 70370eae87..70afffb097 100644 --- a/contrib/opentimelineio_contrib/adapters/tests/test_fcpx_adapter.py +++ b/contrib/opentimelineio_contrib/adapters/tests/test_fcpx_adapter.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + import os import subprocess import sys diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_hls_playlist_adapter.py b/contrib/opentimelineio_contrib/adapters/tests/test_hls_playlist_adapter.py index 4b2cca05ca..3655da32da 100644 --- a/contrib/opentimelineio_contrib/adapters/tests/test_hls_playlist_adapter.py +++ b/contrib/opentimelineio_contrib/adapters/tests/test_hls_playlist_adapter.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import os import unittest diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_kdenlive_adapter.py b/contrib/opentimelineio_contrib/adapters/tests/test_kdenlive_adapter.py index 44a992dcdb..cb72ae39b7 100644 --- a/contrib/opentimelineio_contrib/adapters/tests/test_kdenlive_adapter.py +++ b/contrib/opentimelineio_contrib/adapters/tests/test_kdenlive_adapter.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + import unittest import opentimelineio as otio import opentimelineio.test_utils as otio_test_utils diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_maya_sequencer.py b/contrib/opentimelineio_contrib/adapters/tests/test_maya_sequencer.py index c8fb9ba240..d0414d7819 100644 --- a/contrib/opentimelineio_contrib/adapters/tests/test_maya_sequencer.py +++ b/contrib/opentimelineio_contrib/adapters/tests/test_maya_sequencer.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Unit tests for the maya sequencer adapter""" diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_rvsession.py b/contrib/opentimelineio_contrib/adapters/tests/test_rvsession.py index 4c6eae6ab5..a62ebc13f7 100644 --- a/contrib/opentimelineio_contrib/adapters/tests/test_rvsession.py +++ b/contrib/opentimelineio_contrib/adapters/tests/test_rvsession.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Unit tests for the rv session file adapter""" diff --git a/contrib/opentimelineio_contrib/adapters/tests/tests_xges_adapter.py b/contrib/opentimelineio_contrib/adapters/tests/tests_xges_adapter.py index 5b0f119032..e843097b0a 100644 --- a/contrib/opentimelineio_contrib/adapters/tests/tests_xges_adapter.py +++ b/contrib/opentimelineio_contrib/adapters/tests/tests_xges_adapter.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import os import tempfile diff --git a/contrib/opentimelineio_contrib/adapters/xges.py b/contrib/opentimelineio_contrib/adapters/xges.py index 2684aab819..63a58f5180 100644 --- a/contrib/opentimelineio_contrib/adapters/xges.py +++ b/contrib/opentimelineio_contrib/adapters/xges.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """OpenTimelineIO GStreamer Editing Services XML Adapter.""" import re diff --git a/contrib/opentimelineio_contrib/application_plugins/rv/example_otio_reader/example_otio_reader_plugin.py b/contrib/opentimelineio_contrib/application_plugins/rv/example_otio_reader/example_otio_reader_plugin.py index 011d26ee30..edbbfa34fe 100644 --- a/contrib/opentimelineio_contrib/application_plugins/rv/example_otio_reader/example_otio_reader_plugin.py +++ b/contrib/opentimelineio_contrib/application_plugins/rv/example_otio_reader/example_otio_reader_plugin.py @@ -1,29 +1,9 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + """ Example plugin showing how otio files can be loaded into an RV context """ -# -# Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import os diff --git a/contrib/opentimelineio_contrib/application_plugins/rv/example_otio_reader/otio_reader.py b/contrib/opentimelineio_contrib/application_plugins/rv/example_otio_reader/otio_reader.py index 0b74eb5639..bc4381509a 100644 --- a/contrib/opentimelineio_contrib/application_plugins/rv/example_otio_reader/otio_reader.py +++ b/contrib/opentimelineio_contrib/application_plugins/rv/example_otio_reader/otio_reader.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# # This code has been taken from opentimelineio's exten_rv rv adapter # and converted to work interactively in RV. diff --git a/contrib/opentimelineio_contrib/application_plugins/tests/__init__.py b/contrib/opentimelineio_contrib/application_plugins/tests/__init__.py index e69de29bb2..686a8cb5fd 100644 --- a/contrib/opentimelineio_contrib/application_plugins/tests/__init__.py +++ b/contrib/opentimelineio_contrib/application_plugins/tests/__init__.py @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project diff --git a/contrib/opentimelineio_contrib/application_plugins/tests/test_rv_reader.py b/contrib/opentimelineio_contrib/application_plugins/tests/test_rv_reader.py index 75570212cc..f5dbe1dce1 100644 --- a/contrib/opentimelineio_contrib/application_plugins/tests/test_rv_reader.py +++ b/contrib/opentimelineio_contrib/application_plugins/tests/test_rv_reader.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Unit tests for the rv reader plugin""" diff --git a/docs/conf.py b/docs/conf.py index 5c3181e8b6..671bddc906 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,4 +1,7 @@ # -*- coding: utf-8 -*- +# +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project import sphinx_rtd_theme import opentimelineio diff --git a/docs/tutorials/contributing.md b/docs/tutorials/contributing.md index 4725c6dfc8..499c634c9a 100644 --- a/docs/tutorials/contributing.md +++ b/docs/tutorials/contributing.md @@ -5,13 +5,16 @@ We're excited to collaborate with the community and look forward to the many imp ## Contributor License Agreement -Before contributing code to OpenTimelineIO, we ask that you sign a Contributor License Agreement (CLA). At the root of the repo you can find the two possible CLAs: +Before contributing code to OpenTimelineIO, we ask that you sign a Contributor License Agreement (CLA). +When you create a pull request, the Linux Foundation's EasyCLA system will guide you through the process of signing the CLA. + +If you are unable to use the EasyCLA system, you can send a signed CLA to `opentimelineio-tsc@aswf.io` (please make sure to include your github username) and wait for confirmation that we've received it. + +Here are the two possible CLAs: * [OTIO_CLA_Corporate.pdf](https://github.com/PixarAnimationStudios/OpenTimelineIO/raw/main/OTIO_CLA_Corporate.pdf): please sign this one for corporate use * [OTIO_CLA_Individual.pdf](https://github.com/PixarAnimationStudios/OpenTimelineIO/raw/main/OTIO_CLA_Individual.pdf): please sign this one if you're an individual contributor -Once your CLA is signed, send it to `opentimelineio-tsc@aswf.io` (please make sure to include your github username) and wait for confirmation that we've received it. After that, you can submit pull requests. - ## Coding Conventions Please follow the coding convention and style in each file and in each library when adding new files. diff --git a/examples/build_simple_timeline.py b/examples/build_simple_timeline.py index 1fae5eeca9..a46fad4be1 100755 --- a/examples/build_simple_timeline.py +++ b/examples/build_simple_timeline.py @@ -1,4 +1,7 @@ #!/usr/bin/env python +# +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project __doc__ = """ Generate a simple timeline from scratch and write it to the specified path. diff --git a/examples/conform.cpp b/examples/conform.cpp index db43f5e997..2c9c75b7df 100644 --- a/examples/conform.cpp +++ b/examples/conform.cpp @@ -1,26 +1,5 @@ -// +// SPDX-License-Identifier: Apache-2.0 // Copyright Contributors to the OpenTimelineIO project -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// // Example OTIO script that reads a timeline and then relinks clips // to movie files found in a given folder, based on matching clip names to filenames. diff --git a/examples/conform.py b/examples/conform.py index 1e4cff8832..24138ac20e 100755 --- a/examples/conform.py +++ b/examples/conform.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Example OTIO script that reads a timeline and then relinks clips to movie files found in a given folder, based on matching clip names to filenames. diff --git a/examples/flatten_video_tracks.cpp b/examples/flatten_video_tracks.cpp index 960e4ede8e..db3c3c4a4b 100644 --- a/examples/flatten_video_tracks.cpp +++ b/examples/flatten_video_tracks.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "util.h" #include diff --git a/examples/flatten_video_tracks.py b/examples/flatten_video_tracks.py index b4cb371574..766ad5276e 100755 --- a/examples/flatten_video_tracks.py +++ b/examples/flatten_video_tracks.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import opentimelineio as otio import sys diff --git a/examples/python_adapters_child_process.cpp b/examples/python_adapters_child_process.cpp index 9631bba4aa..336961e4a8 100644 --- a/examples/python_adapters_child_process.cpp +++ b/examples/python_adapters_child_process.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + // Example OTIO C++ code for reading and writing files supported by the OTIO // Python adapters. // diff --git a/examples/python_adapters_embed.cpp b/examples/python_adapters_embed.cpp index 4c0626410f..5a6e675548 100644 --- a/examples/python_adapters_embed.cpp +++ b/examples/python_adapters_embed.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + // Example OTIO C++ code for reading and writing files supported by the OTIO // Python adapters. // diff --git a/examples/shot_detect.py b/examples/shot_detect.py index 4c00fbd232..2fdfad839b 100755 --- a/examples/shot_detect.py +++ b/examples/shot_detect.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Example OTIO script that generates an OTIO from a single quicktime by using ffprobe to detect shot breaks. diff --git a/examples/summarize_timing.cpp b/examples/summarize_timing.cpp index d7ae3af89d..9abf35271a 100644 --- a/examples/summarize_timing.cpp +++ b/examples/summarize_timing.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + // Example OTIO C++ code that reads a timeline and then prints a summary // of the video clips found, including re-timing effects on each one. diff --git a/examples/summarize_timing.py b/examples/summarize_timing.py index d52eba3d79..380e9a3d95 100644 --- a/examples/summarize_timing.py +++ b/examples/summarize_timing.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Example OTIO script that reads a timeline and then prints a summary of the video clips found, including re-timing effects on each one. diff --git a/examples/util.cpp b/examples/util.cpp index d252a731b3..df8a434509 100644 --- a/examples/util.cpp +++ b/examples/util.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "util.h" #include diff --git a/examples/util.h b/examples/util.h index bd27033da1..671397658b 100644 --- a/examples/util.h +++ b/examples/util.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include diff --git a/maintainers/download_gha_artifact.py b/maintainers/download_gha_artifact.py index 2abf51992f..729cd4c089 100644 --- a/maintainers/download_gha_artifact.py +++ b/maintainers/download_gha_artifact.py @@ -1,4 +1,8 @@ #!/usr/bin/env python3 +# +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + """ This script downloads an artifact from a GitHub Action workflow run, unzips and and stores the files in a directory of your choice. diff --git a/maintainers/fetch_contributors.py b/maintainers/fetch_contributors.py index c5a112d85d..409f28df35 100755 --- a/maintainers/fetch_contributors.py +++ b/maintainers/fetch_contributors.py @@ -1,4 +1,7 @@ #!/usr/bin/env python3 +# +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project import argparse import json diff --git a/maintainers/verify_license.py b/maintainers/verify_license.py new file mode 100755 index 0000000000..a6e183d606 --- /dev/null +++ b/maintainers/verify_license.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python +# +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + +__doc__ = """The utility script checks to make sure that all of the source +files in the OpenTimelineIO project have the correct license header.""" + +import os +import sys + +licenses = { + ".py": """# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project +""", + ".cpp": """// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project +""", + ".h": """// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project +""" +} + +yes = 0 +no = 0 +total = 0 + +for root, dirs, files in os.walk("."): + for filename in files: + fullpath = os.path.join(root, filename) + for ext, license in licenses.items(): + if filename.endswith(ext): + total += 1 + try: + content = open(fullpath, 'r').read() + except Exception as ex: + print("ERROR: Unable to read file: {}\n{}".format( + fullpath, ex)) + # raise + continue + if len(content) > 10 and license not in content: + print("MISSING: {}".format(fullpath)) + no += 1 + else: + yes += 1 + +print("{} of {} files have the correct license.".format(yes, total)) + +if no != 0: + print("ERROR: {} files do NOT have the correct license.".format(no)) + sys.exit(1) diff --git a/setup.py b/setup.py index 6c58a741d6..9b1ed5a25a 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,7 @@ #! /usr/bin/env python +# +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project """Setup.py for installing OpenTimelineIO diff --git a/src/opentime/errorStatus.cpp b/src/opentime/errorStatus.cpp index e65a9d54ad..13cd16db29 100644 --- a/src/opentime/errorStatus.cpp +++ b/src/opentime/errorStatus.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentime/errorStatus.h" namespace opentime { namespace OPENTIME_VERSION { diff --git a/src/opentime/errorStatus.h b/src/opentime/errorStatus.h index 6855735de2..1dc9ae0efc 100644 --- a/src/opentime/errorStatus.h +++ b/src/opentime/errorStatus.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentime/version.h" diff --git a/src/opentime/rationalTime.cpp b/src/opentime/rationalTime.cpp index 836c2b312f..166ddd21c9 100644 --- a/src/opentime/rationalTime.cpp +++ b/src/opentime/rationalTime.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentime/rationalTime.h" #include "opentime/stringPrintf.h" #include diff --git a/src/opentime/rationalTime.h b/src/opentime/rationalTime.h index ca6f8c4eda..2b8381584c 100644 --- a/src/opentime/rationalTime.h +++ b/src/opentime/rationalTime.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentime/errorStatus.h" diff --git a/src/opentime/stringPrintf.h b/src/opentime/stringPrintf.h index fb470880d0..f054346556 100644 --- a/src/opentime/stringPrintf.h +++ b/src/opentime/stringPrintf.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentime/version.h" diff --git a/src/opentime/timeRange.cpp b/src/opentime/timeRange.cpp index e1634c04fb..fe8ba8cbda 100644 --- a/src/opentime/timeRange.cpp +++ b/src/opentime/timeRange.cpp @@ -1 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentime/timeRange.h" + diff --git a/src/opentime/timeRange.h b/src/opentime/timeRange.h index 7a41dba9c6..832361954d 100644 --- a/src/opentime/timeRange.h +++ b/src/opentime/timeRange.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentime/rationalTime.h" diff --git a/src/opentime/timeTransform.cpp b/src/opentime/timeTransform.cpp index 05bd73cd33..125bc4e6d4 100644 --- a/src/opentime/timeTransform.cpp +++ b/src/opentime/timeTransform.cpp @@ -1 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentime/timeTransform.h" + diff --git a/src/opentime/timeTransform.h b/src/opentime/timeTransform.h index 6f90f9fde6..45e586c83d 100644 --- a/src/opentime/timeTransform.h +++ b/src/opentime/timeTransform.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentime/rationalTime.h" diff --git a/src/opentime/version.h b/src/opentime/version.h index 5fe0c03b80..58a822a04e 100644 --- a/src/opentime/version.h +++ b/src/opentime/version.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #define OPENTIME_VERSION v1_0 diff --git a/src/opentimelineio/any.h b/src/opentimelineio/any.h index 2939bae113..5a55ee4481 100644 --- a/src/opentimelineio/any.h +++ b/src/opentimelineio/any.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "any/any.hpp" diff --git a/src/opentimelineio/anyDictionary.h b/src/opentimelineio/anyDictionary.h index 5a34e7d995..3d9be59a4a 100644 --- a/src/opentimelineio/anyDictionary.h +++ b/src/opentimelineio/anyDictionary.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/any.h" diff --git a/src/opentimelineio/anyVector.h b/src/opentimelineio/anyVector.h index 606f36e523..230bd6ead2 100644 --- a/src/opentimelineio/anyVector.h +++ b/src/opentimelineio/anyVector.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/any.h" diff --git a/src/opentimelineio/clip.cpp b/src/opentimelineio/clip.cpp index e65ab6a2f7..f817d2f4c1 100644 --- a/src/opentimelineio/clip.cpp +++ b/src/opentimelineio/clip.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/clip.h" #include "opentimelineio/missingReference.h" diff --git a/src/opentimelineio/clip.h b/src/opentimelineio/clip.h index f1b34b6d4c..fe987a85d0 100644 --- a/src/opentimelineio/clip.h +++ b/src/opentimelineio/clip.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/item.h" diff --git a/src/opentimelineio/composable.cpp b/src/opentimelineio/composable.cpp index a518c7c16b..f3dcfa2036 100644 --- a/src/opentimelineio/composable.cpp +++ b/src/opentimelineio/composable.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/composable.h" #include "opentimelineio/composition.h" diff --git a/src/opentimelineio/composable.h b/src/opentimelineio/composable.h index d4d82039a4..e7d5a61d7a 100644 --- a/src/opentimelineio/composable.h +++ b/src/opentimelineio/composable.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/serializableObjectWithMetadata.h" diff --git a/src/opentimelineio/composition.cpp b/src/opentimelineio/composition.cpp index 96287f9d25..09065eacd0 100644 --- a/src/opentimelineio/composition.cpp +++ b/src/opentimelineio/composition.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/composition.h" #include "opentimelineio/clip.h" #include "opentimelineio/vectorIndexing.h" diff --git a/src/opentimelineio/composition.h b/src/opentimelineio/composition.h index 1de57e4976..4bb6f67020 100644 --- a/src/opentimelineio/composition.h +++ b/src/opentimelineio/composition.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/item.h" diff --git a/src/opentimelineio/deserialization.cpp b/src/opentimelineio/deserialization.cpp index 8437371aff..2b50544e73 100644 --- a/src/opentimelineio/deserialization.cpp +++ b/src/opentimelineio/deserialization.cpp @@ -1,3 +1,8 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + +#include "opentimelineio/serializableObject.h" +#include "opentimelineio/serializableObjectWithMetadata.h" #include "opentime/rationalTime.h" #include "opentime/timeRange.h" #include "opentime/timeTransform.h" diff --git a/src/opentimelineio/deserialization.h b/src/opentimelineio/deserialization.h index 2be1884da0..f010d0b6cc 100644 --- a/src/opentimelineio/deserialization.h +++ b/src/opentimelineio/deserialization.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/any.h" diff --git a/src/opentimelineio/effect.cpp b/src/opentimelineio/effect.cpp index 30e495fc29..f7306d1eb0 100644 --- a/src/opentimelineio/effect.cpp +++ b/src/opentimelineio/effect.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/effect.h" #include "opentimelineio/missingReference.h" diff --git a/src/opentimelineio/effect.h b/src/opentimelineio/effect.h index 070e3767be..32bf72d9c0 100644 --- a/src/opentimelineio/effect.h +++ b/src/opentimelineio/effect.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/serializableObjectWithMetadata.h" diff --git a/src/opentimelineio/errorStatus.cpp b/src/opentimelineio/errorStatus.cpp index 685cbcded7..87070298d0 100644 --- a/src/opentimelineio/errorStatus.cpp +++ b/src/opentimelineio/errorStatus.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/errorStatus.h" namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { diff --git a/src/opentimelineio/errorStatus.h b/src/opentimelineio/errorStatus.h index 1c82889dda..0bbc82b68a 100644 --- a/src/opentimelineio/errorStatus.h +++ b/src/opentimelineio/errorStatus.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/version.h" diff --git a/src/opentimelineio/externalReference.cpp b/src/opentimelineio/externalReference.cpp index bc1ef71836..241f3d517f 100644 --- a/src/opentimelineio/externalReference.cpp +++ b/src/opentimelineio/externalReference.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/externalReference.h" namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { diff --git a/src/opentimelineio/externalReference.h b/src/opentimelineio/externalReference.h index a35dd69a05..7e65c47ad4 100644 --- a/src/opentimelineio/externalReference.h +++ b/src/opentimelineio/externalReference.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/mediaReference.h" diff --git a/src/opentimelineio/freezeFrame.cpp b/src/opentimelineio/freezeFrame.cpp index 0ebd59066e..a24c2e4a5c 100644 --- a/src/opentimelineio/freezeFrame.cpp +++ b/src/opentimelineio/freezeFrame.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/freezeFrame.h" namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { diff --git a/src/opentimelineio/freezeFrame.h b/src/opentimelineio/freezeFrame.h index 322faed728..734d37f77f 100644 --- a/src/opentimelineio/freezeFrame.h +++ b/src/opentimelineio/freezeFrame.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/linearTimeWarp.h" diff --git a/src/opentimelineio/gap.cpp b/src/opentimelineio/gap.cpp index 1340d94890..b310d4df84 100644 --- a/src/opentimelineio/gap.cpp +++ b/src/opentimelineio/gap.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/gap.h" namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { diff --git a/src/opentimelineio/gap.h b/src/opentimelineio/gap.h index 77947e63f1..229a560fdb 100644 --- a/src/opentimelineio/gap.h +++ b/src/opentimelineio/gap.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/item.h" diff --git a/src/opentimelineio/generatorReference.cpp b/src/opentimelineio/generatorReference.cpp index 9cb3b65f09..4830df7625 100644 --- a/src/opentimelineio/generatorReference.cpp +++ b/src/opentimelineio/generatorReference.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/generatorReference.h" namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { diff --git a/src/opentimelineio/generatorReference.h b/src/opentimelineio/generatorReference.h index af2be794b4..dcaccb67ce 100644 --- a/src/opentimelineio/generatorReference.h +++ b/src/opentimelineio/generatorReference.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/mediaReference.h" diff --git a/src/opentimelineio/imageSequenceReference.cpp b/src/opentimelineio/imageSequenceReference.cpp index 368832326c..3ff8c772f3 100644 --- a/src/opentimelineio/imageSequenceReference.cpp +++ b/src/opentimelineio/imageSequenceReference.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/imageSequenceReference.h" namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { diff --git a/src/opentimelineio/imageSequenceReference.h b/src/opentimelineio/imageSequenceReference.h index 030346273b..4642a96a88 100644 --- a/src/opentimelineio/imageSequenceReference.h +++ b/src/opentimelineio/imageSequenceReference.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/mediaReference.h" diff --git a/src/opentimelineio/item.cpp b/src/opentimelineio/item.cpp index d5d608fa08..76a220b3d6 100644 --- a/src/opentimelineio/item.cpp +++ b/src/opentimelineio/item.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/item.h" #include "opentimelineio/composition.h" #include "opentimelineio/effect.h" diff --git a/src/opentimelineio/item.h b/src/opentimelineio/item.h index a2b07151a4..b4b2706e93 100644 --- a/src/opentimelineio/item.h +++ b/src/opentimelineio/item.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentime/timeRange.h" diff --git a/src/opentimelineio/linearTimeWarp.cpp b/src/opentimelineio/linearTimeWarp.cpp index 20aaa0774b..d2a734eead 100644 --- a/src/opentimelineio/linearTimeWarp.cpp +++ b/src/opentimelineio/linearTimeWarp.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/linearTimeWarp.h" namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { diff --git a/src/opentimelineio/linearTimeWarp.h b/src/opentimelineio/linearTimeWarp.h index 9cdbc7bd32..27392fa865 100644 --- a/src/opentimelineio/linearTimeWarp.h +++ b/src/opentimelineio/linearTimeWarp.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/timeEffect.h" diff --git a/src/opentimelineio/marker.cpp b/src/opentimelineio/marker.cpp index d780e7800b..8dd9248261 100644 --- a/src/opentimelineio/marker.cpp +++ b/src/opentimelineio/marker.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/marker.h" #include "opentimelineio/missingReference.h" diff --git a/src/opentimelineio/marker.h b/src/opentimelineio/marker.h index 82d40676ba..770a4c3e69 100644 --- a/src/opentimelineio/marker.h +++ b/src/opentimelineio/marker.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/serializableObjectWithMetadata.h" diff --git a/src/opentimelineio/mediaReference.cpp b/src/opentimelineio/mediaReference.cpp index 9322264fc9..b680d1cc50 100644 --- a/src/opentimelineio/mediaReference.cpp +++ b/src/opentimelineio/mediaReference.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/mediaReference.h" namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { diff --git a/src/opentimelineio/mediaReference.h b/src/opentimelineio/mediaReference.h index de6c09a83c..05c965421c 100644 --- a/src/opentimelineio/mediaReference.h +++ b/src/opentimelineio/mediaReference.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/serializableObjectWithMetadata.h" diff --git a/src/opentimelineio/missingReference.cpp b/src/opentimelineio/missingReference.cpp index b514570633..51f116ff10 100644 --- a/src/opentimelineio/missingReference.cpp +++ b/src/opentimelineio/missingReference.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/missingReference.h" namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { diff --git a/src/opentimelineio/missingReference.h b/src/opentimelineio/missingReference.h index 898df23e9b..e5fb82ca4b 100644 --- a/src/opentimelineio/missingReference.h +++ b/src/opentimelineio/missingReference.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/mediaReference.h" diff --git a/src/opentimelineio/optional.h b/src/opentimelineio/optional.h index ee7469354f..8b8521b041 100644 --- a/src/opentimelineio/optional.h +++ b/src/opentimelineio/optional.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "nonstd/optional.hpp" diff --git a/src/opentimelineio/safely_typed_any.cpp b/src/opentimelineio/safely_typed_any.cpp index 63f77e1564..062a5bdbc2 100644 --- a/src/opentimelineio/safely_typed_any.cpp +++ b/src/opentimelineio/safely_typed_any.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/safely_typed_any.h" namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { diff --git a/src/opentimelineio/safely_typed_any.h b/src/opentimelineio/safely_typed_any.h index d974ad7faa..fcd49c54e8 100644 --- a/src/opentimelineio/safely_typed_any.h +++ b/src/opentimelineio/safely_typed_any.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once /** diff --git a/src/opentimelineio/serializableCollection.cpp b/src/opentimelineio/serializableCollection.cpp index 8818e837af..12dc8d07e3 100644 --- a/src/opentimelineio/serializableCollection.cpp +++ b/src/opentimelineio/serializableCollection.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/serializableCollection.h" #include "opentimelineio/clip.h" #include "opentimelineio/vectorIndexing.h" diff --git a/src/opentimelineio/serializableCollection.h b/src/opentimelineio/serializableCollection.h index 2afa02a85e..34fd7278f4 100644 --- a/src/opentimelineio/serializableCollection.h +++ b/src/opentimelineio/serializableCollection.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/composition.h" diff --git a/src/opentimelineio/serializableObject.cpp b/src/opentimelineio/serializableObject.cpp index 4453aa3a6f..fb749bd1e8 100644 --- a/src/opentimelineio/serializableObject.cpp +++ b/src/opentimelineio/serializableObject.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/serializableObject.h" #include "opentimelineio/deserialization.h" #include "opentimelineio/serialization.h" diff --git a/src/opentimelineio/serializableObject.h b/src/opentimelineio/serializableObject.h index 5309177fc8..2df3158592 100644 --- a/src/opentimelineio/serializableObject.h +++ b/src/opentimelineio/serializableObject.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentime/rationalTime.h" diff --git a/src/opentimelineio/serializableObjectWithMetadata.cpp b/src/opentimelineio/serializableObjectWithMetadata.cpp index f25d4c29d4..dc2a9b97a2 100644 --- a/src/opentimelineio/serializableObjectWithMetadata.cpp +++ b/src/opentimelineio/serializableObjectWithMetadata.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/serializableObjectWithMetadata.h" namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { diff --git a/src/opentimelineio/serializableObjectWithMetadata.h b/src/opentimelineio/serializableObjectWithMetadata.h index cb15924e2d..10b095dcaf 100644 --- a/src/opentimelineio/serializableObjectWithMetadata.h +++ b/src/opentimelineio/serializableObjectWithMetadata.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/serializableObject.h" diff --git a/src/opentimelineio/serialization.cpp b/src/opentimelineio/serialization.cpp index 581a0d4b2a..0c9ad8c683 100644 --- a/src/opentimelineio/serialization.cpp +++ b/src/opentimelineio/serialization.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/serializableObject.h" #include "opentimelineio/unknownSchema.h" #include "stringUtils.h" diff --git a/src/opentimelineio/serialization.h b/src/opentimelineio/serialization.h index 5f2c9c4a08..e716740a3d 100644 --- a/src/opentimelineio/serialization.h +++ b/src/opentimelineio/serialization.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/any.h" diff --git a/src/opentimelineio/stack.cpp b/src/opentimelineio/stack.cpp index f5d00ec922..e86c1953f4 100644 --- a/src/opentimelineio/stack.cpp +++ b/src/opentimelineio/stack.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/stack.h" #include "opentimelineio/clip.h" #include "opentimelineio/vectorIndexing.h" diff --git a/src/opentimelineio/stack.h b/src/opentimelineio/stack.h index 031af04839..6c88561f38 100644 --- a/src/opentimelineio/stack.h +++ b/src/opentimelineio/stack.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/composition.h" diff --git a/src/opentimelineio/stackAlgorithm.cpp b/src/opentimelineio/stackAlgorithm.cpp index c59e4e1fa8..01f908e1cc 100644 --- a/src/opentimelineio/stackAlgorithm.cpp +++ b/src/opentimelineio/stackAlgorithm.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/stackAlgorithm.h" #include "opentimelineio/track.h" #include "opentimelineio/trackAlgorithm.h" diff --git a/src/opentimelineio/stackAlgorithm.h b/src/opentimelineio/stackAlgorithm.h index c10c85fdea..cd89627fea 100644 --- a/src/opentimelineio/stackAlgorithm.h +++ b/src/opentimelineio/stackAlgorithm.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/stack.h" diff --git a/src/opentimelineio/stringUtils.cpp b/src/opentimelineio/stringUtils.cpp index e26e9b29fd..46dae43e52 100644 --- a/src/opentimelineio/stringUtils.cpp +++ b/src/opentimelineio/stringUtils.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/serializableObject.h" #if defined(__GNUC__) || defined(__clang__) # include diff --git a/src/opentimelineio/stringUtils.h b/src/opentimelineio/stringUtils.h index 64c1b0d9d4..6630238a3e 100644 --- a/src/opentimelineio/stringUtils.h +++ b/src/opentimelineio/stringUtils.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentime/stringPrintf.h" diff --git a/src/opentimelineio/timeEffect.cpp b/src/opentimelineio/timeEffect.cpp index f3675687bb..4e9d65a60f 100644 --- a/src/opentimelineio/timeEffect.cpp +++ b/src/opentimelineio/timeEffect.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/timeEffect.h" namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { diff --git a/src/opentimelineio/timeEffect.h b/src/opentimelineio/timeEffect.h index e96e743aaa..c901470904 100644 --- a/src/opentimelineio/timeEffect.h +++ b/src/opentimelineio/timeEffect.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/effect.h" diff --git a/src/opentimelineio/timeline.cpp b/src/opentimelineio/timeline.cpp index 58232e1221..2afdcff3f5 100644 --- a/src/opentimelineio/timeline.cpp +++ b/src/opentimelineio/timeline.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/timeline.h" #include "opentimelineio/clip.h" diff --git a/src/opentimelineio/timeline.h b/src/opentimelineio/timeline.h index e617825c8f..6f80c697b3 100644 --- a/src/opentimelineio/timeline.h +++ b/src/opentimelineio/timeline.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/serializableObjectWithMetadata.h" diff --git a/src/opentimelineio/track.cpp b/src/opentimelineio/track.cpp index db02f8d5a6..9118340a56 100644 --- a/src/opentimelineio/track.cpp +++ b/src/opentimelineio/track.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/track.h" #include "opentimelineio/clip.h" #include "opentimelineio/gap.h" diff --git a/src/opentimelineio/track.h b/src/opentimelineio/track.h index 2a91f802de..ec19cae3b2 100644 --- a/src/opentimelineio/track.h +++ b/src/opentimelineio/track.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/composition.h" diff --git a/src/opentimelineio/trackAlgorithm.cpp b/src/opentimelineio/trackAlgorithm.cpp index 1f1f6f8c4a..ff3a71ffa2 100644 --- a/src/opentimelineio/trackAlgorithm.cpp +++ b/src/opentimelineio/trackAlgorithm.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/trackAlgorithm.h" #include "opentimelineio/transition.h" diff --git a/src/opentimelineio/trackAlgorithm.h b/src/opentimelineio/trackAlgorithm.h index 420d2a91cd..5e2fe369cd 100644 --- a/src/opentimelineio/trackAlgorithm.h +++ b/src/opentimelineio/trackAlgorithm.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/track.h" diff --git a/src/opentimelineio/transition.cpp b/src/opentimelineio/transition.cpp index 1379780571..ee19c2360d 100644 --- a/src/opentimelineio/transition.cpp +++ b/src/opentimelineio/transition.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/transition.h" #include "opentimelineio/composition.h" diff --git a/src/opentimelineio/transition.h b/src/opentimelineio/transition.h index 407fc51ad9..e55b543fa0 100644 --- a/src/opentimelineio/transition.h +++ b/src/opentimelineio/transition.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/composable.h" diff --git a/src/opentimelineio/typeRegistry.cpp b/src/opentimelineio/typeRegistry.cpp index b93835019d..4aca5a9fa3 100644 --- a/src/opentimelineio/typeRegistry.cpp +++ b/src/opentimelineio/typeRegistry.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/typeRegistry.h" #include "opentimelineio/clip.h" diff --git a/src/opentimelineio/typeRegistry.h b/src/opentimelineio/typeRegistry.h index 21660e2328..20cf90e8f4 100644 --- a/src/opentimelineio/typeRegistry.h +++ b/src/opentimelineio/typeRegistry.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/any.h" diff --git a/src/opentimelineio/unknownSchema.cpp b/src/opentimelineio/unknownSchema.cpp index 3d75c580db..545d823b6f 100644 --- a/src/opentimelineio/unknownSchema.cpp +++ b/src/opentimelineio/unknownSchema.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "opentimelineio/unknownSchema.h" namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { diff --git a/src/opentimelineio/unknownSchema.h b/src/opentimelineio/unknownSchema.h index 8373340bf5..b7736350c1 100644 --- a/src/opentimelineio/unknownSchema.h +++ b/src/opentimelineio/unknownSchema.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/serializableObject.h" diff --git a/src/opentimelineio/vectorIndexing.h b/src/opentimelineio/vectorIndexing.h index 7723555705..f14b722429 100644 --- a/src/opentimelineio/vectorIndexing.h +++ b/src/opentimelineio/vectorIndexing.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include "opentimelineio/version.h" diff --git a/src/opentimelineio/version.h b/src/opentimelineio/version.h index 3044ed9f7a..9c8b8905a2 100644 --- a/src/opentimelineio/version.h +++ b/src/opentimelineio/version.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #define OPENTIMELINEIO_VERSION v1_0 diff --git a/src/opentimelineview/__init__.py b/src/opentimelineview/__init__.py index c1bf6d6537..34e0506818 100644 --- a/src/opentimelineview/__init__.py +++ b/src/opentimelineview/__init__.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# # flake8: noqa diff --git a/src/opentimelineview/console.py b/src/opentimelineview/console.py index 5bc079407e..cf75aae670 100755 --- a/src/opentimelineview/console.py +++ b/src/opentimelineview/console.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Simple otio viewer""" diff --git a/src/opentimelineview/details_widget.py b/src/opentimelineview/details_widget.py index bba76e5643..ed30a3919a 100644 --- a/src/opentimelineview/details_widget.py +++ b/src/opentimelineview/details_widget.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# try: from PySide6 import QtWidgets, QtGui, QtCore diff --git a/src/opentimelineview/ruler_widget.py b/src/opentimelineview/ruler_widget.py index e3b2a1c098..67b83af7cc 100644 --- a/src/opentimelineview/ruler_widget.py +++ b/src/opentimelineview/ruler_widget.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# try: from PySide6 import QtGui, QtCore, QtWidgets diff --git a/src/opentimelineview/settings.py b/src/opentimelineview/settings.py index 4915188c11..3df8986011 100644 --- a/src/opentimelineview/settings.py +++ b/src/opentimelineview/settings.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + VIEW_STYLESHEET = """ QMainWindow { background-color: rgb(27, 27, 27); diff --git a/src/opentimelineview/timeline_widget.py b/src/opentimelineview/timeline_widget.py index 2863db1098..a565aa1be2 100644 --- a/src/opentimelineview/timeline_widget.py +++ b/src/opentimelineview/timeline_widget.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# try: from PySide6 import QtGui, QtCore, QtWidgets diff --git a/src/opentimelineview/track_widgets.py b/src/opentimelineview/track_widgets.py index 92871b11da..b2449cb55d 100644 --- a/src/opentimelineview/track_widgets.py +++ b/src/opentimelineview/track_widgets.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# try: from PySide6 import QtGui, QtCore, QtWidgets diff --git a/src/py-opentimelineio/opentime-bindings/opentime_bindings.cpp b/src/py-opentimelineio/opentime-bindings/opentime_bindings.cpp index c815438d37..55cf2a586e 100644 --- a/src/py-opentimelineio/opentime-bindings/opentime_bindings.cpp +++ b/src/py-opentimelineio/opentime-bindings/opentime_bindings.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include #include "opentime_bindings.h" diff --git a/src/py-opentimelineio/opentime-bindings/opentime_bindings.h b/src/py-opentimelineio/opentime-bindings/opentime_bindings.h index 1664561cb7..eb62dcd9a8 100644 --- a/src/py-opentimelineio/opentime-bindings/opentime_bindings.h +++ b/src/py-opentimelineio/opentime-bindings/opentime_bindings.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #ifndef OTIO_OPENTIME_BINDINGS_H #define OTIO_OPENTIME_BINDINGS_H diff --git a/src/py-opentimelineio/opentime-bindings/opentime_rationalTime.cpp b/src/py-opentimelineio/opentime-bindings/opentime_rationalTime.cpp index 7c8d94bda6..1e219a8194 100644 --- a/src/py-opentimelineio/opentime-bindings/opentime_rationalTime.cpp +++ b/src/py-opentimelineio/opentime-bindings/opentime_rationalTime.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include #include diff --git a/src/py-opentimelineio/opentime-bindings/opentime_timeRange.cpp b/src/py-opentimelineio/opentime-bindings/opentime_timeRange.cpp index a054c26868..de6611d955 100644 --- a/src/py-opentimelineio/opentime-bindings/opentime_timeRange.cpp +++ b/src/py-opentimelineio/opentime-bindings/opentime_timeRange.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include #include diff --git a/src/py-opentimelineio/opentime-bindings/opentime_timeTransform.cpp b/src/py-opentimelineio/opentime-bindings/opentime_timeTransform.cpp index a4d6c7d48a..ebfd31189f 100644 --- a/src/py-opentimelineio/opentime-bindings/opentime_timeTransform.cpp +++ b/src/py-opentimelineio/opentime-bindings/opentime_timeTransform.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include #include diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_anyDictionary.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_anyDictionary.cpp index afcfaf65e0..afed99386d 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_anyDictionary.cpp +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_anyDictionary.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include #include diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_anyDictionary.h b/src/py-opentimelineio/opentimelineio-bindings/otio_anyDictionary.h index 9deeb6f106..bdeba42366 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_anyDictionary.h +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_anyDictionary.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_anyVector.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_anyVector.cpp index cc9158d5e0..ba7a16042e 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_anyVector.cpp +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_anyVector.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include #include diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_anyVector.h b/src/py-opentimelineio/opentimelineio-bindings/otio_anyVector.h index 608396d70d..882b46b689 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_anyVector.h +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_anyVector.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include #include "opentimelineio/anyVector.h" diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_bindings.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_bindings.cpp index 5c0e5bbbb7..1ead464309 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_bindings.cpp +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_bindings.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include #include "otio_anyDictionary.h" #include "otio_anyVector.h" diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_bindings.h b/src/py-opentimelineio/opentimelineio-bindings/otio_bindings.h index 40f306a6ed..dc5287076b 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_bindings.h +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_bindings.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_errorStatusHandler.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_errorStatusHandler.cpp index 4693052a29..be90a785c1 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_errorStatusHandler.cpp +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_errorStatusHandler.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "otio_errorStatusHandler.h" #include "opentimelineio/stringUtils.h" #include "opentimelineio/serializableObject.h" diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_errorStatusHandler.h b/src/py-opentimelineio/opentimelineio-bindings/otio_errorStatusHandler.h index 5a5ef51b64..882ad8bf0a 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_errorStatusHandler.h +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_errorStatusHandler.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_imath.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_imath.cpp index b2896b20c4..996c660e15 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_imath.cpp +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_imath.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include #include diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp index f6ee751441..f5665470db 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include #include #include diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_tests.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_tests.cpp index d78f3ad5b0..8bab92c5e5 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_tests.cpp +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_tests.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include #include diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.cpp index ceb6a21679..894406fc00 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.cpp +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "otio_utils.h" #include "otio_anyDictionary.h" #include "otio_anyVector.h" diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h index f4bbdf3081..da70920356 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #include diff --git a/src/py-opentimelineio/opentimelineio/__init__.py b/src/py-opentimelineio/opentimelineio/__init__.py index a3762dd151..3d3bab5fbe 100644 --- a/src/py-opentimelineio/opentimelineio/__init__.py +++ b/src/py-opentimelineio/opentimelineio/__init__.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """An editorial interchange format and library. diff --git a/src/py-opentimelineio/opentimelineio/adapters/__init__.py b/src/py-opentimelineio/opentimelineio/adapters/__init__.py index 485df8d752..ead4e4974c 100644 --- a/src/py-opentimelineio/opentimelineio/adapters/__init__.py +++ b/src/py-opentimelineio/opentimelineio/adapters/__init__.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Expose the adapter interface to developers. diff --git a/src/py-opentimelineio/opentimelineio/adapters/adapter.py b/src/py-opentimelineio/opentimelineio/adapters/adapter.py index 7de25aa231..1f12e35a1d 100644 --- a/src/py-opentimelineio/opentimelineio/adapters/adapter.py +++ b/src/py-opentimelineio/opentimelineio/adapters/adapter.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Implementation of the OTIO internal `Adapter` system. diff --git a/src/py-opentimelineio/opentimelineio/adapters/cmx_3600.py b/src/py-opentimelineio/opentimelineio/adapters/cmx_3600.py index 07e451864a..cb6405683f 100644 --- a/src/py-opentimelineio/opentimelineio/adapters/cmx_3600.py +++ b/src/py-opentimelineio/opentimelineio/adapters/cmx_3600.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """OpenTimelineIO CMX 3600 EDL Adapter""" diff --git a/src/py-opentimelineio/opentimelineio/adapters/fcp_xml.py b/src/py-opentimelineio/opentimelineio/adapters/fcp_xml.py index 9465128b77..32ad321e97 100644 --- a/src/py-opentimelineio/opentimelineio/adapters/fcp_xml.py +++ b/src/py-opentimelineio/opentimelineio/adapters/fcp_xml.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """OpenTimelineIO Final Cut Pro 7 XML Adapter.""" diff --git a/src/py-opentimelineio/opentimelineio/adapters/file_bundle_utils.py b/src/py-opentimelineio/opentimelineio/adapters/file_bundle_utils.py index 7888f8ec6d..785376d8c5 100644 --- a/src/py-opentimelineio/opentimelineio/adapters/file_bundle_utils.py +++ b/src/py-opentimelineio/opentimelineio/adapters/file_bundle_utils.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Common utilities used by the file bundle adapters (otiod and otioz).""" diff --git a/src/py-opentimelineio/opentimelineio/adapters/otio_json.py b/src/py-opentimelineio/opentimelineio/adapters/otio_json.py index a1bbe01bf0..3db34c1083 100644 --- a/src/py-opentimelineio/opentimelineio/adapters/otio_json.py +++ b/src/py-opentimelineio/opentimelineio/adapters/otio_json.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """This adapter lets you read and write native .otio files""" diff --git a/src/py-opentimelineio/opentimelineio/adapters/otiod.py b/src/py-opentimelineio/opentimelineio/adapters/otiod.py index 277da1106f..93cadf85af 100644 --- a/src/py-opentimelineio/opentimelineio/adapters/otiod.py +++ b/src/py-opentimelineio/opentimelineio/adapters/otiod.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """OTIOD adapter - bundles otio files linked to local media in a directory diff --git a/src/py-opentimelineio/opentimelineio/adapters/otioz.py b/src/py-opentimelineio/opentimelineio/adapters/otioz.py index 4422cb9fe2..040edd50e7 100644 --- a/src/py-opentimelineio/opentimelineio/adapters/otioz.py +++ b/src/py-opentimelineio/opentimelineio/adapters/otioz.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """OTIOZ adapter - bundles otio files linked to local media diff --git a/src/py-opentimelineio/opentimelineio/adapters/svg.py b/src/py-opentimelineio/opentimelineio/adapters/svg.py index 28841378e6..25c3fdb58c 100644 --- a/src/py-opentimelineio/opentimelineio/adapters/svg.py +++ b/src/py-opentimelineio/opentimelineio/adapters/svg.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """OTIO to SVG Adapter Points in calculations are y-up. diff --git a/src/py-opentimelineio/opentimelineio/algorithms/__init__.py b/src/py-opentimelineio/opentimelineio/algorithms/__init__.py index ea662763af..d6f2eaea24 100644 --- a/src/py-opentimelineio/opentimelineio/algorithms/__init__.py +++ b/src/py-opentimelineio/opentimelineio/algorithms/__init__.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Algorithms for OTIO objects.""" diff --git a/src/py-opentimelineio/opentimelineio/algorithms/filter.py b/src/py-opentimelineio/opentimelineio/algorithms/filter.py index 5df39f78ae..5ffe8ba78a 100644 --- a/src/py-opentimelineio/opentimelineio/algorithms/filter.py +++ b/src/py-opentimelineio/opentimelineio/algorithms/filter.py @@ -1,27 +1,5 @@ -#!/usr/bin/env python -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Algorithms for filtering OTIO files. """ diff --git a/src/py-opentimelineio/opentimelineio/algorithms/stack_algo.py b/src/py-opentimelineio/opentimelineio/algorithms/stack_algo.py index c0b36ecfeb..3c45325021 100644 --- a/src/py-opentimelineio/opentimelineio/algorithms/stack_algo.py +++ b/src/py-opentimelineio/opentimelineio/algorithms/stack_algo.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# __doc__ = """ Algorithms for stack objects. """ diff --git a/src/py-opentimelineio/opentimelineio/algorithms/timeline_algo.py b/src/py-opentimelineio/opentimelineio/algorithms/timeline_algo.py index 790d8edc8a..706fac6b2e 100644 --- a/src/py-opentimelineio/opentimelineio/algorithms/timeline_algo.py +++ b/src/py-opentimelineio/opentimelineio/algorithms/timeline_algo.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Algorithms for timeline objects.""" diff --git a/src/py-opentimelineio/opentimelineio/algorithms/track_algo.py b/src/py-opentimelineio/opentimelineio/algorithms/track_algo.py index b411a7150f..0644bc37d4 100644 --- a/src/py-opentimelineio/opentimelineio/algorithms/track_algo.py +++ b/src/py-opentimelineio/opentimelineio/algorithms/track_algo.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Algorithms for track objects.""" diff --git a/src/py-opentimelineio/opentimelineio/console/__init__.py b/src/py-opentimelineio/opentimelineio/console/__init__.py index e5032190e7..cbe7af5a5e 100644 --- a/src/py-opentimelineio/opentimelineio/console/__init__.py +++ b/src/py-opentimelineio/opentimelineio/console/__init__.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Console scripts for OpenTimelineIO diff --git a/src/py-opentimelineio/opentimelineio/console/autogen_plugin_documentation.py b/src/py-opentimelineio/opentimelineio/console/autogen_plugin_documentation.py index d8e5ef87c4..27a13e91c1 100644 --- a/src/py-opentimelineio/opentimelineio/console/autogen_plugin_documentation.py +++ b/src/py-opentimelineio/opentimelineio/console/autogen_plugin_documentation.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# licensed under the apache license, version 2.0 (the "apache license") -# with the following modification; you may not use this file except in -# compliance with the apache license and the following modification to it: -# section 6. trademarks. is deleted and replaced with: -# -# 6. trademarks. this license does not grant permission to use the trade -# names, trademarks, service marks, or product names of the licensor -# and its affiliates, except as required to comply with section 4(c) of -# the license and to reproduce the content of the notice file. -# -# you may obtain a copy of the apache license at -# -# http://www.apache.org/licenses/license-2.0 -# -# unless required by applicable law or agreed to in writing, software -# distributed under the apache license with the above modification is -# distributed on an "as is" basis, without warranties or conditions of any -# kind, either express or implied. see the apache license for the specific -# language governing permissions and limitations under the apache license. -# """Generates documentation of all the built in plugins for OpenTimelineIO""" diff --git a/src/py-opentimelineio/opentimelineio/console/autogen_serialized_datamodel.py b/src/py-opentimelineio/opentimelineio/console/autogen_serialized_datamodel.py index b8508136a6..6da824fd6a 100644 --- a/src/py-opentimelineio/opentimelineio/console/autogen_serialized_datamodel.py +++ b/src/py-opentimelineio/opentimelineio/console/autogen_serialized_datamodel.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Generates documentation of the serialized data model for OpenTimelineIO.""" diff --git a/src/py-opentimelineio/opentimelineio/console/console_utils.py b/src/py-opentimelineio/opentimelineio/console/console_utils.py index b7c27ed28a..c6b923f22a 100644 --- a/src/py-opentimelineio/opentimelineio/console/console_utils.py +++ b/src/py-opentimelineio/opentimelineio/console/console_utils.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import ast diff --git a/src/py-opentimelineio/opentimelineio/console/otiocat.py b/src/py-opentimelineio/opentimelineio/console/otiocat.py index ac5fa83df4..027edcda86 100755 --- a/src/py-opentimelineio/opentimelineio/console/otiocat.py +++ b/src/py-opentimelineio/opentimelineio/console/otiocat.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Print the contents of an OTIO file to stdout.""" diff --git a/src/py-opentimelineio/opentimelineio/console/otioconvert.py b/src/py-opentimelineio/opentimelineio/console/otioconvert.py index 7f37c0e5b3..be0db93994 100755 --- a/src/py-opentimelineio/opentimelineio/console/otioconvert.py +++ b/src/py-opentimelineio/opentimelineio/console/otioconvert.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import argparse import sys diff --git a/src/py-opentimelineio/opentimelineio/console/otiopluginfo.py b/src/py-opentimelineio/opentimelineio/console/otiopluginfo.py index ab44ba1d57..66042b7818 100644 --- a/src/py-opentimelineio/opentimelineio/console/otiopluginfo.py +++ b/src/py-opentimelineio/opentimelineio/console/otiopluginfo.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# licensed under the apache license, version 2.0 (the "apache license") -# with the following modification; you may not use this file except in -# compliance with the apache license and the following modification to it: -# section 6. trademarks. is deleted and replaced with: -# -# 6. trademarks. this license does not grant permission to use the trade -# names, trademarks, service marks, or product names of the licensor -# and its affiliates, except as required to comply with section 4(c) of -# the license and to reproduce the content of the notice file. -# -# you may obtain a copy of the apache license at -# -# http://www.apache.org/licenses/license-2.0 -# -# unless required by applicable law or agreed to in writing, software -# distributed under the apache license with the above modification is -# distributed on an "as is" basis, without warranties or conditions of any -# kind, either express or implied. see the apache license for the specific -# language governing permissions and limitations under the apache license. -# """Print information about the OTIO plugin ecosystem.""" diff --git a/src/py-opentimelineio/opentimelineio/console/otiostat.py b/src/py-opentimelineio/opentimelineio/console/otiostat.py index 7608ab61b8..b4e8fc95ba 100755 --- a/src/py-opentimelineio/opentimelineio/console/otiostat.py +++ b/src/py-opentimelineio/opentimelineio/console/otiostat.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Print statistics about the otio file, including validation information.""" diff --git a/src/py-opentimelineio/opentimelineio/core/__init__.py b/src/py-opentimelineio/opentimelineio/core/__init__.py index cab4aed57b..01509ac639 100644 --- a/src/py-opentimelineio/opentimelineio/core/__init__.py +++ b/src/py-opentimelineio/opentimelineio/core/__init__.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. _otio import ( # noqa # errors CannotComputeAvailableRangeError, diff --git a/src/py-opentimelineio/opentimelineio/core/_core_utils.py b/src/py-opentimelineio/opentimelineio/core/_core_utils.py index 3e35426edd..8f80dbdad9 100644 --- a/src/py-opentimelineio/opentimelineio/core/_core_utils.py +++ b/src/py-opentimelineio/opentimelineio/core/_core_utils.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + import types try: # Python 3.3+ diff --git a/src/py-opentimelineio/opentimelineio/core/composable.py b/src/py-opentimelineio/opentimelineio/core/composable.py index 9f2a81e3f7..2eba50d845 100644 --- a/src/py-opentimelineio/opentimelineio/core/composable.py +++ b/src/py-opentimelineio/opentimelineio/core/composable.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from . _core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/core/composition.py b/src/py-opentimelineio/opentimelineio/core/composition.py index 899d7b8a49..8cfb625417 100644 --- a/src/py-opentimelineio/opentimelineio/core/composition.py +++ b/src/py-opentimelineio/opentimelineio/core/composition.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from . _core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/core/item.py b/src/py-opentimelineio/opentimelineio/core/item.py index 42d4a47920..99f32f0395 100644 --- a/src/py-opentimelineio/opentimelineio/core/item.py +++ b/src/py-opentimelineio/opentimelineio/core/item.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from . _core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/core/mediaReference.py b/src/py-opentimelineio/opentimelineio/core/mediaReference.py index e3509a711c..aec89d3054 100644 --- a/src/py-opentimelineio/opentimelineio/core/mediaReference.py +++ b/src/py-opentimelineio/opentimelineio/core/mediaReference.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from . _core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/exceptions.py b/src/py-opentimelineio/opentimelineio/exceptions.py index 5244429ee8..35646b49b8 100644 --- a/src/py-opentimelineio/opentimelineio/exceptions.py +++ b/src/py-opentimelineio/opentimelineio/exceptions.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Exception classes for OpenTimelineIO""" from . _otio import ( # noqa diff --git a/src/py-opentimelineio/opentimelineio/hooks.py b/src/py-opentimelineio/opentimelineio/hooks.py index 1406532faf..1bb62625b7 100644 --- a/src/py-opentimelineio/opentimelineio/hooks.py +++ b/src/py-opentimelineio/opentimelineio/hooks.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# from . import ( plugins, diff --git a/src/py-opentimelineio/opentimelineio/media_linker.py b/src/py-opentimelineio/opentimelineio/media_linker.py index 08d670ef5a..b475332add 100644 --- a/src/py-opentimelineio/opentimelineio/media_linker.py +++ b/src/py-opentimelineio/opentimelineio/media_linker.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """ MediaLinker plugins fire after an adapter has read a file in order to produce MediaReferences that point at valid, site specific media. diff --git a/src/py-opentimelineio/opentimelineio/opentime.py b/src/py-opentimelineio/opentimelineio/opentime.py index 6bf9cad5af..2f8f9ed0cc 100644 --- a/src/py-opentimelineio/opentimelineio/opentime.py +++ b/src/py-opentimelineio/opentimelineio/opentime.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from . _opentime import ( # noqa RationalTime, TimeRange, diff --git a/src/py-opentimelineio/opentimelineio/plugins/__init__.py b/src/py-opentimelineio/opentimelineio/plugins/__init__.py index e5e67b38ed..c8c0a1f55e 100644 --- a/src/py-opentimelineio/opentimelineio/plugins/__init__.py +++ b/src/py-opentimelineio/opentimelineio/plugins/__init__.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Plugin system for OTIO""" diff --git a/src/py-opentimelineio/opentimelineio/plugins/manifest.py b/src/py-opentimelineio/opentimelineio/plugins/manifest.py index 722df1636f..b060fd630b 100644 --- a/src/py-opentimelineio/opentimelineio/plugins/manifest.py +++ b/src/py-opentimelineio/opentimelineio/plugins/manifest.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """OTIO Python Plugin Manifest system: locates plugins to OTIO.""" diff --git a/src/py-opentimelineio/opentimelineio/plugins/python_plugin.py b/src/py-opentimelineio/opentimelineio/plugins/python_plugin.py index 2bcbd85f90..44262fce0e 100644 --- a/src/py-opentimelineio/opentimelineio/plugins/python_plugin.py +++ b/src/py-opentimelineio/opentimelineio/plugins/python_plugin.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Base class for OTIO plugins that are exposed by manifests.""" diff --git a/src/py-opentimelineio/opentimelineio/schema/__init__.py b/src/py-opentimelineio/opentimelineio/schema/__init__.py index 8079d278d0..b1242bd250 100644 --- a/src/py-opentimelineio/opentimelineio/schema/__init__.py +++ b/src/py-opentimelineio/opentimelineio/schema/__init__.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# # flake8: noqa diff --git a/src/py-opentimelineio/opentimelineio/schema/box2d.py b/src/py-opentimelineio/opentimelineio/schema/box2d.py index 96df41fbca..d8937958d1 100644 --- a/src/py-opentimelineio/opentimelineio/schema/box2d.py +++ b/src/py-opentimelineio/opentimelineio/schema/box2d.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. core._core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/schema/clip.py b/src/py-opentimelineio/opentimelineio/schema/clip.py index c64d909935..36f22182cf 100644 --- a/src/py-opentimelineio/opentimelineio/schema/clip.py +++ b/src/py-opentimelineio/opentimelineio/schema/clip.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. core._core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/schema/effect.py b/src/py-opentimelineio/opentimelineio/schema/effect.py index 7f98235aa6..3fc575ce35 100644 --- a/src/py-opentimelineio/opentimelineio/schema/effect.py +++ b/src/py-opentimelineio/opentimelineio/schema/effect.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. core._core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/schema/external_reference.py b/src/py-opentimelineio/opentimelineio/schema/external_reference.py index 405d69045a..93e7acdd67 100644 --- a/src/py-opentimelineio/opentimelineio/schema/external_reference.py +++ b/src/py-opentimelineio/opentimelineio/schema/external_reference.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. core._core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/schema/foo.py b/src/py-opentimelineio/opentimelineio/schema/foo.py index 6e42b8e1e7..b6ec966ce1 100644 --- a/src/py-opentimelineio/opentimelineio/schema/foo.py +++ b/src/py-opentimelineio/opentimelineio/schema/foo.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. import core """Test Class""" diff --git a/src/py-opentimelineio/opentimelineio/schema/generator_reference.py b/src/py-opentimelineio/opentimelineio/schema/generator_reference.py index 4f89b62bf2..418f4581d6 100644 --- a/src/py-opentimelineio/opentimelineio/schema/generator_reference.py +++ b/src/py-opentimelineio/opentimelineio/schema/generator_reference.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. core._core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/schema/image_sequence_reference.py b/src/py-opentimelineio/opentimelineio/schema/image_sequence_reference.py index 5511184cdb..d1c01d0c6d 100644 --- a/src/py-opentimelineio/opentimelineio/schema/image_sequence_reference.py +++ b/src/py-opentimelineio/opentimelineio/schema/image_sequence_reference.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. core._core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/schema/marker.py b/src/py-opentimelineio/opentimelineio/schema/marker.py index ec0525fd49..af18090189 100644 --- a/src/py-opentimelineio/opentimelineio/schema/marker.py +++ b/src/py-opentimelineio/opentimelineio/schema/marker.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. core._core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/schema/schemadef.py b/src/py-opentimelineio/opentimelineio/schema/schemadef.py index 38a4cfa408..7481075e67 100644 --- a/src/py-opentimelineio/opentimelineio/schema/schemadef.py +++ b/src/py-opentimelineio/opentimelineio/schema/schemadef.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + import inspect import collections diff --git a/src/py-opentimelineio/opentimelineio/schema/serializable_collection.py b/src/py-opentimelineio/opentimelineio/schema/serializable_collection.py index 7e6c2dbedc..c1c9f668aa 100644 --- a/src/py-opentimelineio/opentimelineio/schema/serializable_collection.py +++ b/src/py-opentimelineio/opentimelineio/schema/serializable_collection.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. core._core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/schema/stack.py b/src/py-opentimelineio/opentimelineio/schema/stack.py index 905a92e9bd..8b7f24cf9f 100644 --- a/src/py-opentimelineio/opentimelineio/schema/stack.py +++ b/src/py-opentimelineio/opentimelineio/schema/stack.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. core._core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/schema/timeline.py b/src/py-opentimelineio/opentimelineio/schema/timeline.py index 24f9d1d6e9..85dcd07d3b 100644 --- a/src/py-opentimelineio/opentimelineio/schema/timeline.py +++ b/src/py-opentimelineio/opentimelineio/schema/timeline.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. core._core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/schema/track.py b/src/py-opentimelineio/opentimelineio/schema/track.py index b0ebbb60bd..4bac8120f8 100644 --- a/src/py-opentimelineio/opentimelineio/schema/track.py +++ b/src/py-opentimelineio/opentimelineio/schema/track.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. core._core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/schema/transition.py b/src/py-opentimelineio/opentimelineio/schema/transition.py index 54c68ac05f..a344b61aea 100644 --- a/src/py-opentimelineio/opentimelineio/schema/transition.py +++ b/src/py-opentimelineio/opentimelineio/schema/transition.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. core._core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/schema/v2d.py b/src/py-opentimelineio/opentimelineio/schema/v2d.py index 34f7fd68bd..ce8fcea1dc 100644 --- a/src/py-opentimelineio/opentimelineio/schema/v2d.py +++ b/src/py-opentimelineio/opentimelineio/schema/v2d.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + from .. core._core_utils import add_method from .. import _otio diff --git a/src/py-opentimelineio/opentimelineio/schemadef/__init__.py b/src/py-opentimelineio/opentimelineio/schemadef/__init__.py index 568b3eaaa7..8efdee9ab5 100644 --- a/src/py-opentimelineio/opentimelineio/schemadef/__init__.py +++ b/src/py-opentimelineio/opentimelineio/schemadef/__init__.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project def _add_schemadef_module(name, mod): """Insert a new module name and module object into schemadef namespace.""" diff --git a/src/py-opentimelineio/opentimelineio/test_utils.py b/src/py-opentimelineio/opentimelineio/test_utils.py index eff57c02a8..0c9a3da901 100644 --- a/src/py-opentimelineio/opentimelineio/test_utils.py +++ b/src/py-opentimelineio/opentimelineio/test_utils.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Utility assertions for OTIO Unit tests.""" diff --git a/src/py-opentimelineio/opentimelineio/url_utils.py b/src/py-opentimelineio/opentimelineio/url_utils.py index bc0fada756..f8e18c81b0 100644 --- a/src/py-opentimelineio/opentimelineio/url_utils.py +++ b/src/py-opentimelineio/opentimelineio/url_utils.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Utilities for conversion between urls and file paths""" diff --git a/tests/__init__.py b/tests/__init__.py index e69de29bb2..686a8cb5fd 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project diff --git a/tests/baseline_reader.py b/tests/baseline_reader.py index 63cc086120..fc701c43bf 100755 --- a/tests/baseline_reader.py +++ b/tests/baseline_reader.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Utilities for reading baseline json.""" diff --git a/tests/baselines/example.py b/tests/baselines/example.py index 208ca0de5f..b31abf9838 100644 --- a/tests/baselines/example.py +++ b/tests/baselines/example.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """This file is here to support the test_adapter_plugin unittest. If you want to learn how to write your own adapter plugin, please read: diff --git a/tests/baselines/example_schemadef.py b/tests/baselines/example_schemadef.py index e96624f36c..ae9b959078 100644 --- a/tests/baselines/example_schemadef.py +++ b/tests/baselines/example_schemadef.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """This file is here to support the test_schemadef_plugin unittest. If you want to learn how to write your own SchemaDef plugin, please read: diff --git a/tests/baselines/plugin_module/otio_mockplugin/__init__.py b/tests/baselines/plugin_module/otio_mockplugin/__init__.py index 52628e43a7..fe7f0209f9 100644 --- a/tests/baselines/plugin_module/otio_mockplugin/__init__.py +++ b/tests/baselines/plugin_module/otio_mockplugin/__init__.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + import pkg_resources from opentimelineio.plugins import manifest diff --git a/tests/baselines/post_write_example.py b/tests/baselines/post_write_example.py index f82eb9355f..4c5e91bd25 100644 --- a/tests/baselines/post_write_example.py +++ b/tests/baselines/post_write_example.py @@ -1,26 +1,6 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# + import os """This file is here to support the test_adapter_plugin unittest. diff --git a/tests/test_adapter_plugin.py b/tests/test_adapter_plugin.py index b7e92c6857..6e92b95831 100755 --- a/tests/test_adapter_plugin.py +++ b/tests/test_adapter_plugin.py @@ -1,26 +1,6 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# + import unittest import os diff --git a/tests/test_box2d.py b/tests/test_box2d.py index 76665b6bff..93b7cad39f 100644 --- a/tests/test_box2d.py +++ b/tests/test_box2d.py @@ -1,26 +1,6 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# + import unittest import opentimelineio as otio diff --git a/tests/test_builtin_adapters.py b/tests/test_builtin_adapters.py index 8eb5a77902..4fa707a279 100755 --- a/tests/test_builtin_adapters.py +++ b/tests/test_builtin_adapters.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test builtin adapters.""" diff --git a/tests/test_cdl.py b/tests/test_cdl.py index 32f08be8f0..034dfca392 100755 --- a/tests/test_cdl.py +++ b/tests/test_cdl.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# # python import os diff --git a/tests/test_clip.cpp b/tests/test_clip.cpp index 6253e8c420..68d82432a6 100644 --- a/tests/test_clip.cpp +++ b/tests/test_clip.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "utils.h" #include diff --git a/tests/test_clip.py b/tests/test_clip.py index dea5aad650..92d08f3457 100644 --- a/tests/test_clip.py +++ b/tests/test_clip.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import unittest diff --git a/tests/test_cmx_3600_adapter.py b/tests/test_cmx_3600_adapter.py index 83c783c941..36cda76c21 100755 --- a/tests/test_cmx_3600_adapter.py +++ b/tests/test_cmx_3600_adapter.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test the CMX 3600 EDL adapter.""" diff --git a/tests/test_composable.py b/tests/test_composable.py index 1786bf966b..e923ebdc68 100644 --- a/tests/test_composable.py +++ b/tests/test_composable.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test harness for Composable.""" diff --git a/tests/test_composition.py b/tests/test_composition.py index 6a9e69e6e8..4c11c4f9f1 100755 --- a/tests/test_composition.py +++ b/tests/test_composition.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import unittest import os diff --git a/tests/test_console.py b/tests/test_console.py index 3fd8601589..33c2626c05 100755 --- a/tests/test_console.py +++ b/tests/test_console.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Unit tests for the 'console' module.""" diff --git a/tests/test_cxx_sdk_bindings.py b/tests/test_cxx_sdk_bindings.py index 7cdf625b83..544651a03b 100644 --- a/tests/test_cxx_sdk_bindings.py +++ b/tests/test_cxx_sdk_bindings.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import unittest diff --git a/tests/test_documentation.py b/tests/test_documentation.py index f3ba41f949..2767035fa1 100644 --- a/tests/test_documentation.py +++ b/tests/test_documentation.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test cases to verify examples used in the OTIO documentation.""" diff --git a/tests/test_effect.py b/tests/test_effect.py index ce5be5fc5f..5bf61ade2a 100644 --- a/tests/test_effect.py +++ b/tests/test_effect.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import unittest diff --git a/tests/test_examples.py b/tests/test_examples.py index 7cbf47bc39..d7e3af9a0d 100644 --- a/tests/test_examples.py +++ b/tests/test_examples.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Unit tests for the 'examples'""" import unittest diff --git a/tests/test_fcp7_xml_adapter.py b/tests/test_fcp7_xml_adapter.py index 464a89d0f5..6ee80e5f68 100644 --- a/tests/test_fcp7_xml_adapter.py +++ b/tests/test_fcp7_xml_adapter.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test final cut pro xml.""" diff --git a/tests/test_filter_algorithms.py b/tests/test_filter_algorithms.py index ec1832b474..4907bce32d 100644 --- a/tests/test_filter_algorithms.py +++ b/tests/test_filter_algorithms.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test harness for the filter algorithms.""" diff --git a/tests/test_generator_reference.py b/tests/test_generator_reference.py index 77a3cb7be7..aa98db7cdc 100644 --- a/tests/test_generator_reference.py +++ b/tests/test_generator_reference.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + """ Generator Reference class test harness. """ import unittest diff --git a/tests/test_hooks_plugins.py b/tests/test_hooks_plugins.py index c14ac01515..b1ad971061 100644 --- a/tests/test_hooks_plugins.py +++ b/tests/test_hooks_plugins.py @@ -1,26 +1,6 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# + import unittest import os from copy import deepcopy diff --git a/tests/test_image_sequence_reference.py b/tests/test_image_sequence_reference.py index 73e6161797..bfbf75abe0 100644 --- a/tests/test_image_sequence_reference.py +++ b/tests/test_image_sequence_reference.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright Contributors to the OpenTimelineIO project + """Test harness for Image Sequence References.""" import unittest import sys diff --git a/tests/test_item.py b/tests/test_item.py index 57d1afeff9..fbbf1b704a 100755 --- a/tests/test_item.py +++ b/tests/test_item.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test harness for Item.""" diff --git a/tests/test_json_backend.py b/tests/test_json_backend.py index 81a5b27d64..f649f4b1c1 100755 --- a/tests/test_json_backend.py +++ b/tests/test_json_backend.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Unit tests for the JSON format OTIO Serializes to.""" diff --git a/tests/test_marker.py b/tests/test_marker.py index 3c251ff958..f05936b20c 100755 --- a/tests/test_marker.py +++ b/tests/test_marker.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import unittest diff --git a/tests/test_media_linker.py b/tests/test_media_linker.py index 475fe0991e..ece8a66531 100644 --- a/tests/test_media_linker.py +++ b/tests/test_media_linker.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import os import unittest diff --git a/tests/test_media_reference.py b/tests/test_media_reference.py index e72f82169d..a810e4832d 100755 --- a/tests/test_media_reference.py +++ b/tests/test_media_reference.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test harness for Media References.""" diff --git a/tests/test_multithreading.py b/tests/test_multithreading.py index 7d4c9b191a..ec88c0e1fb 100644 --- a/tests/test_multithreading.py +++ b/tests/test_multithreading.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import unittest import threading diff --git a/tests/test_opentime.cpp b/tests/test_opentime.cpp index 2111407483..56201b66ab 100644 --- a/tests/test_opentime.cpp +++ b/tests/test_opentime.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "utils.h" #include diff --git a/tests/test_opentime.py b/tests/test_opentime.py index 6921ebd6f4..309dbe2549 100755 --- a/tests/test_opentime.py +++ b/tests/test_opentime.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test Harness for the otio.opentime library.""" diff --git a/tests/test_otiod.py b/tests/test_otiod.py index debde07683..46ae23dcc9 100644 --- a/tests/test_otiod.py +++ b/tests/test_otiod.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Tests for the OTIOD adapter.""" diff --git a/tests/test_otioz.py b/tests/test_otioz.py index 3efd7ba19d..75cd96b6f5 100644 --- a/tests/test_otioz.py +++ b/tests/test_otioz.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Tests for the OTIOZ adapter.""" diff --git a/tests/test_plugin_detection.py b/tests/test_plugin_detection.py index 217029e47e..bb0a8aa922 100644 --- a/tests/test_plugin_detection.py +++ b/tests/test_plugin_detection.py @@ -1,27 +1,8 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# + import unittest import os import pkg_resources diff --git a/tests/test_schemadef_plugin.py b/tests/test_schemadef_plugin.py index 71b5346cf1..3ed7194e33 100755 --- a/tests/test_schemadef_plugin.py +++ b/tests/test_schemadef_plugin.py @@ -1,26 +1,6 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# + import unittest import os diff --git a/tests/test_serializable_collection.py b/tests/test_serializable_collection.py index 410b9affb4..bb22aa1de3 100644 --- a/tests/test_serializable_collection.py +++ b/tests/test_serializable_collection.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import unittest diff --git a/tests/test_serializable_object.py b/tests/test_serializable_object.py index 6897ea5fcc..d9079bcd2c 100755 --- a/tests/test_serializable_object.py +++ b/tests/test_serializable_object.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import opentimelineio as otio import opentimelineio.test_utils as otio_test_utils diff --git a/tests/test_serialized_schema.py b/tests/test_serialized_schema.py index 11701f6603..3dc76a917a 100644 --- a/tests/test_serialized_schema.py +++ b/tests/test_serialized_schema.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import unittest import os diff --git a/tests/test_stack_algo.py b/tests/test_stack_algo.py index 92227e8f33..a47da18b0d 100644 --- a/tests/test_stack_algo.py +++ b/tests/test_stack_algo.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test file for the stack algorithms library.""" diff --git a/tests/test_svg_adapter.py b/tests/test_svg_adapter.py index dc24fed696..3defe691d0 100755 --- a/tests/test_svg_adapter.py +++ b/tests/test_svg_adapter.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Unit tests for the OTIO to SVG adapter""" diff --git a/tests/test_timeline.py b/tests/test_timeline.py index 7239f463a8..39aaf547fa 100755 --- a/tests/test_timeline.py +++ b/tests/test_timeline.py @@ -1,29 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- - -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import math import os diff --git a/tests/test_timeline_algo.py b/tests/test_timeline_algo.py index a21f4db7d1..8153b5c2ea 100644 --- a/tests/test_timeline_algo.py +++ b/tests/test_timeline_algo.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test file for the track algorithms library.""" diff --git a/tests/test_track_algo.py b/tests/test_track_algo.py index aa9f32c85d..f3313c124e 100644 --- a/tests/test_track_algo.py +++ b/tests/test_track_algo.py @@ -1,27 +1,7 @@ #!/usr/bin/env python # +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Test file for the track algorithms library.""" diff --git a/tests/test_transition.py b/tests/test_transition.py index 36bc5ee0b6..1ce3f52158 100644 --- a/tests/test_transition.py +++ b/tests/test_transition.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Transition class test harness.""" diff --git a/tests/test_unknown_schema.py b/tests/test_unknown_schema.py index fa0fdaab4b..54e2b89b61 100644 --- a/tests/test_unknown_schema.py +++ b/tests/test_unknown_schema.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import unittest diff --git a/tests/test_url_conversions.py b/tests/test_url_conversions.py index 2d6277488d..b840b71ba9 100644 --- a/tests/test_url_conversions.py +++ b/tests/test_url_conversions.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """ Unit tests of functions that convert between file paths and urls. """ diff --git a/tests/test_v2d.py b/tests/test_v2d.py index 102870bfdd..69f9c3f67a 100644 --- a/tests/test_v2d.py +++ b/tests/test_v2d.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# import unittest import sys diff --git a/tests/utils.cpp b/tests/utils.cpp index d0b0df5a73..e49998daa1 100644 --- a/tests/utils.cpp +++ b/tests/utils.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #include "utils.h" #include diff --git a/tests/utils.h b/tests/utils.h index 42ab226c53..0a519f08a1 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright Contributors to the OpenTimelineIO project + #pragma once #undef NDEBUG diff --git a/tests/utils.py b/tests/utils.py index 82f74d5823..136a5e0f33 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,26 +1,5 @@ -# +# SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the OpenTimelineIO project -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# """Reusable utilities for tests.""" from __future__ import absolute_import