From 4966028a8dde125c8bbd57043e31b075b11f6bfe Mon Sep 17 00:00:00 2001 From: Joshua Minor Date: Tue, 3 May 2022 09:14:12 -0700 Subject: [PATCH] OpenTimelineIO License & CLA Change (#1285) * Updated both Corporate and Individual CLA * Switched to standard Apache License, Version 2.0 * Added verify_license.py script to help ensure all source files have the right license header. * Added SPDX license headers * Update contributing.md and CONTRIBUTING.md to explain EasyCLA * Removed mention of ffmpeg_burnins license, which was previously relicensed here: https://github.com/PixarAnimationStudios/OpenTimelineIO/pull/679 --- .../opentimelineio_contrib/adapters/ale.py | 24 +------------------ .../adapters/tests/test_ale_adapter.py | 23 +----------------- 2 files changed, 2 insertions(+), 45 deletions(-) diff --git a/contrib/opentimelineio_contrib/adapters/ale.py b/contrib/opentimelineio_contrib/adapters/ale.py index 338075d..228beb5 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/tests/test_ale_adapter.py b/contrib/opentimelineio_contrib/adapters/tests/test_ale_adapter.py index 8c0a96e..c8549b6 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."""