Merge lp:~cjwatson/launchpadlib/tox into lp:launchpadlib

[Colin Watson]

Add tox testing support and drop buildout.

[Kristian Glass (doismellburning)]

This feels like it bundles a few things on top of the tox change, including Python 2/3 compatibility (collections import), and a Sphinx migration - how intentional is this, and could it be split...?

That aside, it all looks good, thanks

review: Approve

[Colin Watson (cjwatson)]

I normally do the Sphinx migration as part of migrating to tox, because normally buildout.cfg sets up a recipe involving z3c.recipe.sphinxdoc and I have to do something with that. In this case that happens not to have been the case, but I mostly just copied bits from previous tox migrations I've done and it was easier this way.

The collections.abc.Callable thing was something I noticed while running tox, but you're probably right that it should be separated, not least because it deserves its own NEWS file entries. I've split that out as https://code.launchpad.net/~cjwatson/launchpadlib/py3-callable/+merge/375893.

[Kristian Glass (doismellburning)]

Makes sense, thanks!

=== modified file '.bzrignore'
--- .bzrignore	2010-05-22 12:48:48 +0000
+++ .bzrignore	2019-11-07 17:42:03 +0000
@@ -1,13 +1,12 @@
+*.egg-info
+*.pyc
+.tox
 bin
-develop-eggs
-.installed.cfg
-develop-eggs
-parts
-*.egg-info
-tags
-TAGS
 build
-*.egg
+develop-eggs
 dist
-eggs
+src/launchpadlib/docs/_build
+TAGS
+tags
 _trial_temp
+__pycache__

=== renamed file 'HACKING.txt' => 'HACKING.rst'
--- HACKING.txt	2011-11-21 15:07:01 +0000
+++ HACKING.rst	2019-11-07 17:42:03 +0000
@@ -13,19 +13,11 @@
     You should have received a copy of the GNU Lesser General Public License
     along with lazr.launchpadlib.  If not, see <http://www.gnu.org/licenses/>.
 
-This project uses zc.buildout for development.
-
 ============
 Introduction
 ============
 
-These are guidelines for hacking on the lazr.launchpadlib project.  But first,
-please see the common hacking guidelines at:
-
-    https://dev.launchpad.net/HackingLazrLibraries
-
-These guidelines will tell you how to run the tests, use in-development
-versions of libraries, land your branches and get them released.
+To run this project's tests, use `tox <https://tox.readthedocs.io/en/latest/>`.
 
 
 Getting help
@@ -42,19 +34,3 @@
 or send a message to:
 
     [e-mail]
-
-
-========
-Building
-========
-
-As mentioned above, this project uses zc.buildout, which requires a
-few steps to build some necessary files.
-
-The following two steps will create some necessary files, including a
-bin directory.
-% python bootstrap.py
-% bin/buildout
-
-Once built you can run all of the tests with:
-% bin/test

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2015-11-17 18:29:23 +0000
+++ MANIFEST.in	2019-11-07 17:42:03 +0000
@@ -1,4 +1,4 @@
-exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
-global-include *.txt *.xsl *.png
-prune _bootstrap
-prune eggs
+exclude MANIFEST.in .bzrignore
+global-include *.txt *.rst *.xml *.xsl *.png
+include src/launchpadlib/docs/Makefile
+prune src/launchpadlib/docs/_build

=== renamed file 'NEWS.txt' => 'NEWS.rst'
--- NEWS.txt	2019-11-04 22:50:46 +0000
+++ NEWS.rst	2019-11-07 17:42:03 +0000
@@ -2,6 +2,10 @@
 NEWS for launchpadlib
 =====================
 
+1.10.8
+======
+- Switch from buildout to tox.
+
 1.10.7 (2019-05-22)
 ===================
 - Change 'dev' URLs from launchpad.dev to launchpad.test.

