Skip to content

Commit f61de2a

Browse files
jminormarkreidvfx
authored andcommitted
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 821ec28 commit f61de2a

File tree

6 files changed

+8
-87
lines changed

6 files changed

+8
-87
lines changed

src/otio_aaf_adapter/__init__.py

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

266
"""Unsupported contrib code for OpenTimelineIO."""
277

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
# Copyright Contributors to the OpenTimelineIO project
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
# Copyright Contributors to the OpenTimelineIO project

src/otio_aaf_adapter/adapters/aaf_adapter/aaf_writer.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
"""AAF Adapter Transcriber
265

src/otio_aaf_adapter/adapters/advanced_authoring_format.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 Advanced Authoring Format (AAF) Adapter
265

tests/test_aaf_adapter.py

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

265
"""Test the AAF adapter."""
276

0 commit comments

Comments
 (0)