Merge lp:~gary/lazr.config/build-license-changes into lp:~launchpad-pqm/lazr.config/devel

[Gary Poster]

[Gary Poster (gary)]

The same changes as for the other lazr packages:

- license specifies v3 of LGPL

- buildout updates

Thanks

Gary

=== modified file '.bzrignore'
--- .bzrignore	2008-12-15 22:22:12 +0000
+++ .bzrignore	2009-03-24 17:31:47 +0000
@@ -1,8 +1,11 @@
-TEST_THIS_REST_BEFORE_REGISTERING.txt
 bin
 develop-eggs
-eggs
+.installed.cfg
+develop-eggs
 parts
-src/*.egg-info
-.installed.cfg
+*.egg-info
+tags
+TAGS
+build
+*.egg
 dist
 
=== modified file 'CHANGES.txt'
--- CHANGES.txt	2008-12-19 19:36:16 +0000
+++ CHANGES.txt	2009-03-24 17:31:47 +0000
@@ -5,8 +5,7 @@
 
     lazr.config 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.config is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 
=== renamed file 'DEVELOP.txt' => 'HACKING.txt'
--- DEVELOP.txt	2008-12-19 19:36:16 +0000
+++ HACKING.txt	2009-03-24 17:31:47 +0000
@@ -3,8 +3,7 @@
 
     lazr.config 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.config is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,141 +15,27 @@
 
 This project uses zc.buildout for development.
 
-Basics
-======
-
-To develop or run tests, first run ``$DESIRED_PYTHON bootstrap.py`` in this
-directory, where you replace ``$DESIRED_PYTHON`` with the python that should
-be used to build and run this project. A non-system Python is highly
-recommended, but not required.
-
-Then run ``./bin/buildout``.  (NOTE: Ubuntu Intrepid users, see bottom of this
-document if this generates errors.)
-
-You can now run tests with ``./bin/test``.  Use ``./bin/test --help`` to read
-about the many options.
-
-To gain access to a Python interpreter with the package and its dependent eggs
-available, use ``./bin/py``.
-
-You can generate ctags and idutils files for a variety of editors using
-``./bin/tags`` (see ``./bin/tags --help``). The advantage of the files
-generated from this utility is that they include the sourcecode from the eggs
-used in this buildout.
-
-To generate distributions, use ``./bin/buildout setup . SETUP_CMD [...]``.
-That is, you can use ``./bin/buildout setup .`` as if it were
-``python setup.py``.  The intended advantage is easy access to a pristine,
-local version of setuptools.
-
-Global Cache
-============
-
-Every project using zc.buildout will keep its own collection of eggs by
-default.  You may want to cache these eggs, and their downloaded
-distributions, globally.  To do so, perform the following instructions.
-
-- ``mkdir -p ~/.buildout/eggs``
-- ``mkdir ~/.buildout/download-cache``
-- Create ``~/.buildout/default.cfg`` with the following content, replacing
-  "$HOME" with the path to your home::
-
-    [buildout]
-    eggs-directory=$HOME/.buildout/eggs
-    download-cache=$HOME/.buildout/download-cache
-
-Working with Unreleased Packages
-================================
-
-You may want to develop with an unreleased distribution of another package.
-To do so, you have many options.  Here are three.
-
-Source
-------
-
-If you have a source package, you can add it to this buildout (temporarily or,
-if really appropriate, permanently) as follows.
-
-NOTE: We'll use "this software" to refer to the software/buildout to which you
-want to add a source package; and "the other software" to refer to the source
-package that you want to add.
-
-- Add the top-level directory (the one with the setup.py) of the other
-  software to somewhere accessible to this software. You might use ``bzr
-  add``, symbolic links, svn externals, or whatever the appropriate tool is
-  for the situation.  A reasonable option is to add it in the top-level
-  directory of this software.
-- In this software's buildout.cfg, in the [buildout] section, look for a
-  ``develop`` key.  It will probably look like this: ``develop = .``.
-  Edit it to include the directory of the other software.  For instance, if
-  you added it at the top level of this software's tree in a folder called
-  "lazr_foo," you would change the line in buildout.cfg to read
-  ``develop = . lazr_foo``.
-- Rerun ``bin/buildout``.
-
-Barring version conflicts in your setup.py or buildout configuration (which
-will be reported as errors when you run `bin/buildout``), you should now be
-using the source version of the dependency. Look at one of the scripts in
-``bin``, such as ``bin/test`` to verify, if you like.
-
-To undo, remove the line in buildout.conf, remove the other software's
-directory if necessary for cleanliness, and rerun ``bin/buildout``.
-
-Distribution
+============
+Introduction
+============
+
+These are guidelines for hacking on the lazr.config project.  But first,
+please see the common hacking guidelines at:
+
+    http://dev.launchpad.net/Hacking
+
+
+Getting help
 ------------
 
-If you have a source distribution or an egg, and you set up the download-cache
-as described in the `Global Cache`_ section above, you can put the
-distribution (sdist or egg) in the download-cache's ``dist`` directory.
-Then rerun bin/buildout.
-
-Alternatively, if you have an egg, you can put it in your eggs directory, or
-in the shared eggs directory as described in the `Global Cache`_ section, if
-you are using that. The rerun bin/buildout.
-
-In both cases, to undo, you must remove the egg from the local or shared
-``eggs`` directory. If you used the ``download-cache/dist`` directory, you
-must also remove it from there.
-
-Private Source
---------------
-
-If you want to distribute a source distribution privately, see
-http://pypi.python.org/pypi/zc.buildoutsftp/.
-
-References
-==========
-
-There is much, much more to learn about zc.buildout.  It works well for small
-packages, but is even better for big projects.  For more information about
-zc.buildout:
-
-- http://grok.zope.org/documentation/tutorial/introduction-to-zc.buildout
-
-  Presentation notes of an introduction to zc.buildout by its author, Jim
-  Fulton.
-
-- http://pypi.python.org/pypi/zc.buildout
-
-  The user manual.
-
-Ubunutu Intrepid Problem
-========================
-
-Intrepid has a bug working with buildout.  You may have to hack to fix it.
-Here's an example of the Python 2.4 version of the hack.
-
-$ sudo rm  /usr/lib/python2.4/site-packages/GMenuSimpleEditor/*.py
-$ sudo ln
--s /var/lib/python-support/python2.4/GMenuSimpleEditor/*.py /usr/lib/python2.4/site-packages/GMenuSimpleEditor/
-
-Python 2.5 would need the same kind of fix (replace all three instances of
-"python2.4" with "python2.5" in the above).
-
-The author of this document tried an Intrepid upgrade and an aptitude
-reinstall of python-gmenu to no avail before doing the rough-and-tumble change
-described above.
-
-See
-https://bugs.edge.launchpad.net/ubuntu/+source/gnome-menus/+bug/301571 and the
-bug linked to it by datakid.
+If you find bugs in this package, you can report them here:
+
+    https://launchpad.net/lazr.config
+
+If you want to discuss this package, join the team and mailing list here:
+
+    https://launchpad.net/~lazr-developers
+
+or send a message to:
+
+    [e-mail]
 
=== modified file 'MANIFEST.in'
--- MANIFEST.in	2008-12-15 22:22:12 +0000
+++ MANIFEST.in	2009-03-24 17:31:47 +0000
@@ -1,2 +1,2 @@
-include *.txt MANIFEST.in
-recursive-include src *.txt *.py *.conf
+exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
+prune _bootstrap
 
=== modified file 'README.txt'
--- README.txt	2008-12-19 19:36:16 +0000
+++ README.txt	2009-03-24 17:31:47 +0000
@@ -5,8 +5,7 @@
 
     lazr.config 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.config is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 
=== added directory '_bootstrap'
=== added file '_bootstrap/COPYRIGHT.txt'
--- _bootstrap/COPYRIGHT.txt	1970-01-01 00:00:00 +0000
+++ _bootstrap/COPYRIGHT.txt	2009-03-24 17:31:47 +0000
@@ -0,0 +1,9 @@
+Copyright (c) 2004-2009 Zope Corporation and Contributors.
+All Rights Reserved.
+
+This software is subject to the provisions of the Zope Public License,
+Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+FOR A PARTICULAR PURPOSE.
 
=== added file '_bootstrap/LICENSE.txt'
--- _bootstrap/LICENSE.txt	1970-01-01 00:00:00 +0000
+++ _bootstrap/LICENSE.txt	2009-03-24 17:31:47 +0000
@@ -0,0 +1,54 @@
+Zope Public License (ZPL) Version 2.1
+-------------------------------------
+
+A copyright notice accompanies this license document that
+identifies the copyright holders.
+
+This license has been certified as open source. It has also
+been designated as GPL compatible by the Free Software
+Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the
+following conditions are met:
+
+1. Redistributions in source code must retain the
+   accompanying copyright notice, this list of conditions,
+   and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying
+   copyright notice, this list of conditions, and the
+   following disclaimer in the documentation and/or other
+   materials provided with the distribution.
+
+3. Names of the copyright holders must not be used to
+   endorse or promote products derived from this software
+   without prior written permission from the copyright
+   holders.
+
+4. The right to distribute this software or to use it for
+   any purpose does not give you the right to use
+   Servicemarks (sm) or Trademarks (tm) of the copyright
+   holders. Use of them is covered by separate agreement
+   with the copyright holders.
+
+5. If any files are modified, you must cause the modified
+   files to carry prominent notices stating that you changed
+   the files and the date of any change.
+
+Disclaimer
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
+  AND ANY EXPRESSED 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 HOLDERS 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.
 \ No newline at end of file
 
=== renamed file 'bootstrap.py' => '_bootstrap/bootstrap.py'
=== added symlink 'bootstrap.py'
=== target is '_bootstrap/bootstrap.py'
=== modified file 'buildout.cfg'
--- buildout.cfg	2008-12-15 22:22:12 +0000
+++ buildout.cfg	2009-03-24 17:36:13 +0000
@@ -2,6 +2,7 @@
 parts =
     interpreter
     test
+    docs
     tags
 unzip = true
 
@@ -10,7 +11,14 @@
 [test]
 recipe = zc.recipe.testrunner
 eggs = lazr.config
-defaults = '--tests-pattern ^tests --exit-with-status'.split()
+defaults = '--tests-pattern ^tests --exit-with-status --suite-name additional_tests'.split()
+
+[docs]
+recipe = z3c.recipe.sphinxdoc
+eggs = lazr.config [docs]
+index-doc = README
+default.css =
+layout.html =
 
 [interpreter]
 recipe = zc.recipe.egg
 
=== added file 'ez_setup.py'
--- ez_setup.py	1970-01-01 00:00:00 +0000
+++ ez_setup.py	2009-03-24 17:31:47 +0000
@@ -0,0 +1,241 @@
+#!python
+"""Bootstrap setuptools installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+    from ez_setup import use_setuptools
+    use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+import sys
+DEFAULT_VERSION = "0.6c8"
+DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
+
+md5_data = {
+    'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
+    'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
+    'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
+    'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
+    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
+    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
+    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
+    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
+    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
+    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
+    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
+    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
+    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
+    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
+    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
+    'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
+    'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
+    'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
+    'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
+    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
+    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
+    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
+    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
+    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
+    'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
+    'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
+    'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
+    'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
+    'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
+    'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
+}
+
+import sys, os
+
+def _validate_md5(egg_name, data):
+    if egg_name in md5_data:
+        from md5 import md5
+        digest = md5(data).hexdigest()
+        if digest != md5_data[egg_name]:
+            print >>sys.stderr, (
+                "md5 validation of %s failed!  (Possible download problem?)"
+                % egg_name
+            )
+            sys.exit(2)
+    return data
+
+
+def use_setuptools(
+    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+    download_delay=15, min_version=None
+):
+    """Automatically find/download setuptools and make it available on sys.path
+
+    `version` should be a valid setuptools version number that is available
+    as an egg for download under the `download_base` URL (which should end with
+    a '/').  `to_dir` is the directory where setuptools will be downloaded, if
+    it is not already available.  If `download_delay` is specified, it should
+    be the number of seconds that will be paused before initiating a download,
+    should one be required.  If an older version of setuptools is installed,
+    this routine will print a message to ``sys.stderr`` and raise SystemExit in
+    an attempt to abort the calling script.
+    """
+    # Work around a hack in the ez_setup.py file from simplejson==1.7.3.
+    if min_version:
+        version = min_version
+
+    was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
+    def do_download():
+        egg = download_setuptools(version, download_base, to_dir, download_delay)
+        sys.path.insert(0, egg)
+        import setuptools; setuptools.bootstrap_install_from = egg
+    try:
+        import pkg_resources
+    except ImportError:
+        return do_download()       
+    try:
+        pkg_resources.require("setuptools>="+version); return
+    except pkg_resources.VersionConflict, e:
+        if was_imported:
+            print >>sys.stderr, (
+            "The required version of setuptools (>=%s) is not available, and\n"
+            "can't be installed while this script is running. Please install\n"
+            " a more recent version first, using 'easy_install -U setuptools'."
+            "\n\n(Currently using %r)"
+            ) % (version, e.args[0])
+            sys.exit(2)
+        else:
+            del pkg_resources, sys.modules['pkg_resources']    # reload ok
+            return do_download()
+    except pkg_resources.DistributionNotFound:
+        return do_download()
+
+def download_setuptools(
+    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+    delay = 15
+):
+    """Download setuptools from a specified location and return its filename
+
+    `version` should be a valid setuptools version number that is available
+    as an egg for download under the `download_base` URL (which should end
+    with a '/'). `to_dir` is the directory where the egg will be downloaded.
+    `delay` is the number of seconds to pause before an actual download attempt.
+    """
+    import urllib2, shutil
+    egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
+    url = download_base + egg_name
+    saveto = os.path.join(to_dir, egg_name)
+    src = dst = None
+    if not os.path.exists(saveto):  # Avoid repeated downloads
+        try:
+            from distutils import log
+            if delay:
+                log.warn("""
+---------------------------------------------------------------------------
+This script requires setuptools version %s to run (even to display
+help).  I will attempt to download it for you (from
+%s), but
+you may need to enable firewall access for this script first.
+I will start the download in %d seconds.
+
+(Note: if this machine does not have network access, please obtain the file
+
+   %s
+
+and place it in this directory before rerunning this script.)
+---------------------------------------------------------------------------""",
+                    version, download_base, delay, url
+                ); from time import sleep; sleep(delay)
+            log.warn("Downloading %s", url)
+            src = urllib2.urlopen(url)
+            # Read/write all in one block, so we don't create a corrupt file
+            # if the download is interrupted.
+            data = _validate_md5(egg_name, src.read())
+            dst = open(saveto,"wb"); dst.write(data)
+        finally:
+            if src: src.close()
+            if dst: dst.close()
+    return os.path.realpath(saveto)
+
+def main(argv, version=DEFAULT_VERSION):
+    """Install or upgrade setuptools and EasyInstall"""
+    try:
+        import setuptools
+    except ImportError:
+        egg = None
+        try:
+            egg = download_setuptools(version, delay=0)
+            sys.path.insert(0,egg)
+            from setuptools.command.easy_install import main
+            return main(list(argv)+[egg])   # we're done here
+        finally:
+            if egg and os.path.exists(egg):
+                os.unlink(egg)
+    else:
+        if setuptools.__version__ == '0.0.1':
+            print >>sys.stderr, (
+            "You have an obsolete version of setuptools installed.  Please\n"
+            "remove it from your system entirely before rerunning this script."
+            )
+            sys.exit(2)
+
+    req = "setuptools>="+version
+    import pkg_resources
+    try:
+        pkg_resources.require(req)
+    except pkg_resources.VersionConflict:
+        try:
+            from setuptools.command.easy_install import main
+        except ImportError:
+            from easy_install import main
+        main(list(argv)+[download_setuptools(delay=0)])
+        sys.exit(0) # try to force an exit
+    else:
+        if argv:
+            from setuptools.command.easy_install import main
+            main(argv)
+        else:
+            print "Setuptools version",version,"or greater has been installed."
+            print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
+
+def update_md5(filenames):
+    """Update our built-in md5 registry"""
+
+    import re
+    from md5 import md5
+
+    for name in filenames:
+        base = os.path.basename(name)
+        f = open(name,'rb')
+        md5_data[base] = md5(f.read()).hexdigest()
+        f.close()
+
+    data = ["    %r: %r,\n" % it for it in md5_data.items()]
+    data.sort()
+    repl = "".join(data)
+
+    import inspect
+    srcfile = inspect.getsourcefile(sys.modules[__name__])
+    f = open(srcfile, 'rb'); src = f.read(); f.close()
+
+    match = re.search("\nmd5_data = {\n([^}]+)}", src)
+    if not match:
+        print >>sys.stderr, "Internal error!"
+        sys.exit(2)
+
+    src = src[:match.start(1)] + repl + src[match.end(1):]
+    f = open(srcfile,'w')
+    f.write(src)
+    f.close()
+
+
+if __name__=='__main__':
+    if len(sys.argv)>2 and sys.argv[1]=='--md5update':
+        update_md5(sys.argv[2:])
+    else:
+        main(sys.argv[1:])
+
+
+
+
+
 
=== modified file 'setup.py' (properties changed: -x to +x)
--- setup.py	2009-01-05 20:39:16 +0000
+++ setup.py	2009-03-24 17:31:47 +0000
@@ -1,11 +1,12 @@
+#!/usr/bin/env python
+
 # Copyright 2008-2009 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.config.
 #
 # lazr.config 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.config is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -15,6 +16,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with lazr.config.  If not, see <http://www.gnu.org/licenses/>.
 
+import ez_setup
+ez_setup.use_setuptools()
+
+import sys
 from setuptools import setup, find_packages
 
 # generic helpers primarily for the long_description
@@ -31,9 +36,13 @@
     return '\n'.join(res)
 # end generic helpers
 
+
+sys.path.insert(0, 'src')
+from lazr.config import __version__
+
 setup(
     name='lazr.config',
-    version='1.1',
+    version=__version__,
     namespace_packages=['lazr'],
     packages=find_packages('src'),
     package_dir={'':'src'},
@@ -52,10 +61,17 @@
         'lazr.delegates',
         ],
     url='https://launchpad.net/lazr.config',
+    download_url= 'https://launchpad.net/lazr.config/+download',
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
         "Operating System :: OS Independent",
         "Programming Language :: Python"],
+    extras_require=dict(
+        docs=['Sphinx',
+              'z3c.recipe.sphinxdoc']
+    ),
+    setup_requires=['eggtestinfo', 'setuptools_bzr'],
+    test_suite='lazr.config.tests',
     )
 
=== modified file 'src/lazr/__init__.py'
--- src/lazr/__init__.py	2009-01-05 20:39:16 +0000
+++ src/lazr/__init__.py	2009-03-24 17:31:47 +0000
@@ -4,8 +4,7 @@
 #
 # lazr.config 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.config 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/config/CHANGES.txt'
--- src/lazr/config/CHANGES.txt	2009-01-05 20:39:16 +0000
+++ src/lazr/config/CHANGES.txt	2009-03-24 17:31:47 +0000
@@ -2,6 +2,14 @@
 Changes
 =======
 
+1.1.1 (2009-03-24)
+==================
+
+- License clarification: only v3 of the LGPL is offered at this time, not
+  subsequent versions.
+
+- Build is updated to support Sphinx docs and other small changes.
+
 1.1 (2009-01-05)
 ================
 
 
=== modified file 'src/lazr/config/README.txt'
--- src/lazr/config/README.txt	2009-01-05 20:26:07 +0000
+++ src/lazr/config/README.txt	2009-03-24 17:36:13 +0000
@@ -3,8 +3,7 @@
 
     lazr.config 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.config is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -41,7 +40,7 @@
 
     >>> import lazr.config
     >>> testfiles_dir = path.normpath(path.join(
-    ...     path.dirname(lazr.config.__file__), 'testdata'))
+    ...     path.dirname(lazr.config.__file__), 'tests', 'testdata'))
     >>> base_conf = path.join(testfiles_dir, 'base.conf')
 
 The config file contains sections enclosed in square brackets ([]).
@@ -94,7 +93,7 @@
     >>> schema.name
     'base.conf'
     >>> schema.filename
-    '...lazr/config/testdata/base.conf'
+    '...lazr/config/tests/testdata/base.conf'
 
 If you provide an optional file-like object as a second argument to the
 constructor, that is used instead of opening the named file implicitly.
@@ -462,7 +461,7 @@
     >>> config.name
     'local.conf'
     >>> config.filename
-    '...lazr/config/testdata/local.conf'
+    '...lazr/config/tests/testdata/local.conf'
 
 The config can access the schema via the schema property.
 
@@ -590,9 +589,9 @@
 The Section's type is the same type as the ConfigSchema.section_factory.
 
     >>> section_1
-    <lazr.config.Section object at ...>
+    <lazr.config...Section object at ...>
     >>> config.schema.section_factory
-    <class 'lazr.config.Section'>
+    <class 'lazr.config...Section'>
 
 A key can be verified to be in a Section.
 
@@ -1065,9 +1064,9 @@
 
     >>> implicit_config = implicit_schema.load(local_conf)
     >>> implicit_config
-    <lazr.config.Config object at ...>
+    <lazr.config...Config object at ...>
     >>> config
-    <lazr.config.Config object at ...>
+    <lazr.config...Config object at ...>
 
     >>> sections = sorted(section.name for section in config)
     >>> implicit_sections = sorted(
@@ -1081,7 +1080,7 @@
 But the type of sections in the config support implicit typing.
 
     >>> implicit_config['section_3.app_b']
-    <lazr.config.ImplicitTypeSection object at ...>
+    <lazr.config...ImplicitTypeSection object at ...>
 
 ImplicitTypeSection, in contrast to Section, converts values that
 appear to be integer or boolean into ints and bools.
@@ -1447,3 +1446,13 @@
     Traceback (most recent call last):
     ...
     AttributeError: 'module' object has no attribute 'CHEESE'
+
+===============
+Other Documents
+===============
+
+.. toctree::
+   :glob:
+
+   *
+   docs/*
 
=== added file 'src/lazr/config/__init__.py'
--- src/lazr/config/__init__.py	1970-01-01 00:00:00 +0000
+++ src/lazr/config/__init__.py	2009-03-24 17:31:47 +0000
@@ -0,0 +1,30 @@
+# Copyright 2007-2009 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.config
+#
+# lazr.config 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.config 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.config.  If not, see <http://www.gnu.org/licenses/>.
+
+"""A configuration file system."""
+
+__version__ = '1.1.1'
+
+# Re-export in such a way that __version__ can still be imported if
+# dependencies are not yet available.
+try:
+    # While we generally frown on "*" imports, this, combined with the fact we
+    # only test code from this module, means that we can verify what has been
+    # exported.
+    from lazr.config._config import *
+    from lazr.config._config import __all__
+except ImportError:
+    pass
 
=== renamed file 'src/lazr/config/__init__.py' => 'src/lazr/config/_config.py'
--- src/lazr/config/__init__.py	2009-01-05 20:39:16 +0000
+++ src/lazr/config/_config.py	2009-03-24 17:31:47 +0000
@@ -4,8 +4,7 @@
 #
 # lazr.config 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.config is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -840,7 +839,7 @@
 
 def as_log_level(value):
     """Turn a string into a log level.
-    
+
     :param value: A string with a value (case-insensitive) equal to one of the
         symbolic logging levels.
     :type value: string
 
=== modified file 'src/lazr/config/interfaces.py'
--- src/lazr/config/interfaces.py	2008-12-23 01:59:49 +0000
+++ src/lazr/config/interfaces.py	2009-03-24 17:31:47 +0000
@@ -1,4 +1,19 @@
-# Copyright 2007 Canonical Ltd.  All rights reserved.
+# Copyright 2007-2009 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.config
+#
+# lazr.config 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.config 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.config.  If not, see <http://www.gnu.org/licenses/>.
+
 # pylint: disable-msg=E0211,E0213,W0231
 """Interfaces for process configuration.."""
 
 
=== added directory 'src/lazr/config/tests'
=== added file 'src/lazr/config/tests/__init__.py'
--- src/lazr/config/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ src/lazr/config/tests/__init__.py	2009-03-24 17:31:47 +0000
@@ -0,0 +1,17 @@
+# Copyright 2007-2009 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.config
+#
+# lazr.config 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.config 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.config.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test package for lazr.config."""
 
=== renamed file 'src/lazr/config/tests.py' => 'src/lazr/config/tests/test_docs.py'
--- src/lazr/config/tests.py	2008-12-15 22:22:12 +0000
+++ src/lazr/config/tests/test_docs.py	2009-03-24 17:31:47 +0000
@@ -1,17 +1,51 @@
-# Copyright 2008 Canonical Ltd.  All rights reserved.
+# Copyright 2009 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.config
+#
+# lazr.config 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.config 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.config.  If not, see <http://www.gnu.org/licenses/>.
+"Test harness for doctests."
 
-"""Test harness."""
+# pylint: disable-msg=E0611,W0142
 
 __metaclass__ = type
-__all__ = []
+__all__ = [
+    'additional_tests',
+    ]
 
+import atexit
 import doctest
+import os
+from pkg_resources import (
+    resource_filename, resource_exists, resource_listdir, cleanup_resources)
 import unittest
 
-
-def test_suite():
+DOCTEST_FLAGS = (
+    doctest.ELLIPSIS |
+    doctest.NORMALIZE_WHITESPACE |
+    doctest.REPORT_NDIFF)
+
+
+def additional_tests():
+    "Run the doc tests (README.txt and docs/*, if any exist)"
+    doctest_files = [
+        os.path.abspath(resource_filename('lazr.config', 'README.txt'))]
+    if resource_exists('lazr.config', 'docs'):
+        for name in resource_listdir('lazr.config', 'docs'):
+            if name.endswith('.txt'):
+                doctest_files.append(
+                    os.path.abspath(
+                        resource_filename('lazr.config', 'docs/%s' % name)))
+    kwargs = dict(module_relative=False, optionflags=DOCTEST_FLAGS)
+    atexit.register(cleanup_resources)
     return unittest.TestSuite((
-        doctest.DocFileSuite(
-            'README.txt',
-            optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
-        ))
+        doctest.DocFileSuite(*doctest_files, **kwargs)))
 
=== renamed directory 'src/lazr/config/testdata' => 'src/lazr/config/tests/testdata'