=== renamed file 'README.txt' => 'README.rst'
=== removed file 'bootstrap.py'
--- bootstrap.py	2010-10-13 20:09:38 +0000
+++ bootstrap.py	1970-01-01 00:00:00 +0000
@@ -1,260 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Foundation 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.
-#
-##############################################################################
-"""Bootstrap a buildout-based project
-
-Simply run this script in a directory containing a buildout.cfg.
-The script accepts buildout command-line options, so you can
-use the -c option to specify an alternate configuration file.
-"""
-
-import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
-from optparse import OptionParser
-
-if sys.platform == 'win32':
-    def quote(c):
-        if ' ' in c:
-            return '"%s"' % c # work around spawn lamosity on windows
-        else:
-            return c
-else:
-    quote = str
-
-# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
-stdout, stderr = subprocess.Popen(
-    [sys.executable, '-Sc',
-     'try:\n'
-     '    import ConfigParser\n'
-     'except ImportError:\n'
-     '    print 1\n'
-     'else:\n'
-     '    print 0\n'],
-    stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-has_broken_dash_S = bool(int(stdout.strip()))
-
-# In order to be more robust in the face of system Pythons, we want to
-# run without site-packages loaded.  This is somewhat tricky, in
-# particular because Python 2.6's distutils imports site, so starting
-# with the -S flag is not sufficient.  However, we'll start with that:
-if not has_broken_dash_S and 'site' in sys.modules:
-    # We will restart with python -S.
-    args = sys.argv[:]
-    args[0:0] = [sys.executable, '-S']
-    args = map(quote, args)
-    os.execv(sys.executable, args)
-# Now we are running with -S.  We'll get the clean sys.path, import site
-# because distutils will do it later, and then reset the path and clean
-# out any namespace packages from site-packages that might have been
-# loaded by .pth files.
-clean_path = sys.path[:]
-import site
-sys.path[:] = clean_path
-for k, v in sys.modules.items():
-    if k in ('setuptools', 'pkg_resources') or (
-        hasattr(v, '__path__') and
-        len(v.__path__)==1 and
-        not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
-        # This is a namespace package.  Remove it.
-        sys.modules.pop(k)
-
-is_jython = sys.platform.startswith('java')
-
-setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
-distribute_source = 'http://python-distribute.org/distribute_setup.py'
-
-# parsing arguments
-def normalize_to_url(option, opt_str, value, parser):
-    if value:
-        if '://' not in value: # It doesn't smell like a URL.
-            value = 'file://%s' % (
-                urllib.pathname2url(
-                    os.path.abspath(os.path.expanduser(value))),)
-        if opt_str == '--download-base' and not value.endswith('/'):
-            # Download base needs a trailing slash to make the world happy.
-            value += '/'
-    else:
-        value = None
-    name = opt_str[2:].replace('-', '_')
-    setattr(parser.values, name, value)
-
-usage = '''\
-[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
-
-Bootstraps a buildout-based project.
-
-Simply run this script in a directory containing a buildout.cfg, using the
-Python that you want bin/buildout to use.
-
-Note that by using --setup-source and --download-base to point to
-local resources, you can keep this script from going over the network.
-'''
-
-parser = OptionParser(usage=usage)
-parser.add_option("-v", "--version", dest="version",
-                          help="use a specific zc.buildout version")
-parser.add_option("-d", "--distribute",
-                   action="store_true", dest="use_distribute", default=False,
-                   help="Use Distribute rather than Setuptools.")
-parser.add_option("--setup-source", action="callback", dest="setup_source",
-                  callback=normalize_to_url, nargs=1, type="string",
-                  help=("Specify a URL or file location for the setup file. "
-                        "If you use Setuptools, this will default to " +
-                        setuptools_source + "; if you use Distribute, this "
-                        "will default to " + distribute_source +"."))
-parser.add_option("--download-base", action="callback", dest="download_base",
-                  callback=normalize_to_url, nargs=1, type="string",
-                  help=("Specify a URL or directory for downloading "
-                        "zc.buildout and either Setuptools or Distribute. "
-                        "Defaults to PyPI."))
-parser.add_option("--eggs",
-                  help=("Specify a directory for storing eggs.  Defaults to "
-                        "a temporary directory that is deleted when the "
-                        "bootstrap script completes."))
-parser.add_option("-t", "--accept-buildout-test-releases",
-                  dest='accept_buildout_test_releases',
-                  action="store_true", default=False,
-                  help=("Normally, if you do not specify a --version, the "
-                        "bootstrap script and buildout gets the newest "
-                        "*final* versions of zc.buildout and its recipes and "
-                        "extensions for you.  If you use this flag, "
-                        "bootstrap and buildout will get the newest releases "
-                        "even if they are alphas or betas."))
-parser.add_option("-c", None, action="store", dest="config_file",
-                   help=("Specify the path to the buildout configuration "
-                         "file to be used."))
-
-options, args = parser.parse_args()
-
-# if -c was provided, we push it back into args for buildout's main function
-if options.config_file is not None:
-    args += ['-c', options.config_file]
-
-if options.eggs:
-    eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
-else:
-    eggs_dir = tempfile.mkdtemp()
-
-if options.setup_source is None:
-    if options.use_distribute:
-        options.setup_source = distribute_source
-    else:
-        options.setup_source = setuptools_source
-
-if options.accept_buildout_test_releases:
-    args.append('buildout:accept-buildout-test-releases=true')
-args.append('bootstrap')
-
-try:
-    import pkg_resources
-    import setuptools # A flag.  Sometimes pkg_resources is installed alone.
-    if not hasattr(pkg_resources, '_distribute'):
-        raise ImportError
-except ImportError:
-    ez_code = urllib2.urlopen(
-        options.setup_source).read().replace('\r\n', '\n')
-    ez = {}
-    exec ez_code in ez
-    setup_args = dict(to_dir=eggs_dir, download_delay=0)
-    if options.download_base:
-        setup_args['download_base'] = options.download_base
-    if options.use_distribute:
-        setup_args['no_fake'] = True
-    ez['use_setuptools'](**setup_args)
-    if 'pkg_resources' in sys.modules:
-        reload(sys.modules['pkg_resources'])
-    import pkg_resources
-    # This does not (always?) update the default working set.  We will
-    # do it.
-    for path in sys.path:
-        if path not in pkg_resources.working_set.entries:
-            pkg_resources.working_set.add_entry(path)
-
-cmd = [quote(sys.executable),
-       '-c',
-       quote('from setuptools.command.easy_install import main; main()'),
-       '-mqNxd',
-       quote(eggs_dir)]
-
-if not has_broken_dash_S:
-    cmd.insert(1, '-S')
-
-find_links = options.download_base
-if not find_links:
-    find_links = os.environ.get('bootstrap-testing-find-links')
-if find_links:
-    cmd.extend(['-f', quote(find_links)])
-
-if options.use_distribute:
-    setup_requirement = 'distribute'
-else:
-    setup_requirement = 'setuptools'
-ws = pkg_resources.working_set
-setup_requirement_path = ws.find(
-    pkg_resources.Requirement.parse(setup_requirement)).location
-env = dict(
-    os.environ,
-    PYTHONPATH=setup_requirement_path)
-
-requirement = 'zc.buildout'
-version = options.version
-if version is None and not options.accept_buildout_test_releases:
-    # Figure out the most recent final version of zc.buildout.
-    import setuptools.package_index
-    _final_parts = '*final-', '*final'
-    def _final_version(parsed_version):
-        for part in parsed_version:
-            if (part[:1] == '*') and (part not in _final_parts):
-                return False
-        return True
-    index = setuptools.package_index.PackageIndex(
-        search_path=[setup_requirement_path])
-    if find_links:
-        index.add_find_links((find_links,))
-    req = pkg_resources.Requirement.parse(requirement)
-    if index.obtain(req) is not None:
-        best = []
-        bestv = None
-        for dist in index[req.project_name]:
-            distv = dist.parsed_version
-            if _final_version(distv):
-                if bestv is None or distv > bestv:
-                    best = [dist]
-                    bestv = distv
-                elif distv == bestv:
-                    best.append(dist)
-        if best:
-            best.sort()
-            version = best[-1].version
-if version:
-    requirement = '=='.join((requirement, version))
-cmd.append(requirement)
-
-if is_jython:
-    import subprocess
-    exitcode = subprocess.Popen(cmd, env=env).wait()
-else: # Windows prefers this, apparently; otherwise we would prefer subprocess
-    exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
-if exitcode != 0:
-    sys.stdout.flush()
-    sys.stderr.flush()
-    print ("An error occurred when trying to install zc.buildout. "
-           "Look above this message for any errors that "
-           "were output by easy_install.")
-    sys.exit(exitcode)
-
-ws.add_entry(eggs_dir)
-ws.require(requirement)
-import zc.buildout.buildout
-zc.buildout.buildout.main(args)
-if not options.eggs: # clean up temporary egg directory
-    shutil.rmtree(eggs_dir)

=== removed file 'buildout.cfg'
--- buildout.cfg	2014-07-04 14:55:48 +0000
+++ buildout.cfg	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-[buildout]
-extends = versions.cfg
-parts =
-    interpreter
-    test
-    tags
-unzip = true
-include-site-packages = false
-exec-sitecustomize = false
-develop = .
-
-[test]
-recipe = zc.recipe.testrunner
-eggs = launchpadlib
-defaults = '--tests-pattern ^tests --exit-with-status'.split()
-
-[interpreter]
-recipe = z3c.recipe.scripts
-interpreter = py
-eggs = launchpadlib
-       docutils
-
-[tags]
-recipe = z3c.recipe.tag:tags
-eggs = launchpadlib

=== modified file 'setup.py'
--- setup.py	2019-11-04 22:50:46 +0000
+++ setup.py	2019-11-07 17:42:03 +0000
@@ -23,20 +23,23 @@
 
 # generic helpers primarily for the long_description
 def generate(*docname_or_string):
+    marker = '.. pypi description ends here'
     res = []
     for value in docname_or_string:
-        if value.endswith('.txt'):
-            f = open(value)
-            value = f.read()
-            f.close()
+        if value.endswith('.rst'):
+            with open(value) as f:
+                value = f.read()
+            idx = value.find(marker)
+            if idx >= 0:
+                value = value[:idx]
         res.append(value)
         if not value.endswith('\n'):
             res.append('')
     return '\n'.join(res)
 # end generic helpers
 
-sys.path.insert(0, 'src')
-from launchpadlib import __version__
+with open("src/launchpadlib/version.txt") as version_file:
+    __version__ = version_file.read().strip()
 
 install_requires = [
     'httplib2',
@@ -62,10 +65,10 @@
     maintainer='LAZR Developers',
     maintainer_email='[e-mail]',
     download_url= 'https://launchpad.net/launchpadlib/+download',
-    description=open('README.txt').readline().strip(),
+    description=open('README.rst').readline().strip(),
     long_description=generate(
-        'src/launchpadlib/README.txt',
-        'NEWS.txt'),
+        'src/launchpadlib/docs/index.rst',
+        'NEWS.rst'),
     license='LGPL v3',
     install_requires=install_requires,
     url='https://help.launchpad.net/API/launchpadlib',
@@ -76,7 +79,13 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         ],
+    extras_require={'docs': ['Sphinx']},
     test_suite='launchpadlib.tests',
     )

