Skip to content

Commit

Permalink
Normalize licenses. Closes khmer#864.
Browse files Browse the repository at this point in the history
  • Loading branch information
standage committed Dec 20, 2016
1 parent fca5274 commit efcdc7c
Show file tree
Hide file tree
Showing 27 changed files with 63 additions and 26 deletions.
1 change: 1 addition & 0 deletions benchmarks/faGen.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env python
# Copyright (c) 2016, The Regents of the University of California.

import sys, os
import random
Expand Down
1 change: 1 addition & 0 deletions benchmarks/fqGen.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env python
# Copyright (c) 2016, The Regents of the University of California.

import sys, os
import random
Expand Down
1 change: 1 addition & 0 deletions benchmarks/fqToFaConvert.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env python
# Copyright (c) 2016, The Regents of the University of California.
import sys
import os

Expand Down
1 change: 1 addition & 0 deletions benchmarks/screedCreateTimeit.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env python
# Copyright (c) 2016, The Regents of the University of California.

import sys
import timeit
Expand Down
1 change: 1 addition & 0 deletions benchmarks/screedTimeit.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env python
# Copyright (c) 2016, The Regents of the University of California.

import timeit
import sys
Expand Down
1 change: 1 addition & 0 deletions benchmarks/screedTimeit1M.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env python
# Copyright (c) 2016, The Regents of the University of California.

import timeit
import sys
Expand Down
2 changes: 2 additions & 0 deletions bigtests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) 2016, The Regents of the University of California.

import gc
import os
import sys
Expand Down
28 changes: 22 additions & 6 deletions doc/LICENSE.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,29 @@
License
=======

Copyright (c) 2008-2015, Michigan State University
Copyright (c) 2008, Michigan State University.
Copyright (c) 2015, The Regents of the University of California.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
* Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of the author nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10 changes: 5 additions & 5 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
screed - short read sequence utils
==================================

:Copyright: 2008-2012 Michigan State University
:Copyright: 2008, Michigan State University.
:Copyright: 2015, The Regents of the University of California.
:Authors: Alex Nolley, C. Titus Brown
:Contact: ctb@msu.edu
:License: BSD
Expand All @@ -18,18 +19,17 @@ Contents:

screed
example

dev/index
release-notes/index
user/known-issues

CODE_OF_CONDUCT
LICENSE

Indices and tables
==================

* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`

1 change: 1 addition & 0 deletions get_version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env python
# Copyright (c) 2016, The Regents of the University of California.
""" Extracts the version of screed """

import sys
Expand Down
2 changes: 1 addition & 1 deletion screed/DBConstants.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2008-2010, Michigan State University
# Copyright (c) 2008, Michigan State University.

"""
Defines some constant strings identifications used in multiple
Expand Down
2 changes: 1 addition & 1 deletion screed/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2008-2010, Michigan State University
# Copyright (c) 2008, Michigan State University.

"""
screed is a database tool useful for retrieving arbitrary kinds of sequence
Expand Down
2 changes: 1 addition & 1 deletion screed/__main__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python

# Copyright (C) 2016, The Regents of the University of California.
# Copyright (c) 2016, The Regents of the University of California.

from __future__ import absolute_import, print_function

Expand Down
4 changes: 2 additions & 2 deletions screed/conversion.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import absolute_import
# Copyright (c) 2008-2010, Michigan State University
# Copyright (c) 2008-2010, Michigan State University.

from __future__ import absolute_import
from .openscreed import ScreedDB

_MAXLINELEN = 80
Expand Down
2 changes: 2 additions & 0 deletions screed/createscreed.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) 2016, The Regents of the University of California.

from __future__ import absolute_import

import argparse
Expand Down
2 changes: 2 additions & 0 deletions screed/dna.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) 2016, The Regents of the University of California.

import array
import string

Expand Down
4 changes: 2 additions & 2 deletions screed/dump_fasta.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python

# Copyright (C) 2008-2010, Michigan State University
# Copyright (C) 2016, The Regents of the University of California.
# Copyright (c) 2008, Michigan State University.
# Copyright (c) 2016, The Regents of the University of California.

from __future__ import print_function

Expand Down
4 changes: 2 additions & 2 deletions screed/dump_fastq.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python

# Copyright (c) 2008-2010, Michigan State University
# Copyright (C) 2016, The Regents of the University of California.
# Copyright (c) 2008, Michigan State University.
# Copyright (c) 2016, The Regents of the University of California.

from __future__ import print_function
from screed import ToFastq
Expand Down
3 changes: 2 additions & 1 deletion screed/fasta.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import absolute_import
# Copyright (c) 2016, The Regents of the University of California.

from __future__ import absolute_import
from . import DBConstants
from .screedRecord import Record
from .utils import to_str
Expand Down
3 changes: 2 additions & 1 deletion screed/fastq.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import absolute_import
# Copyright (c) 2016, The Regents of the University of California.

from __future__ import absolute_import
from . import DBConstants
from .screedRecord import Record
from .utils import to_str
Expand Down
3 changes: 2 additions & 1 deletion screed/hava.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import absolute_import
# Copyright (c) 2016, The Regents of the University of California.

from __future__ import absolute_import
from . import DBConstants
from .utils import to_str

Expand Down
2 changes: 1 addition & 1 deletion screed/openscreed.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2008-2015, Michigan State University
# Copyright (c) 2008, Michigan State University.
"""Reader and writer for screed."""

from __future__ import absolute_import
Expand Down
2 changes: 1 addition & 1 deletion screed/pygr_api.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2008-2010, Michigan State University
# Copyright (c) 2008, Michigan State University.

"""
A simple wrapper implementing a pygr-compatible SequenceDB based on screed.
Expand Down
2 changes: 2 additions & 0 deletions screed/screedRecord.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) 2016, The Regents of the University of California.

from __future__ import absolute_import
from functools import total_ordering
import types
Expand Down
2 changes: 1 addition & 1 deletion screed/seqparse.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2008-2010, Michigan State University
# Copyright (c) 2008, Michigan State University.

"""
seqparse contains custom sequence parsers for extending screed's
Expand Down
2 changes: 2 additions & 0 deletions screed/utils.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) 2016, The Regents of the University of California.

def to_str(line):
try:
line = line.decode('utf-8')
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env python
# Copyright (c) 2016, The Regents of the University of California.
from __future__ import print_function
try:
from setuptools import setup
Expand Down

0 comments on commit efcdc7c

Please sign in to comment.