[Pkg-bitcoin-commits] [python-quamash] 100/269: Fixed, and unified license across all files.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository python-quamash.

commit 43e17a77f0de0c1076b14b0669739060c791508b
Author: Mark Harviston <mark.harviston at gmail.com>
Date:   Thu Jul 17 19:31:19 2014 -0700

    Fixed, and unified license across all files.
    
    The BSD 2-clause license is the newest version of the license, so PyPI and others just identify it as BSD
    If there's any doubt as to the license intended it's linked to in the README and reproduced in LICENSE
---
 README                    | 6 ++++++
 quamash/__init__.py       | 4 ++--
 quamash/_common.py        | 3 +++
 quamash/_unix.py          | 3 +++
 quamash/_windows.py       | 3 +++
 tests/test_qeventloop.py  | 3 +++
 tests/test_qthreadexec.py | 3 +++
 7 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 8d2e8ba..3c5f230 100644
--- a/README
+++ b/README
@@ -57,6 +57,11 @@ Testing
 Quamash is tested with `pytest`_; in order to run the test suite, just execute py.test on the
 commandline. The tests themselves are beneath the 'tests' directory.
 
+License
+=======
+You may use, modify, and redistribute this software under the terms of the `BSD License`_.
+See LICENSE.
+
 Name
 ====
 Tulip related projects are being named after other flowers, Quamash is one of the few flowers that
@@ -64,3 +69,4 @@ starts with a "Q".
 
 .. _`PEP 3156`: http://legacy.python.org/dev/peps/pep-3156/
 .. _`pytest`: http://pytest.org
+.. _`BSD License`: http://opensource.org/licenses/BSD-2-Clause
diff --git a/quamash/__init__.py b/quamash/__init__.py
index 98ab905..30c57a7 100644
--- a/quamash/__init__.py
+++ b/quamash/__init__.py
@@ -1,4 +1,4 @@
-# © 2013 Mark Harviston <mark.harviston at gmail.com>
+# © 2014 Mark Harviston <mark.harviston at gmail.com>
 # © 2014 Arve Knudsen <arve.knudsen at gmail.com>
 # BSD License
 """
@@ -6,7 +6,7 @@ Implementation of the PEP 3156 Event-Loop with Qt
 """
 __author__ = 'Mark Harviston <mark.harviston at gmail.com>, Arve Knudsen <arve.knudsen at gmail.com>'
 __version__ = '0.2'
-__license__ = 'BSD 2 Clause License'
+__license__ = 'BSD'
 
 import sys
 import os
diff --git a/quamash/_common.py b/quamash/_common.py
index 1a46f5a..5a91a1a 100644
--- a/quamash/_common.py
+++ b/quamash/_common.py
@@ -1,3 +1,6 @@
+# © 2014 Mark Harviston <mark.harviston at gmail.com>
+# © 2014 Arve Knudsen <arve.knudsen at gmail.com>
+# BSD License
 import logging
 try:
 	from PySide import QtCore
diff --git a/quamash/_unix.py b/quamash/_unix.py
index 3c8f86f..23825d2 100644
--- a/quamash/_unix.py
+++ b/quamash/_unix.py
@@ -1,3 +1,6 @@
+# © 2014 Mark Harviston <mark.harviston at gmail.com>
+# © 2014 Arve Knudsen <arve.knudsen at gmail.com>
+# BSD License
 import asyncio
 from asyncio import selectors
 import collections
diff --git a/quamash/_windows.py b/quamash/_windows.py
index 616147b..b327011 100644
--- a/quamash/_windows.py
+++ b/quamash/_windows.py
@@ -1,3 +1,6 @@
+# © 2014 Mark Harviston <mark.harviston at gmail.com>
+# © 2014 Arve Knudsen <arve.knudsen at gmail.com>
+# BSD License
 try:
 	import _winapi
 except ImportError:  # noqa
diff --git a/tests/test_qeventloop.py b/tests/test_qeventloop.py
index 0553405..cccbf87 100644
--- a/tests/test_qeventloop.py
+++ b/tests/test_qeventloop.py
@@ -1,3 +1,6 @@
+# © 2013 Mark Harviston <mark.harviston at gmail.com>
+# © 2014 Arve Knudsen <arve.knudsen at gmail.com>
+# BSD License
 import asyncio
 import locale
 import logging
diff --git a/tests/test_qthreadexec.py b/tests/test_qthreadexec.py
index 1fd3526..27f0710 100644
--- a/tests/test_qthreadexec.py
+++ b/tests/test_qthreadexec.py
@@ -1,3 +1,6 @@
+# © 2014 Mark Harviston <mark.harviston at gmail.com>
+# © 2014 Arve Knudsen <arve.knudsen at gmail.com>
+# BSD License
 import pytest
 import quamash
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/python-quamash.git