=== modified file 'src/launchpadlib/__init__.py'
--- src/launchpadlib/__init__.py	2019-05-22 14:42:44 +0000
+++ src/launchpadlib/__init__.py	2019-11-07 17:42:03 +0000
@@ -14,4 +14,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = '1.10.7'
+import pkg_resources
+__version__ = pkg_resources.resource_string(
+    "launchpadlib", "version.txt").strip()

=== added file 'src/launchpadlib/docs/Makefile'
--- src/launchpadlib/docs/Makefile	1970-01-01 00:00:00 +0000
+++ src/launchpadlib/docs/Makefile	2019-11-07 17:42:03 +0000
@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+SPHINXPROJ    = launchpadlib
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file

=== added symlink 'src/launchpadlib/docs/NEWS.rst'
=== target is u'../../../NEWS.rst'
=== renamed file 'src/launchpadlib/docs/command-line.txt' => 'src/launchpadlib/docs/command-line.rst'
=== added file 'src/launchpadlib/docs/conf.py'
--- src/launchpadlib/docs/conf.py	1970-01-01 00:00:00 +0000
+++ src/launchpadlib/docs/conf.py	2019-11-07 17:42:03 +0000
@@ -0,0 +1,171 @@
+# -*- coding: utf-8 -*-
+#
+# launchpadlib documentation build configuration file, created by
+# sphinx-quickstart on Tue Nov  5 23:48:15 2019.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+with open('../version.txt') as version_file:
+    _version = version_file.read().strip()
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = []
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'launchpadlib'
+copyright = u'2008-2019, Canonical Ltd.'
+author = u'LAZR Developers <[e-mail]>'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = _version
+# The full version, including alpha/beta/rc tags.
+release = _version
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Custom sidebar templates, must be a dictionary that maps document names
+# to template names.
+#
+# This is required for the alabaster theme
+# refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars
+html_sidebars = {
+    '**': [
+        'relations.html',  # needs 'show_related': True theme option to display
+        'searchbox.html',
+    ]
+}
+
+
+# -- Options for HTMLHelp output ------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'launchpadlibdoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'launchpadlib.tex', u'launchpadlib Documentation',
+     u'LAZR Developers \\textless{}[e-mail]\\textgreater{}', 'manual'),
+]
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'launchpadlib', u'launchpadlib Documentation',
+     [author], 1)
+]
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'launchpadlib', u'launchpadlib Documentation',
+     author, 'launchpadlib', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+
+

