Merge lp:~cjwatson/lazr.batchnavigator/tox into lp:lazr.batchnavigator

[Colin Watson]

Add tox testing support and drop buildout.

[William Grant (wgrant)]

review: Approve (code)

=== modified file '.bzrignore'
--- .bzrignore	2011-04-05 02:29:05 +0000
+++ .bzrignore	2018-05-08 10:25:49 +0000
@@ -1,13 +1,12 @@
+*.egg-info
+*.pyc
+__pycache__
+.testrepository
+.tox
 bin
-develop-eggs
-.installed.cfg
-develop-eggs
-parts
-*.egg-info
+build
+dist
+MANIFEST
 tags
 TAGS
-build
-*.egg
-dist
-eggs
-.testrepository
+src/lazr/batchnavigator/docs/_build

=== renamed file 'HACKING.txt' => 'HACKING.rst'
--- HACKING.txt	2011-04-03 22:07:03 +0000
+++ HACKING.rst	2018-05-08 10:25:49 +0000
@@ -14,16 +14,11 @@
     along with lazr.batchnavigator. If not, see
     <http://www.gnu.org/licenses/>.
 
-This project uses zc.buildout for development.
-
 ============
 Introduction
 ============
 
-These are guidelines for hacking on the lazr.batchnavigator project.  But first,
-please see the common hacking guidelines at:
-
-    http://dev.launchpad.net/Hacking
+To run this project's tests, use `tox <https://tox.readthedocs.io/en/latest/>`.
 
 
 Getting help

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2015-07-08 11:03:54 +0000
+++ MANIFEST.in	2018-05-08 10:25:49 +0000
@@ -1,3 +1,5 @@
-recursive-include src *.txt *.pt *.zcml *.xsd
-exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
-prune _bootstrap
+include COPYING.txt HACKING.rst
+recursive-include src *.txt *.rst *.pt *.zcml *.xsd
+include src/lazr/batchnavigator/docs/Makefile
+prune src/lazr/batchnavigator/docs/_build
+exclude MANIFEST.in .bzrignore

=== renamed file 'README.txt' => 'README.rst'
=== removed directory '_bootstrap'
=== removed file '_bootstrap/COPYRIGHT.txt'
--- _bootstrap/COPYRIGHT.txt	2009-03-24 15:07:42 +0000
+++ _bootstrap/COPYRIGHT.txt	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-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.

=== removed file '_bootstrap/LICENSE.txt'
--- _bootstrap/LICENSE.txt	2009-03-24 15:07:42 +0000
+++ _bootstrap/LICENSE.txt	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-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

=== removed file '_bootstrap/bootstrap.py'
--- _bootstrap/bootstrap.py	2011-04-03 21:35:55 +0000
+++ _bootstrap/bootstrap.py	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-#!/usr/bin/env python
-##############################################################################
-#
-# Copyright (c) 2006 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.
-#
-##############################################################################
-"""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.
-
-$Id$
-"""
-
-import os, shutil, sys, tempfile, urllib2
-
-tmpeggs = tempfile.mkdtemp()
-
-is_jython = sys.platform.startswith('java')
-
-try:
-    import pkg_resources
-except ImportError:
-    ez = {}
-    exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
-                         ).read() in ez
-    ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
-
-    import pkg_resources
-
-if sys.platform == 'win32':
-    def quote(c):
-        if ' ' in c:
-            return '"%s"' % c # work around spawn lamosity on windows
-        else:
-            return c
-else:
-    def quote (c):
-        return c
-
-cmd = 'from setuptools.command.easy_install import main; main()'
-ws  = pkg_resources.working_set
-
-if is_jython:
-    import subprocess
-    
-    assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd', 
-           quote(tmpeggs), 'zc.buildout'], 
-           env=dict(os.environ,
-               PYTHONPATH=
-               ws.find(pkg_resources.Requirement.parse('setuptools')).location
-               ),
-           ).wait() == 0
-
-else:
-    assert os.spawnle(
-        os.P_WAIT, sys.executable, quote (sys.executable),
-        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout',
-        dict(os.environ,
-            PYTHONPATH=
-            ws.find(pkg_resources.Requirement.parse('setuptools')).location
-            ),
-        ) == 0
-
-ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
-import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
-shutil.rmtree(tmpeggs)

