Add copyright notifications for all changed files

pluralsight · Jun 1, 2017 · 4bdcb77 · 4bdcb77
1 parent 1a11b8a
commit 4bdcb77
Show file tree

Hide file tree

Showing 31 changed files with 107 additions and 21 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -5,13 +5,12 @@ This product includes software developed at Pluralsight
 (http://pluralsight.com) and licensed using the Apache 2.0 license.
 
 Spavro is a derivative work of Apache AVRO, below is the original NOTICE.txt
-from Apache Avro (http://svn.apache.org/viewvc/avro/trunk)
+from Apache Avro (https://github.com/apache/avro/tree/ddfcabcee064d137fb0b9082e8c522ab900433c2)
 
-Apache Avro includes the following in its NOTICE.txt file:
-| Copyright 2010-2015 The Apache Software Foundation
+Copyright 2010-2015 The Apache Software Foundation
 
-| This product includes software developed at
-| The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
 
 NUnit license acknowledgement:
 

diff --git a/scripts/avro b/scripts/avro
@@ -19,7 +19,7 @@
 
 from spavro.io import DatumReader, DatumWriter
 from spavro.datafile import DataFileReader, DataFileWriter
-import avro.schema
+import spavro.schema
 
 try:
     import json
@@ -187,7 +187,7 @@ def write(opts, files):
         raise AvroError("Can't guess input file type (not .json or .csv)")
 
     try:
-        schema = avro.schema.parse(open(opts.schema, "rb").read())
+        schema = spavro.schema.parse(open(opts.schema, "rb").read())
         out = _open(opts.output, "wb")
     except (IOError, OSError), e:
         raise AvroError("Can't open file - %s" % e)

diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@
   package_dir={'': 'src'},
   scripts=["./scripts/avro"],
   include_package_data=True,
-  package_data={'spavro': ['LICENSE', 'NOTICE']},
+  package_data={'spavro': ['LICENSE.txt', 'NOTICE.txt']},
   # Project uses simplejson, so ensure that it gets installed or upgraded
   # on the target machine
   install_requires=install_requires,

diff --git a/src/spavro/binary.py b/src/spavro/binary.py
@@ -1,3 +1,21 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import sys
 import struct
 from binascii import crc32

diff --git a/src/spavro/datafile.py b/src/spavro/datafile.py
@@ -1,10 +1,12 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+
 # Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.    See the NOTICE file
+# or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
-# regarding copyright ownership.    The ASF licenses this file
+# regarding copyright ownership.  The ASF licenses this file
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
-# with the License.    You may obtain a copy of the License at
+# with the License.  You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #

diff --git a/src/spavro/exceptions.py b/src/spavro/exceptions.py
@@ -1,3 +1,21 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from spavro import schema
 import json
 

diff --git a/src/spavro/fast_binary.pyx b/src/spavro/fast_binary.pyx
@@ -1,3 +1,5 @@
+# Copyright (C) 2017 Pluralsight LLC
+
 '''Fast Cython extension for reading / writing and validating AVRO records.
 
 The main edge this code has is that it parses the schema only once and creates

diff --git a/src/spavro/io.py b/src/spavro/io.py
@@ -1,3 +1,5 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/src/spavro/ipc.py b/src/spavro/ipc.py
@@ -1,3 +1,5 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/src/spavro/protocol.py b/src/spavro/protocol.py
@@ -1,3 +1,5 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/src/spavro/schema.py b/src/spavro/schema.py
@@ -1,3 +1,5 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/src/spavro/schema_resolve.py b/src/spavro/schema_resolve.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2017 Pluralsight LLC
+
 # resolve schemas
 from fast_binary import get_type
 from exceptions import SchemaResolutionException

diff --git a/src/spavro/tool.py b/src/spavro/tool.py
@@ -1,4 +1,7 @@
 #! /usr/bin/env python
+
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/src/spavro/txipc.py b/src/spavro/txipc.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/test/av_bench.py b/test/av_bench.py
@@ -21,9 +21,9 @@
 from random import sample, choice, randint
 from string import lowercase
 
-import avro.datafile
-import avro.schema
-import avro.io
+import spavro.datafile
+import spavro.schema
+import spavro.io
 
 
 types = ["A", "CNAME"]
@@ -45,9 +45,9 @@ def write(n):
     ]}"""
     out = open("datafile.avr",'w')
 
-    schema = avro.schema.parse(schema_s)
-    writer = avro.io.DatumWriter(schema)
-    dw = avro.datafile.DataFileWriter(out, writer, schema) #,codec='deflate')
+    schema = spavro.schema.parse(schema_s)
+    writer = spavro.io.DatumWriter(schema)
+    dw = spavro.datafile.DataFileWriter(out, writer, schema) #,codec='deflate')
     for _ in xrange(n):
         response = rand_ip()
         query = rand_name()
@@ -58,8 +58,8 @@ def write(n):
 
 def read():
     f = open("datafile.avr")
-    reader = avro.io.DatumReader()
-    af=avro.datafile.DataFileReader(f,reader)
+    reader = spavro.io.DatumReader()
+    af = spavro.datafile.DataFileReader(f,reader)
 
     x=0
     for _ in af:

diff --git a/test/gen_interop_data.py b/test/gen_interop_data.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/test/sample_http_client.py b/test/sample_http_client.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/test/sample_http_server.py b/test/sample_http_server.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/test/set_avro_test_path.py b/test/set_avro_test_path.py
@@ -1,3 +1,5 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/test/test_datafile.py b/test/test_datafile.py
@@ -1,3 +1,5 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/test/test_datafile_interop.py b/test/test_datafile_interop.py
@@ -1,3 +1,5 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/test/test_io.py b/test/test_io.py
@@ -1,3 +1,5 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/test/test_ipc.py b/test/test_ipc.py
@@ -1,3 +1,5 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/test/test_old_vs_new.py b/test/test_old_vs_new.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2017 Pluralsight LLC
+
 import unittest
 try:
   from cStringIO import StringIO

diff --git a/test/test_protocol.py b/test/test_protocol.py
@@ -1,3 +1,5 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/test/test_schema.py b/test/test_schema.py
@@ -1,3 +1,5 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/test/test_script.py b/test/test_script.py
@@ -1,3 +1,5 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -21,7 +23,7 @@
 except ImportError:
     import simplejson as json
 from tempfile import NamedTemporaryFile
-import avro.schema
+import spavro.schema
 from spavro.io import DatumWriter
 from spavro.datafile import DataFileWriter
 from os.path import dirname, join, isfile
@@ -84,7 +86,7 @@ def looney_records():
 }'''
 
 def gen_avro(filename):
-    schema = avro.schema.parse(SCHEMA)
+    schema = spavro.schema.parse(SCHEMA)
     fo = open(filename, "wb")
     writer = DataFileWriter(fo, DatumWriter(), schema)
     for record in looney_records():

diff --git a/test/test_write_read_schema_resolver.py b/test/test_write_read_schema_resolver.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2017 Pluralsight LLC
+
 import unittest
 from spavro.schema_resolve import resolve
 from spavro.exceptions import SchemaResolutionException

diff --git a/test/txsample_http_client.py b/test/txsample_http_client.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/test/txsample_http_server.py b/test/txsample_http_server.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+# Modifications copyright (C) 2017 Pluralsight LLC
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/test/word_count_task.py b/test/word_count_task.py
@@ -1,3 +1,5 @@
+# Modifications copyright (C) 2017 Pluralsight LLC
+
 """
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file