← Back to team overview

lazr-developers team mailing list archive

[Merge] lp:~gary/lazr.yourpkg/license into lp:lazr.yourpkg

 

Gary Poster has proposed merging lp:~gary/lazr.yourpkg/license into lp:lazr.yourpkg.

Requested reviews:
    LAZR Developers (lazr-developers)

This changes the licensing to *only* allow LGPL v 3, not later versions.

It also has some new docstrings and removal of trailing whitespace.
-- 
https://code.launchpad.net/~gary/lazr.yourpkg/license/+merge/4722
Your team LAZR Developers is subscribed to branch lp:lazr.yourpkg.
=== modified file 'HACKING.txt'
--- HACKING.txt	2009-01-10 01:00:49 +0000
+++ HACKING.txt	2009-03-20 17:47:23 +0000
@@ -3,8 +3,7 @@
 
     lazr.yourpkg is free software: you can redistribute it and/or modify it
     under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    the Free Software Foundation, version 3 of the License.
 
     lazr.yourpkg is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

=== modified file 'README.txt'
--- README.txt	2009-01-10 01:00:49 +0000
+++ README.txt	2009-03-20 17:47:23 +0000
@@ -7,8 +7,7 @@
 
     lazr.yourpkg is free software: you can redistribute it and/or modify it
     under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    the Free Software Foundation, version 3 of the License.
 
     lazr.yourpkg is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

=== modified file 'prepare.py'
--- prepare.py	2009-03-14 00:06:48 +0000
+++ prepare.py	2009-03-20 17:47:23 +0000
@@ -6,8 +6,7 @@
 #
 # lazr.yourpkg is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # lazr.yourpkg is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

=== modified file 'setup.py'
--- setup.py	2009-03-17 15:24:09 +0000
+++ setup.py	2009-03-20 17:47:23 +0000
@@ -6,8 +6,7 @@
 #
 # lazr.yourpkg is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # lazr.yourpkg is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

=== modified file 'src/lazr/__init__.py'
--- src/lazr/__init__.py	2009-01-09 04:21:20 +0000
+++ src/lazr/__init__.py	2009-03-20 17:47:23 +0000
@@ -4,8 +4,7 @@
 #
 # lazr.yourpkg is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # lazr.yourpkg is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

=== modified file 'src/lazr/yourpkg/README.txt'
--- src/lazr/yourpkg/README.txt	2009-03-17 16:39:47 +0000
+++ src/lazr/yourpkg/README.txt	2009-03-20 17:47:23 +0000
@@ -3,8 +3,7 @@
 
     lazr.yourpkg is free software: you can redistribute it and/or modify it
     under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
+    the Free Software Foundation, version 3 of the License.
 
     lazr.yourpkg is distributed in the hope that it will be useful, but
     WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -17,7 +16,7 @@
 LAZR yourpkg
 ************
 
-This is a pure template for new lazr namespace packages.  
+This is a pure template for new lazr namespace packages.
 
 Please see https://dev.launchpad.net/LazrStyleGuide and
 https://dev.launchpad.net/Hacking for how to develop in this
@@ -29,7 +28,7 @@
 .. toctree::
    :glob:
 
-   *   
+   *
    docs/*
 
 .. _Sphinx: http://sphinx.pocoo.org/

=== modified file 'src/lazr/yourpkg/__init__.py'
--- src/lazr/yourpkg/__init__.py	2009-01-10 01:00:49 +0000
+++ src/lazr/yourpkg/__init__.py	2009-03-20 17:47:23 +0000
@@ -4,8 +4,7 @@
 #
 # lazr.yourpkg is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # lazr.yourpkg is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,5 +13,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with lazr.yourpkg.  If not, see <http://www.gnu.org/licenses/>.
+"The lazr.yourpkg package."
+
 
 __version__ = '0.1'

=== modified file 'src/lazr/yourpkg/tests/__init__.py'
--- src/lazr/yourpkg/tests/__init__.py	2009-03-17 14:52:16 +0000
+++ src/lazr/yourpkg/tests/__init__.py	2009-03-20 17:47:23 +0000
@@ -4,8 +4,7 @@
 #
 # lazr.yourpkg is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # lazr.yourpkg is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -14,3 +13,4 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with lazr.yourpkg.  If not, see <http://www.gnu.org/licenses/>.
+"The lazr.yourpkg tests."

=== modified file 'src/lazr/yourpkg/tests/test_docs.py'
--- src/lazr/yourpkg/tests/test_docs.py	2009-03-17 14:52:16 +0000
+++ src/lazr/yourpkg/tests/test_docs.py	2009-03-20 17:47:23 +0000
@@ -1,6 +1,19 @@
 # Copyright 2009 Canonical Ltd.  All rights reserved.
-
-"""Test harness."""
+#
+# This file is part of lazr.yourpkg
+#
+# lazr.yourpkg is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# lazr.yourpkg is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with lazr.yourpkg.  If not, see <http://www.gnu.org/licenses/>.
+"Test harness for doctests."
 
 __metaclass__ = type
 __all__ = [
@@ -20,6 +33,7 @@
 
 
 def additional_tests():
+    "Run the doc tests (README.txt and docs/*, if any exist)"
     doctest_files = [
         os.path.abspath(
             pkg_resources.resource_filename('lazr.yourpkg', 'README.txt'))]


Follow ups