=== removed symlink 'bootstrap.py'
=== target was u'_bootstrap/bootstrap.py'
=== removed file 'buildout.cfg'
--- buildout.cfg	2011-04-03 23:07:50 +0000
+++ buildout.cfg	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-[buildout]
-parts =
-    interpreter
-    test
-    docs
-    tags
-unzip = true
-
-develop = .
-
-newest = false
-
-[test]
-recipe = zc.recipe.testrunner
-eggs = lazr.batchnavigator
-defaults = '--tests-pattern ^tests --exit-with-status --suite-name additional_tests'.split()
-
-[docs]
-recipe = z3c.recipe.sphinxdoc
-eggs = lazr.batchnavigator [docs]
-index-doc = README
-default.css =
-layout.html =
-
-[interpreter]
-recipe = zc.recipe.egg
-interpreter=py
-eggs = lazr.batchnavigator
-       docutils
-
-[tags]
-recipe = z3c.recipe.tag:tags
-eggs = lazr.batchnavigator

=== modified file 'setup.py'
--- setup.py	2015-07-08 11:04:14 +0000
+++ setup.py	2018-05-08 10:25:49 +0000
@@ -22,7 +22,7 @@
 def generate(*docname_or_string):
     res = []
     for value in docname_or_string:
-        if value.endswith('.txt'):
+        if value.endswith('.rst'):
             f = open(value)
             value = f.read()
             f.close()
@@ -34,40 +34,44 @@
 
 __version__ = open("src/lazr/batchnavigator/version.txt").read().strip()
 
+tests_require = [
+    'testtools',
+    'zope.publisher',
+    'zope.testrunner',
+    ]
+
 setup(
     name='lazr.batchnavigator',
     version=__version__,
     namespace_packages=['lazr'],
     packages=find_packages('src'),
-    package_dir={'':'src'},
+    package_dir={'': 'src'},
     include_package_data=True,
     zip_safe=False,
     maintainer='LAZR Developers',
     maintainer_email='[e-mail]',
-    description=open('README.txt').readline().strip(),
+    description=open('README.rst').readline().strip(),
     long_description=generate(
-        'src/lazr/batchnavigator/README.txt',
-        'src/lazr/batchnavigator/NEWS.txt'),
+        'src/lazr/batchnavigator/docs/index.rst',
+        'src/lazr/batchnavigator/docs/NEWS.rst'),
     license='LGPL v3',
     install_requires=[
-        'fixtures',
         'setuptools',
-        'testtools',
         'zope.cachedescriptors',
         'zope.interface',
-        'zope.publisher',
         ],
     url='https://launchpad.net/lazr.batchnavigator',
-    download_url= 'https://launchpad.net/lazr.batchnavigator/+download',
+    download_url='https://launchpad.net/lazr.batchnavigator/+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"],
+    tests_require=tests_require,
     extras_require=dict(
-        docs=['Sphinx',
-              'z3c.recipe.sphinxdoc']
+        docs=['Sphinx'],
+        test=tests_require,
     ),
     test_suite='lazr.batchnavigator.tests',
     )

=== added directory 'src/lazr/batchnavigator/docs'
=== added file 'src/lazr/batchnavigator/docs/Makefile'
--- src/lazr/batchnavigator/docs/Makefile	1970-01-01 00:00:00 +0000
+++ src/lazr/batchnavigator/docs/Makefile	2018-05-08 10:25:49 +0000
@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+SPHINXPROJ    = lazrbatchnavigator
+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

=== renamed file 'src/lazr/batchnavigator/NEWS.txt' => 'src/lazr/batchnavigator/docs/NEWS.rst'
--- src/lazr/batchnavigator/NEWS.txt	2015-04-09 13:48:10 +0000
+++ src/lazr/batchnavigator/docs/NEWS.rst	2018-05-08 10:25:49 +0000
@@ -2,6 +2,11 @@
 NEWS for lazr.batchnavigator
 ============================
 
+1.2.12
+======
+
+- Switch from buildout to tox.
+
 1.2.11 (2015-04-09)
 ===================
 

=== added file 'src/lazr/batchnavigator/docs/conf.py'
--- src/lazr/batchnavigator/docs/conf.py	1970-01-01 00:00:00 +0000
+++ src/lazr/batchnavigator/docs/conf.py	2018-05-08 10:25:49 +0000
@@ -0,0 +1,171 @@
+# -*- coding: utf-8 -*-
+#
+# lazr.batchnavigator documentation build configuration file, created by
+# sphinx-quickstart on Tue May  8 08:57:03 2018.
+#
+# 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'lazr.batchnavigator'
+copyright = u'2004-2018, 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 = 'lazrbatchnavigatordoc'
+
+
+# -- 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, 'lazrbatchnavigator.tex', u'lazr.batchnavigator 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, 'lazrbatchnavigator', u'lazr.batchnavigator 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, 'lazrbatchnavigator', u'lazr.batchnavigator Documentation',
+     author, 'lazrbatchnavigator', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+
+