=== renamed file 'src/launchpadlib/docs/hosted-files.txt' => 'src/launchpadlib/docs/hosted-files.rst'
=== renamed file 'src/launchpadlib/README.txt' => 'src/launchpadlib/docs/index.rst'
--- src/launchpadlib/README.txt	2009-03-20 20:46:06 +0000
+++ src/launchpadlib/docs/index.rst	2019-11-07 17:42:03 +0000
@@ -17,3 +17,16 @@
 ************
 
 See https://help.launchpad.net/API/launchpadlib .
+
+.. pypi description ends here
+
+.. toctree::
+    :glob:
+
+    introduction
+    operations
+    toplevel
+    people
+    hosted-files
+    command-line
+    NEWS

=== renamed file 'src/launchpadlib/docs/introduction.txt' => 'src/launchpadlib/docs/introduction.rst'
=== renamed file 'src/launchpadlib/docs/operations.txt' => 'src/launchpadlib/docs/operations.rst'
=== renamed file 'src/launchpadlib/docs/people.txt' => 'src/launchpadlib/docs/people.rst'
--- src/launchpadlib/docs/people.txt	2016-07-12 14:56:47 +0000
+++ src/launchpadlib/docs/people.rst	2019-11-07 17:42:03 +0000
@@ -1,4 +1,6 @@
-= People and Teams =
+****************
+People and Teams
+****************
 
 The Launchpad web service, like Launchpad itself, exposes a unified
 interface to people and teams.  In other words, people and teams
