AcademySoftwareFoundation · jminor · Jan 23, 2020 · Dec 18, 2019 · Dec 18, 2019 · Dec 18, 2019
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,10 +1,7 @@
 OpenTimelineIO   
-Copyright 2017 Pixar
-
+Copyright Contributors to the OpenTimelineIO project.
 All rights reserved.
 
-
-
 This product includes software developed at:
 
-Pixar (http://www.pixar.com/).
+Pixar (http://www.pixar.com/).
diff --git a/README.md b/README.md
@@ -117,6 +117,12 @@ with the pep8 style.  We ask that before you submit a pull request, you:
 
 PEP8: https://www.python.org/dev/peps/pep-0008/
 
+License
+-------
+OpenTimelineIO is open source software. Please see ![LICENSE.txt](LICENSE.txt) for details.
+
+Nothing in the license file or this project grants any right to use Pixar or any other contributor’s trade names, trademarks, service marks, or product names.
+
 Contact
 -------
 

diff --git a/contrib/opentimelineio_contrib/__init__.py b/contrib/opentimelineio_contrib/__init__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2018 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/aaf_adapter/aaf_writer.py b/contrib/opentimelineio_contrib/adapters/aaf_adapter/aaf_writer.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2019 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/advanced_authoring_format.py b/contrib/opentimelineio_contrib/adapters/advanced_authoring_format.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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
@@ -124,7 +124,6 @@ def _find_timecode_mobs(item):
         else:
             # This could be 'EssenceGroup', 'Pulldown' or other segment
             # subclasses
-            # See also: https://jira.pixar.com/browse/SE-3457
             # For example:
             # An EssenceGroup is a Segment that has one or more
             # alternate choices, each of which represent different variations

diff --git a/contrib/opentimelineio_contrib/adapters/ale.py b/contrib/opentimelineio_contrib/adapters/ale.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/burnins.py b/contrib/opentimelineio_contrib/adapters/burnins.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/extern_maya_sequencer.py b/contrib/opentimelineio_contrib/adapters/extern_maya_sequencer.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/extern_rv.py b/contrib/opentimelineio_contrib/adapters/extern_rv.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/fcpx_xml.py b/contrib/opentimelineio_contrib/adapters/fcpx_xml.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2018 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/hls_playlist.py b/contrib/opentimelineio_contrib/adapters/hls_playlist.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/maya_sequencer.py b/contrib/opentimelineio_contrib/adapters/maya_sequencer.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/rv.py b/contrib/opentimelineio_contrib/adapters/rv.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_aaf_adapter.py b/contrib/opentimelineio_contrib/adapters/tests/test_aaf_adapter.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_ale_adapter.py b/contrib/opentimelineio_contrib/adapters/tests/test_ale_adapter.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_burnins.py b/contrib/opentimelineio_contrib/adapters/tests/test_burnins.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_hls_playlist_adapter.py b/contrib/opentimelineio_contrib/adapters/tests/test_hls_playlist_adapter.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_maya_sequencer.py b/contrib/opentimelineio_contrib/adapters/tests/test_maya_sequencer.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/adapters/tests/test_rvsession.py b/contrib/opentimelineio_contrib/adapters/tests/test_rvsession.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/contrib/opentimelineio_contrib/application_plugins/rv/example_otio_reader/PACKAGE b/contrib/opentimelineio_contrib/application_plugins/rv/example_otio_reader/PACKAGE
@@ -1,6 +1,6 @@
 package: Example OTIO Reader
-author: Robyn Rindge
-organization: Pixar Animation Studios
+author: Contributors to the OpenTimelineIO project
+organization: OpenTimelineIO project
 contact: opentimelineio@pixar.com
 version: 1.0
 url: http://opentimeline.io

diff --git a/...melineio_contrib/application_plugins/rv/example_otio_reader/example_otio_reader_plugin.py b/...melineio_contrib/application_plugins/rv/example_otio_reader/example_otio_reader_plugin.py
@@ -2,7 +2,7 @@
 Example plugin showing how otio files can be loaded into an RV context
 """
 #
-# Copyright 2019 Pixar Animation Studios
+# 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

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
@@ -1,5 +1,5 @@
 #
-# Copyright 2019 Pixar Animation Studios
+# 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

diff --git a/docs/conf.py b/docs/conf.py
@@ -6,7 +6,7 @@
 PACKAGE_TITLE = 'OpenTimelineIO'
 PACKAGE_NAME = 'opentimelineio'
 PACKAGE_DIR = 'src/py-opentimelineio/opentimelineio'
-AUTHOR_NAME = 'Pixar Animation Studios'
+AUTHOR_NAME = 'Contributors to the OpenTimelineIO project'
 
 try:
     RELEASE = opentimelineio.__version__
@@ -53,7 +53,7 @@
 
 # General information about the project.
 project = PACKAGE_TITLE
-copyright = u"2018, Pixar Animation Studios"
+copyright = u"Copyright Contributors to the OpenTimelineIO project"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/docs/tutorials/contributing.md b/docs/tutorials/contributing.md
@@ -28,7 +28,7 @@ Clone your fork to your local machine, like this:
 git clone https://github.com/you/OpenTimelineIO.git
 ```
 
-Add Pixar's OpenTimelineIO repo as upstream to make it easier to update your remote and local repos with the latest changes:
+Add the primary OpenTimelineIO repo as upstream to make it easier to update your remote and local repos with the latest changes:
 
 ```
 cd OpenTimelineIO

diff --git a/examples/conform.py b/examples/conform.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/examples/flatten_video_tracks.py b/examples/flatten_video_tracks.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2018 Pixar Animation Studios
+# 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

diff --git a/examples/sample_plugin/setup.py b/examples/sample_plugin/setup.py
@@ -35,7 +35,7 @@
     version='1.0.0',
     description='Adapter writes number of tracks to file.',
     license='Modified Apache 2.0 License',
-    author='Pixar Animation Studios',
+    author='Contributors to the OpenTimelineIO project',
     author_email='opentimelineio@pixar.com',
     url='http://opentimeline.io',
 )
diff --git a/examples/shot_detect.py b/examples/shot_detect.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/examples/summarize_timing.py b/examples/summarize_timing.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/setup.py b/setup.py
@@ -281,7 +281,7 @@ def build(self):
 # Metadata that gets stamped into the __init__ files during the build phase.
 PROJECT_METADATA = {
     "version": "0.12.0.dev1",
-    "author": 'Pixar Animation Studios',
+    "author": 'Contributors to the OpenTimelineIO project',
     "author_email": 'opentimelineio@pixar.com',
     "license": 'Modified Apache 2.0 License',
 }

diff --git a/src/opentimelineview/__init__.py b/src/opentimelineview/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/src/opentimelineview/console.py b/src/opentimelineview/console.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/src/opentimelineview/details_widget.py b/src/opentimelineview/details_widget.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/src/opentimelineview/ruler_widget.py b/src/opentimelineview/ruler_widget.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/src/opentimelineview/timeline_widget.py b/src/opentimelineview/timeline_widget.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/src/opentimelineview/track_widgets.py b/src/opentimelineview/track_widgets.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/src/py-opentimelineio/opentimelineio/__init__.py b/src/py-opentimelineio/opentimelineio/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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
@@ -26,7 +26,7 @@
 
 see: http://opentimeline.io
 
-.. moduleauthor:: Pixar Animation Studios <opentimelineio@pixar.com>
+.. moduleauthor:: Contributors to the OpenTimelineIO project <opentimelineio@pixar.com>
 """
 
 # flake8: noqa

diff --git a/src/py-opentimelineio/opentimelineio/adapters/__init__.py b/src/py-opentimelineio/opentimelineio/adapters/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/src/py-opentimelineio/opentimelineio/adapters/adapter.py b/src/py-opentimelineio/opentimelineio/adapters/adapter.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/src/py-opentimelineio/opentimelineio/adapters/cmx_3600.py b/src/py-opentimelineio/opentimelineio/adapters/cmx_3600.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/src/py-opentimelineio/opentimelineio/adapters/fcp_xml.py b/src/py-opentimelineio/opentimelineio/adapters/fcp_xml.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/src/py-opentimelineio/opentimelineio/adapters/otio_json.py b/src/py-opentimelineio/opentimelineio/adapters/otio_json.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/src/py-opentimelineio/opentimelineio/algorithms/__init__.py b/src/py-opentimelineio/opentimelineio/algorithms/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/src/py-opentimelineio/opentimelineio/algorithms/filter.py b/src/py-opentimelineio/opentimelineio/algorithms/filter.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2018 Pixar Animation Studios
+# 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

diff --git a/src/py-opentimelineio/opentimelineio/algorithms/stack_algo.py b/src/py-opentimelineio/opentimelineio/algorithms/stack_algo.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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

diff --git a/src/py-opentimelineio/opentimelineio/algorithms/timeline_algo.py b/src/py-opentimelineio/opentimelineio/algorithms/timeline_algo.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2019 Pixar Animation Studios
+# 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

diff --git a/src/py-opentimelineio/opentimelineio/algorithms/track_algo.py b/src/py-opentimelineio/opentimelineio/algorithms/track_algo.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Pixar Animation Studios
+# 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
-Original file line number
+Diff line change
@@ Expand Up @@
     PEP8: https://www.python.org/dev/peps/pep-0008/
+    License
+    -------
+    OpenTimelineIO is open source software. Please see ![LICENSE.txt](LICENSE.txt) for details.
+    Nothing in the license file or this project grants any right to use Pixar or any other contributor’s trade names, trademarks, service marks, or product names.
     Contact
     -------
@@ Expand Down @@