Skip to content

Commit 2075361

Browse files
authored
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: AcademySoftwareFoundation/OpenTimelineIO#679
1 parent e3a2c83 commit 2075361

File tree

2 files changed

+2
-44
lines changed

2 files changed

+2
-44
lines changed

src/py-opentimelineio/opentimelineio/adapters/fcp_xml.py

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,5 @@
1-
#
1+
# SPDX-License-Identifier: Apache-2.0
22
# Copyright Contributors to the OpenTimelineIO project
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "Apache License")
5-
# with the following modification; you may not use this file except in
6-
# compliance with the Apache License and the following modification to it:
7-
# Section 6. Trademarks. is deleted and replaced with:
8-
#
9-
# 6. Trademarks. This License does not grant permission to use the trade
10-
# names, trademarks, service marks, or product names of the Licensor
11-
# and its affiliates, except as required to comply with Section 4(c) of
12-
# the License and to reproduce the content of the NOTICE file.
13-
#
14-
# You may obtain a copy of the Apache License at
15-
#
16-
# http://www.apache.org/licenses/LICENSE-2.0
17-
#
18-
# Unless required by applicable law or agreed to in writing, software
19-
# distributed under the Apache License with the above modification is
20-
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
21-
# KIND, either express or implied. See the Apache License for the specific
22-
# language governing permissions and limitations under the Apache License.
23-
#
243

254
"""OpenTimelineIO Final Cut Pro 7 XML Adapter."""
265

tests/test_fcp7_xml_adapter.py

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,5 @@
1-
#
1+
# SPDX-License-Identifier: Apache-2.0
22
# Copyright Contributors to the OpenTimelineIO project
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "Apache License")
5-
# with the following modification; you may not use this file except in
6-
# compliance with the Apache License and the following modification to it:
7-
# Section 6. Trademarks. is deleted and replaced with:
8-
#
9-
# 6. Trademarks. This License does not grant permission to use the trade
10-
# names, trademarks, service marks, or product names of the Licensor
11-
# and its affiliates, except as required to comply with Section 4(c) of
12-
# the License and to reproduce the content of the NOTICE file.
13-
#
14-
# You may obtain a copy of the Apache License at
15-
#
16-
# http://www.apache.org/licenses/LICENSE-2.0
17-
#
18-
# Unless required by applicable law or agreed to in writing, software
19-
# distributed under the Apache License with the above modification is
20-
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
21-
# KIND, either express or implied. See the Apache License for the specific
22-
# language governing permissions and limitations under the Apache License.
23-
#
243

254
"""Test final cut pro xml."""
265

0 commit comments

Comments
 (0)