Merge lp:~wgrant/turnip/no-buildout into lp:turnip

[William Grant]

Drop buildout support, make things more usable with pip, and fix "setup.py test".

Maintaining infrastructure for both buildout and pip was silly, and the Python world clearly favours pip, so let's drop buildout support and make development without it more sensible.

The pip requirements.txt still exists, and now includes pygit2 bits. test-requirements.txt installs the test dependencies. These can be maintained by installing the dependencies and running pip-tools' "pip-dump" (manually moving new test deps to test-requirements.txt if they appear).

But normal development should probably not use requirements.txt. I've added the relevant sdists to lp:lp-source-dependencies (assumed to be checked out in the download-cache subdirectory of your source tree), so one can now do an offline installation like this:

~/src/turnip$ # Prevent setup_requires like pbr from hitting PyPI.
~/src/turnip$ cat ~/.pydistutils.cfg << EOF
[easy_install]
allow_hosts = ''
find_links = file:///~/src/turnip/download-cache/dist/
EOF
~/src/turnip$ virtualenv --no-site-packages env
~/src/turnip$ env/bin/pip install --no-index --find-links=download-cache/dist -e .[test]
~/src/turnip$ env/bin/python setup.py test

It also works with --system-site-packages, though I ran into a version conflict because I had a system zope.interface installed that conflicted with the pip-chosen zope.component. "apt-get install python-zope.component" fixed that.

[Colin Watson (cjwatson)]

As discussed on IRC, we need to pull cffi, pycparser, and pygit2 out of requirements.txt (and possibly into a separate requirements file) to avoid making charm deployment depend on having a matching version of libgit2-dev on the deployment system. Other than that this seems fine.

review: Approve

[lp:~wgrant/turnip/no-buildout]

113. By William Grant on 2015-03-12

Split out pygit2 deps so the charm can use a PPA package rather than shipping libgit2-dev everywhere.

=== modified file 'Makefile'
--- Makefile	2015-02-26 21:34:02 +0000
+++ Makefile	2015-03-12 13:11:13 +0000
@@ -1,101 +1,29 @@
 # Copyright 2005-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-PYTHON = python
-
-BOOTSTRAP_BIN := bootstrap.py
-BOOTSTRAP = PYTHONPATH= $(PYTHON) $(BOOTSTRAP_BIN)
-
-BUILDOUT_BIN := bin/buildout
-BUILDOUT_CFG := buildout.cfg
-BUILDOUT = PYTHONPATH= $(BUILDOUT_BIN) -qc $(BUILDOUT_CFG)
-
-APP_PATH := ./turnip
-
-
-default: check
-
-
-build: bin/twistd
-
-
-# When a built tree is moved this updates absolute paths.
-build-update-paths:
-	$(BUILDOUT)
-
-
-check: bin/test
-	bin/test
-
-
-dist: $(BUILDOUT_BIN)
-	$(BUILDOUT) setup setup.py egg_info -r sdist
-
-
-TAGS: bin/tags
-	bin/tags --ctags-emacs
-
-
-tags: bin/tags
-	bin/tags --ctags-vi
-
-
-download-cache:
-	mkdir -p download-cache
-
-
-eggs:
-	mkdir -p eggs
-
-
-$(BUILDOUT_BIN): download-cache eggs
-	$(BOOTSTRAP) \
-	    --setup-source=download-cache/dist/ez_setup.py \
-	    --download-base=download-cache/dist \
-	    --eggs=eggs --version=1.5.2
-	touch --no-create $@
-
+PYTHON=python
+PSERVE=pserve
+FLAKE8=flake8
+
+check:
+	$(PYTHON) -m unittest discover turnip
+
+clean:
+	find turnip -name '*.py[co]' -exec rm '{}' \;
+
+dist:
+	$(PYTHON) ./setup.py sdist
+
+TAGS:
+	ctags -e -R turnip
+
+tags:
+	ctags -R turnip
+
+lint:
+	@$(FLAKE8) turnip
 
 run-api:
