Skip to content
Permalink
Browse files

Updating Copyright notices (#632)

* Updated README with license/trademark clarification
* Changed Pixar copyright notices to "Contributors to the OpenTimelineIO project"
  • Loading branch information
jminor committed Jan 23, 2020
1 parent 6d9a10f commit afc69b96c7908b29c2334994e6c4404073d95fc7
Showing with 108 additions and 106 deletions.
  1. +2 −5 NOTICE.txt
  2. +6 −0 README.md
  3. +1 −1 contrib/opentimelineio_contrib/__init__.py
  4. +1 −1 contrib/opentimelineio_contrib/adapters/aaf_adapter/aaf_writer.py
  5. +1 −2 contrib/opentimelineio_contrib/adapters/advanced_authoring_format.py
  6. +1 −1 contrib/opentimelineio_contrib/adapters/ale.py
  7. +1 −1 contrib/opentimelineio_contrib/adapters/burnins.py
  8. +1 −1 contrib/opentimelineio_contrib/adapters/extern_maya_sequencer.py
  9. +1 −1 contrib/opentimelineio_contrib/adapters/extern_rv.py
  10. +1 −1 contrib/opentimelineio_contrib/adapters/fcpx_xml.py
  11. +1 −1 contrib/opentimelineio_contrib/adapters/hls_playlist.py
  12. +1 −1 contrib/opentimelineio_contrib/adapters/maya_sequencer.py
  13. +1 −1 contrib/opentimelineio_contrib/adapters/rv.py
  14. +1 −1 contrib/opentimelineio_contrib/adapters/tests/test_aaf_adapter.py
  15. +1 −1 contrib/opentimelineio_contrib/adapters/tests/test_ale_adapter.py
  16. +1 −1 contrib/opentimelineio_contrib/adapters/tests/test_burnins.py
  17. +1 −1 contrib/opentimelineio_contrib/adapters/tests/test_hls_playlist_adapter.py
  18. +1 −1 contrib/opentimelineio_contrib/adapters/tests/test_maya_sequencer.py
  19. +1 −1 contrib/opentimelineio_contrib/adapters/tests/test_rvsession.py
  20. +2 −2 contrib/opentimelineio_contrib/application_plugins/rv/example_otio_reader/PACKAGE
  21. +1 −1 ...b/opentimelineio_contrib/application_plugins/rv/example_otio_reader/example_otio_reader_plugin.py
  22. +1 −1 contrib/opentimelineio_contrib/application_plugins/rv/example_otio_reader/otio_reader.py
  23. +2 −2 docs/conf.py
  24. +1 −1 docs/tutorials/contributing.md
  25. +1 −1 examples/conform.py
  26. +1 −1 examples/flatten_video_tracks.py
  27. +1 −1 examples/sample_plugin/setup.py
  28. +1 −1 examples/shot_detect.py
  29. +1 −1 examples/summarize_timing.py
  30. +1 −1 setup.py
  31. +1 −1 src/opentimelineview/__init__.py
  32. +1 −1 src/opentimelineview/console.py
  33. +1 −1 src/opentimelineview/details_widget.py
  34. +1 −1 src/opentimelineview/ruler_widget.py
  35. +1 −1 src/opentimelineview/timeline_widget.py
  36. +1 −1 src/opentimelineview/track_widgets.py
  37. +2 −2 src/py-opentimelineio/opentimelineio/__init__.py
  38. +1 −1 src/py-opentimelineio/opentimelineio/adapters/__init__.py
  39. +1 −1 src/py-opentimelineio/opentimelineio/adapters/adapter.py
  40. +1 −1 src/py-opentimelineio/opentimelineio/adapters/cmx_3600.py
  41. +1 −1 src/py-opentimelineio/opentimelineio/adapters/fcp_xml.py
  42. +1 −1 src/py-opentimelineio/opentimelineio/adapters/otio_json.py
  43. +1 −1 src/py-opentimelineio/opentimelineio/algorithms/__init__.py
  44. +1 −1 src/py-opentimelineio/opentimelineio/algorithms/filter.py
  45. +1 −1 src/py-opentimelineio/opentimelineio/algorithms/stack_algo.py
  46. +1 −1 src/py-opentimelineio/opentimelineio/algorithms/timeline_algo.py
  47. +1 −1 src/py-opentimelineio/opentimelineio/algorithms/track_algo.py
  48. +2 −2 src/py-opentimelineio/opentimelineio/console/__init__.py
  49. +1 −1 src/py-opentimelineio/opentimelineio/console/autogen_plugin_documentation.py
  50. +1 −1 src/py-opentimelineio/opentimelineio/console/autogen_serialized_datamodel.py
  51. +1 −1 src/py-opentimelineio/opentimelineio/console/console_utils.py
  52. +1 −1 src/py-opentimelineio/opentimelineio/console/otiocat.py
  53. +1 −1 src/py-opentimelineio/opentimelineio/console/otioconvert.py
  54. +1 −1 src/py-opentimelineio/opentimelineio/console/otiopluginfo.py
  55. +1 −1 src/py-opentimelineio/opentimelineio/console/otiostat.py
  56. +1 −1 src/py-opentimelineio/opentimelineio/exceptions.py
  57. +1 −1 src/py-opentimelineio/opentimelineio/hooks.py
  58. +1 −1 src/py-opentimelineio/opentimelineio/media_linker.py
  59. +1 −1 src/py-opentimelineio/opentimelineio/plugins/__init__.py
  60. +1 −1 src/py-opentimelineio/opentimelineio/plugins/manifest.py
  61. +1 −1 src/py-opentimelineio/opentimelineio/plugins/python_plugin.py
  62. +1 −1 src/py-opentimelineio/opentimelineio/schema/__init__.py
  63. +1 −1 src/py-opentimelineio/opentimelineio/test_utils.py
  64. +1 −1 tests/baseline_reader.py
  65. +1 −1 tests/baselines/example.py
  66. +1 −1 tests/baselines/example_schemadef.py
  67. +1 −1 tests/test_adapter_plugin.py
  68. +1 −1 tests/test_builtin_adapters.py
  69. +1 −1 tests/test_cdl.py
  70. +1 −1 tests/test_clip.py
  71. +1 −1 tests/test_cmx_3600_adapter.py
  72. +1 −1 tests/test_composable.py
  73. +1 −1 tests/test_composition.py
  74. +1 −1 tests/test_console.py
  75. +1 −1 tests/test_documentation.py
  76. +1 −1 tests/test_effect.py
  77. +1 −1 tests/test_fcp7_xml_adapter.py
  78. +1 −1 tests/test_filter_algorithms.py
  79. +1 −1 tests/test_hooks_plugins.py
  80. +1 −1 tests/test_item.py
  81. +1 −1 tests/test_json_backend.py
  82. +1 −1 tests/test_marker.py
  83. +1 −1 tests/test_media_linker.py
  84. +1 −1 tests/test_media_reference.py
  85. +1 −1 tests/test_multithreading.py
  86. +1 −1 tests/test_opentime.py
  87. +1 −1 tests/test_plugin_detection.py
  88. +1 −1 tests/test_schemadef_plugin.py
  89. +1 −1 tests/test_serializable_collection.py
  90. +1 −1 tests/test_serializable_object.py
  91. +1 −1 tests/test_serialized_schema.py
  92. +1 −1 tests/test_stack_algo.py
  93. +1 −1 tests/test_timeline.py
  94. +1 −1 tests/test_timeline_algo.py
  95. +1 −1 tests/test_track_algo.py
  96. +1 −1 tests/test_transition.py
  97. +1 −1 tests/test_unknown_schema.py
  98. +1 −1 tests/utils.py
@@ -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/).
@@ -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
-------

@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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',
)
@@ -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
@@ -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
@@ -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',
}
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

0 comments on commit afc69b9

Please sign in to comment.
You can’t perform that action at this time.