=== renamed file 'src/lazr/batchnavigator/README.txt' => 'src/lazr/batchnavigator/docs/index.rst'
--- src/lazr/batchnavigator/README.txt	2011-04-06 03:14:16 +0000
+++ src/lazr/batchnavigator/docs/index.rst	2018-05-08 10:25:49 +0000
@@ -24,17 +24,17 @@
 It uses four query/POST arguments to control the batching:
 
   - memo: A record of the underlying storage index pointer for the position of
-          the batch.
+    the batch.
   - direction: Indicates whether the memo is at the start or end of the batch.
   - start: Cosmetic - used to calculate the apparent location (but note that
-           due to the concurrent nature of repeated visits to batches that the
-           true offset may differ - however the collection won't skip or show
-           items twice. For compatibility with saved URLs, if memo and
-           direction are both missing then start is used to do list slicing
-           into the collection.
+    due to the concurrent nature of repeated visits to batches that the
+    true offset may differ - however the collection won't skip or show
+    items twice. For compatibility with saved URLs, if memo and
+    direction are both missing then start is used to do list slicing
+    into the collection.
   - batch: Controls the amount of items we are showing per batch. It will only
-           appear if it's different from the default value set when the batch
-           is created.
+    appear if it's different from the default value set when the batch
+    is created.
 
 These values can be overriden in the request, unless you also pass
 force_start=True, which will make the start argument (again, defaulting to 0)
@@ -524,5 +524,4 @@
 .. toctree::
    :glob:
 
-   *
-   docs/*
+   NEWS

=== modified file 'src/lazr/batchnavigator/tests/test_docs.py'
--- src/lazr/batchnavigator/tests/test_docs.py	2009-03-23 16:14:28 +0000
+++ src/lazr/batchnavigator/tests/test_docs.py	2018-05-08 10:25:49 +0000
@@ -17,14 +17,13 @@
 
 __metaclass__ = type
 __all__ = [
-    'additional_tests',
+    'load_tests',
     ]
 
 import atexit
 import doctest
 import os
 import pkg_resources
-import unittest
 
 DOCTEST_FLAGS = (
     doctest.ELLIPSIS |
@@ -32,19 +31,18 @@
     doctest.REPORT_NDIFF)
 
 
-def additional_tests():
-    "Run the doc tests (README.txt and docs/*, if any exist)"
-    doctest_files = [
-        os.path.abspath(
-            pkg_resources.resource_filename('lazr.batchnavigator', 'README.txt'))]
+def load_tests(loader, tests, pattern):
+    """Load all the doctests."""
+    atexit.register(pkg_resources.cleanup_resources)
+    doctest_files = []
     if pkg_resources.resource_exists('lazr.batchnavigator', 'docs'):
-        for name in pkg_resources.resource_listdir('lazr.batchnavigator', 'docs'):
-            if name.endswith('.txt'):
+        for name in pkg_resources.resource_listdir(
+                'lazr.batchnavigator', 'docs'):
+            if name.endswith('.rst'):
                 doctest_files.append(
                     os.path.abspath(
                         pkg_resources.resource_filename(
                             'lazr.batchnavigator', 'docs/%s' % name)))
-    kwargs = dict(module_relative=False, optionflags=DOCTEST_FLAGS)
-    atexit.register(pkg_resources.cleanup_resources)
-    return unittest.TestSuite((
-        doctest.DocFileSuite(*doctest_files, **kwargs)))
+    tests.addTest(doctest.DocFileSuite(
+        *doctest_files, module_relative=False, optionflags=DOCTEST_FLAGS))
+    return tests

=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2018-05-08 10:25:49 +0000
@@ -0,0 +1,17 @@
+[tox]
+envlist =
+    py27,docs
+
+[testenv]
+commands =
+    zope-testrunner --test-path src --tests-pattern ^tests {posargs}
+deps =
+    .[test]
+
+[testenv:docs]
+basepython =
+    python2.7
+commands =
+    sphinx-build -b html -d src/lazr/batchnavigator/docs/_build/doctrees src/lazr/batchnavigator/docs src/lazr/batchnavigator/docs/_build/html
+deps =
+    .[docs]