-	PYTHONPATH=$(APP_PATH) pserve api.ini --reload
-
-
-bin/twistd: $(BUILDOUT_BIN) $(BUILDOUT_CFG) setup.py
-	$(BUILDOUT) install runtime
-
-
-bin/test: $(BUILDOUT_BIN) $(BUILDOUT_CFG) setup.py
-	$(BUILDOUT) install test
-
-
-bin/tags: $(BUILDOUT_BIN) $(BUILDOUT_CFG) setup.py
-	$(BUILDOUT) install tags
-
-
-clean_buildout:
-	$(RM) -r bin
-	$(RM) -r parts
-	$(RM) -r develop-eggs
-	$(RM) .installed.cfg
-	$(RM) -r build
-	$(RM) -r dist
-
-
-clean_eggs:
-	$(RM) -r download-cache
-	$(RM) -r *.egg-info
-	$(RM) -r eggs
-
-
-clean: clean_buildout
-	find turnip -name '*.py[co]' -print0 | xargs -r0 $(RM)
-	find -maxdepth 1 -name '*.py[co]' -print0 | xargs -r0 $(RM)
-
-clean_all: clean_buildout clean_eggs
-
-lint:
-	@flake8 turnip
-
-.PHONY: \
-    build build-update-paths check clean clean_all clean_buildout \
-    clean_eggs default dist lint
+	$(PSERVE) api.ini --reload
+
+.PHONY: check clean dist lint run-api

=== removed directory '_bootstrap'
=== removed file '_bootstrap/COPYRIGHT.txt'
--- _bootstrap/COPYRIGHT.txt	2015-01-19 08:58:30 +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	2015-01-19 08:58:30 +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	2015-01-19 08:58:30 +0000
+++ _bootstrap/bootstrap.py	1970-01-01 00:00:00 +0000
@@ -1,277 +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, 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  # imported because of its side effects
-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'
-distribute_source = 'https://bitbucket.org/pypa/setuptools/raw/f657df1f1ed46596d236376649c99a470662b4ba/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 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.insert(0, 'buildout:accept-buildout-test-releases=true')
-
-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
-        if sys.version_info[:2] == (2, 4):
-            setup_args['version'] = '0.6.32'
-    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 not find_links and options.accept_buildout_test_releases:
-    find_links = 'http://downloads.buildout.org/'
-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 distv >= pkg_resources.parse_version('2dev'):
-                continue
-            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 += '=='+version
-else:
-    requirement += '<2dev'
-
-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
-
-# If there isn't already a command in the args, add bootstrap
-if not [a for a in args if '=' not in a]:
-    args.append('bootstrap')
-
-
-# if -c was provided, we push it back into args for buildout's main function
-if options.config_file is not None:
-    args[0:0] = ['-c', options.config_file]
-
-zc.buildout.buildout.main(args)
-if not options.eggs:  # clean up temporary egg directory
-    shutil.rmtree(eggs_dir)

=== removed symlink 'bootstrap.py'
=== target was u'_bootstrap/bootstrap.py'
=== removed file 'buildout.cfg'
--- buildout.cfg	2015-01-19 08:58:30 +0000
+++ buildout.cfg	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-[buildout]
-extends = versions.cfg
-parts =
-    runtime
-    test
-    tags
-unzip = true
-include-site-packages = false
-allowed-eggs-from-site-packages = pyyaml
-exec-sitecustomize = true
-develop = .
-download-cache = download-cache
-eggs-directory = eggs
-# Relative paths are useful when deploying built trees.
-relative-paths = true
-# Disable this option temporarily if you want buildout to find
-# software dependencies *other* than those in our download-cache.
-# Once you have the desired software, re-enable this option.
-install-from-cache = true
-
-[runtime]
-recipe = z3c.recipe.scripts
-eggs = turnip
-entry-points = twistd=twisted.scripts.twistd:run
-
-[test]
-recipe = zc.recipe.testrunner
-eggs = turnip [test]
-defaults = '--tests-pattern ^tests --exit-with-status --suite-name additional_tests'.split()
-
-[tags]
-recipe = z3c.recipe.tag:tags
-eggs = turnip

=== added file 'pygit2-requirements.txt'
--- pygit2-requirements.txt	1970-01-01 00:00:00 +0000
+++ pygit2-requirements.txt	2015-03-12 13:11:13 +0000
@@ -0,0 +1,3 @@
+cffi==0.9.1
+pycparser==2.10
+pygit2==0.21.4

=== modified file 'requirements.txt'
--- requirements.txt	2015-02-27 18:07:56 +0000
+++ requirements.txt	2015-03-12 13:11:13 +0000
@@ -1,31 +1,18 @@
-argparse==1.2.1
-cornice==0.17
-envdir==0.7
-flake8==2.3.0
+cornice==0.19.0
 lazr.sshserver==0.1.1