@@ -7,7 +9,8 @@
 dealing with a person or a team.
 
 
-== People ==
+People
+======
 
 You can access Launchpad people through the web service interface.
 The list of people is available from the service root.
@@ -103,7 +106,8 @@
     u'Public'
 
 
-== Teams ==
+Teams
+=====
 
 You also access teams using the same interface.
 

=== renamed file 'src/launchpadlib/docs/toplevel.txt' => 'src/launchpadlib/docs/toplevel.rst'
--- src/launchpadlib/docs/toplevel.txt	2011-07-27 05:33:26 +0000
+++ src/launchpadlib/docs/toplevel.rst	2019-11-07 17:42:03 +0000
@@ -1,3 +1,7 @@
+*********************
+Top-level collections
+*********************
+
 The launchpad web service's top-level collections provide access to
 Launchpad-wide objects like projects and people.
 

=== modified file 'src/launchpadlib/testing/launchpad.py'
--- src/launchpadlib/testing/launchpad.py	2014-07-14 20:29:51 +0000
+++ src/launchpadlib/testing/launchpad.py	2019-11-07 17:42:03 +0000
@@ -66,7 +66,10 @@
 """
 
 from datetime import datetime
-import collections
+try:
+    from collections.abc import Callable
+except ImportError:
+    from collections import Callable
 import sys
 if sys.version_info[0] >= 3:
     basestring = str
@@ -205,7 +208,7 @@
         result = self._children.get(name, _marker)
         if result is _marker:
             result = self._values.get(name, _marker)
-            if isinstance(result, collections.Callable):
+            if isinstance(result, Callable):
                 return self._wrap_method(name, result)
         if name in self.special_methods:
             return lambda: True
@@ -280,7 +283,7 @@
             attributes and methods.
         """
         for name, value in partial_object.items():
-            if isinstance(value, collections.Callable):
+            if isinstance(value, Callable):
                 # Performs an integrity check.
                 self._get_method(resource_type, name)
             else:
@@ -306,7 +309,7 @@
             if name == "entries":
                 name, child_resource_type = (
                     self._check_entries(resource_type, value))
-            elif isinstance(value, collections.Callable):
+            elif isinstance(value, Callable):
                 # Performs an integrity check.
                 self._get_method(resource_type, name)
             else:

=== modified file 'src/launchpadlib/tests/test_launchpad.py'
--- src/launchpadlib/tests/test_launchpad.py	2015-07-10 22:42:14 +0000
+++ src/launchpadlib/tests/test_launchpad.py	2019-11-07 17:42:03 +0000
@@ -529,12 +529,15 @@
     def test_None_launchpadlib_dir(self):
         # If no launchpadlib_dir is passed in to login_with,
         # $HOME/.launchpadlib is used.
-        old_home = os.environ['HOME']
+        old_home = os.environ.get('HOME')
         os.environ['HOME'] = self.temp_dir
         launchpad = NoNetworkLaunchpad.login_with(
             'app name', service_root=SERVICE_ROOT)
         # Reset the environment to the old value.