-mccabe==0.3
-paste==1.7.5.1
-pastedeploy==1.5.2
-pastescript==1.7.5
-pep8==1.6.1
+PasteDeploy==1.5.2
 pyasn1==0.1.7
 pycrypto==2.6.1
-pyflakes==0.8.1
-pyramid==1.5.2
-python-mimeparse==0.1.4
-pyyaml==3.11
+pyramid==1.5.4
+PyYAML==3.11
 repoze.lru==0.6
-setuptools==0.6c11
 simplejson==3.6.5
 translationstring==1.3
-twisted==13.0.0
+Twisted==15.0.0
 venusian==1.0
 waitress==0.8.9
-webob==1.4
-wsgiref==0.1.2
+WebOb==1.4
 zope.component==4.2.1
 zope.deprecation==4.1.2
 zope.event==4.0.3
-zope.exceptions==4.0.7
 zope.interface==4.1.2
-zope.testrunner==4.0.3

=== modified file 'setup.py'
--- setup.py	2015-03-11 14:09:54 +0000
+++ setup.py	2015-03-12 13:11:13 +0000
@@ -14,15 +14,28 @@
 with open(os.path.join(here, 'README')) as f:
     README = f.read()
 
-requires = ['cornice', 'lazr.sshserver', 'pygit2', 'PyYAML', 'Twisted',
-            'waitress', 'zope.interface']
-test_requires = ['fixtures', 'testtools', 'webtest']
+requires = [
+    'cornice',
+    'lazr.sshserver',
+    'pygit2>=0.21.0,<0.22.0',
+    'PyYAML',
+    'Twisted',
+    'waitress',
+    'zope.interface',
+    ]
+test_requires = [
+    'fixtures',
+    'flake8',
+    'testtools',
+    'webtest',
+    ]
 
 setup(
     name='turnip',
     version='0.1',
-    packages = ['turnip.%s' % package for package in find_packages(
-        'turnip', exclude=['*.tests', 'tests'])],
+    packages=[
+        'turnip.%s' % package for package in
+        find_packages('turnip', exclude=['*.tests', 'tests'])],
     include_package_data=True,
     zip_safe=False,
     maintainer='LAZR Developers',
@@ -31,12 +44,12 @@
     long_description=README,
     url='https://launchpad.net/turnip',
     download_url='https://launchpad.net/turnip/+download',
-    setup_requires=['PasteScript'],
     install_requires=requires,
+    tests_require=test_requires,
     extras_require=dict(
         test=test_requires),
     test_suite='turnip',
-    entry_points = """\
+    entry_points="""\
     [paste.app_factory]
     main = turnip.api:main
     """,

=== added file 'test-requirements.txt'
--- test-requirements.txt	1970-01-01 00:00:00 +0000
+++ test-requirements.txt	2015-03-12 13:11:13 +0000
@@ -0,0 +1,14 @@
+beautifulsoup4==4.3.2
+extras==0.0.3
+fixtures==1.0.0
+flake8==2.4.0
+linecache2==1.0.0
+mccabe==0.3
+pep8==1.5.7
+pyflakes==0.8.1
+python-mimeparse==0.1.4
+six==1.9.0
+testtools==1.7.1
+traceback2==1.4.0
+unittest2==1.0.1
+WebTest==2.0.18

=== removed file 'versions.cfg'
--- versions.cfg	2015-02-27 18:07:56 +0000
+++ versions.cfg	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-[buildout]
-versions = versions
-allow-picked-versions = false
-use-dependency-links = false
-
-[versions]
-# Alphabetical, case-SENSITIVE, blank line after this comment
-
-cornice = 0.17
-envdir = 0.7
-extras = 0.0.3
-fixtures = 0.3.12
-lazr.sshserver = 0.1.1
-Paste = 1.7.5.1
-PasteDeploy = 1.5.2
-PasteScript = 1.7.5
-pyasn1 = 0.1.6
-pycrypto = 2.6
-pygit2 = 0.21.4
-python-mimeparse = 0.1.4
-PyYAML = 3.11
-setuptools = 0.6c11
-testtools = 0.9.30
-Twisted = 13.0.0
-z3c.recipe.scripts = 1.0.1
-zc.buildout = 1.5.2
-zc.recipe.egg = 1.3.2
-zc.recipe.testrunner = 1.4.0
-zope.component = 3.10.0
-zope.event = 3.5.2
-zope.exceptions = 3.6.2
-zope.interface = 3.8.0
-zope.testrunner = 4.0.3