-        os.environ['HOME'] = old_home
+        if old_home is not None:
+            os.environ['HOME'] = old_home
+        else:
+            del os.environ['HOME']
 
         cache_dir = launchpad.passed_in_args['cache']
         launchpadlib_dir = os.path.abspath(

=== added file 'src/launchpadlib/version.txt'
--- src/launchpadlib/version.txt	1970-01-01 00:00:00 +0000
+++ src/launchpadlib/version.txt	2019-11-07 17:42:03 +0000
@@ -0,0 +1,1 @@
+1.10.7

=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2019-11-07 17:42:03 +0000
@@ -0,0 +1,18 @@
+[tox]
+envlist =
+    py27,py35,py36,py37,py38,docs
+
+[testenv]
+commands =
+    zope-testrunner --test-path src --tests-pattern ^tests {posargs}
+deps =
+    .
+    zope.testrunner
+
+[testenv:docs]
+basepython =
+    python2.7
+commands =
+    sphinx-build -b html -d src/launchpadlib/docs/_build/doctrees src/launchpadlib/docs src/launchpadlib/docs/_build/html
+deps =
+    .[docs]

=== removed file 'versions.cfg'
--- versions.cfg	2014-07-04 14:55:48 +0000
+++ versions.cfg	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-[buildout]
-versions = versions
-allow-picked-versions = false
-use-dependency-links = false
-
-
-[versions]
-# Alphabetical, case-SENSITIVE, blank line after this comment
-
-Jinja2 = 2.5.5
-Pygments = 1.4
-RestrictedPython = 3.6.0
-Sphinx = 1.0.1
-ZConfig = 2.7.1
-ZODB3 = 3.9.2
-distribute = 0.6.27
-docutils = 0.5
-elementtree = 1.2.7-20070827-preview
-epydoc = 3.0.1
-fixtures = 0.3.9
-grokcore.component = 1.6
-httplib2 = 0.7.4
-lazr.authentication = 0.1.2
-lazr.batchnavigator = 1.2.7
-lazr.delegates = 1.2.0
-lazr.enum = 1.1.2
-lazr.lifecycle = 1.0
-lazr.restful = 0.19.7
-lazr.uri = 1.0.2
-lazr.restfulclient = 0.13.3
-testresources = 0.2.7
-keyring = 3.8
-lxml = 2.2.7
-martian = 0.11
-oauth = 1.0.1
-pytz = 2010o
-setuptools = 0.6c11
-simplejson = 2.5.0
-testtools = 0.9.11
-transaction = 1.0.0
-van.testing = 3.0.0
-wadllib = 1.2.0
-wsgi-intercept = 0.5.1
-wsgiref = 0.1.2
-z3c.recipe.scripts = 1.0.1
-z3c.recipe.sphinxdoc = 0.0.8
-z3c.recipe.staticlxml = 0.7.1
-z3c.recipe.tag = 0.2.0
-zc.buildout = 1.5.2
-zc.lockfile = 1.0.0
-zc.recipe.cmmi = 1.3.1
-zc.recipe.egg = 1.3.2
-zc.recipe.testrunner = 1.4.0
-zdaemon = 2.0.4
-zope.annotation = 3.5.0
-zope.app.pagetemplate = 3.11.2
-zope.browser = 1.3
-zope.browserpage = 3.12.2
-zope.cachedescriptors = 3.5.1
-zope.component = 3.10.0
-zope.configuration = 3.6.0
-zope.contenttype = 3.5.1
-zope.copy = 3.5.0
-zope.datetime = 3.4.0
-zope.dublincore = 3.8.1
-zope.event = 3.5.0-1
-zope.exceptions = 3.5.2
-zope.hookable = 3.4.1
-zope.i18n = 3.7.4
-zope.i18nmessageid = 3.5.3
-zope.interface = 3.5.2
-zope.lifecycleevent = 3.6.2
-zope.location = 3.9.0
-zope.pagetemplate = 3.5.2
-zope.processlifetime = 1.0
-zope.proxy = 3.6.1
-zope.publisher = 3.12.6
-zope.schema = 3.7.1
-zope.security = 3.8.0
-zope.size = 3.4.1
-zope.tal = 3.5.2
-zope.tales = 3.5.1
-zope.testing = 3.10.2
-zope.testrunner = 4.0.0b5
-zope.traversing = 3.13.1