Merge lp:~james-w/pkgme/buildout into lp:pkgme

[James Westby]

Re-instate buildout.

Hi,

This re-instates the buildout code for pkgme.

Thanks,

James

[lp:~james-w/pkgme/buildout]

134. By James Westby on 2012-08-24

Output the download-cache operations to the log file too.

[Jonathan Lange (jml)]

Hurrah!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-08-03 14:30:04 +0000
+++ .bzrignore	2012-08-24 19:57:18 +0000
@@ -6,3 +6,9 @@
 fixtures-0.3.5-py2.6.egg
 bzr-orphans
 virtualenv
+.installed.cfg
+./bin
+develop-eggs
+download-cache
+eggs
+parts

=== modified file '.testr.conf'
--- .testr.conf	2012-08-03 14:30:04 +0000
+++ .testr.conf	2012-08-24 19:57:18 +0000
@@ -1,3 +1,3 @@
 [DEFAULT]
-test_command=PYTHONPATH=`pwd` python -m subunit.run $IDLIST
+test_command=./bin/py -m subunit.run $IDLIST
 test_id_list_default=pkgme.tests.test_suite

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2012-08-24 19:57:18 +0000
@@ -0,0 +1,18 @@
+# Copyright (C) 2012  Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+include buildout.mk
+include sphinx.mk
+
+TEST_COMMAND=$(PY) -m testtools.run pkgme.tests.test_suite

=== modified file 'README.txt'
--- README.txt	2012-08-03 14:30:04 +0000
+++ README.txt	2012-08-24 19:57:18 +0000
@@ -34,16 +34,34 @@
 Developers
 ==========
 
-Right now, the best way to hack on ``pkgme`` is in a virtualenv_.  This allows
-you to hack on ``pkgme`` in a clean environment, without touching or changing
-your system Python.  You will need access to the internet in order to install
-``pkgme`` into your virtualenv.  On Debian/Ubuntu, make sure you have the
-`python-virtualenv` package installed, then do the following::
-
-    % virtualenv /arbitrary/path
-    % source /arbitrary/path/bin/activate
-    % python setup.py develop
-    <hack>
+To get a development environment set up (using ``buildout``) run::
+
+   $ make bootstrap
+
+You can then run the tests with
+
+   $ make check
+
+The bootstrap will fail if you have a system-wide install of buildout that
+is the same version as the one in use by this project. (You will see
+``DistributionNotFound: zc.buildout==<version>``). If you encounter
+that then you can either remove the site-wide install, or use a virtualenv
+to run the bootstrap step.
+
+You can get a shell to try code interactively by running ``./bin/py``.
+
+Buildout uses two directories as caches that can be shared between branches.
+The first is the ``download-cache`` directory. This contains all of the
+distributions of the Python dependencies. You can get this from
+``lp:ca-download-cache``, but the Makefile will grab it for you.
+
+The other directory is the ``eggs`` directory that holds built versions
+of the dependencies.
+
+The default for both of these is to symlink them from the parent directory,
+but if you wish to put them somewhere else you can set the locations with
+the ``CA_DOWNLOAD_CACHE_DIR`` and ``CA_EGGS_DIR`` environment variables.
+
 
 If you want to override the default location of the backends, set the
 environment variable ``$PKGME_BACKEND_PATHS``.  This is a colon-separated list
@@ -51,18 +69,7 @@
 
     % export PKGME_BACKEND_PATHS=/pkgme/foo-backends:/pkgme/bar-backends
     % cd my-about-to-be-packaged-code
-    % pkgme
-
-When you're done, just run the ``deactivate`` command and blow away
-`/arbitrary/path`.
-
-
-Testing
--------
-
-While in your virtualenv, you can run the full test suite like so::
-
-    % python setup.py test
+    % ~/path/to/branch/bin/pkgme
 
 
 Building the documentation

=== added file 'bootstrap.py'
--- bootstrap.py	1970-01-01 00:00:00 +0000
+++ bootstrap.py	2012-08-24 19:57:18 +0000
@@ -0,0 +1,262 @@
+##############################################################################
+#
+# 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'
+
+
+# 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)

=== added file 'buildout.cfg'
--- buildout.cfg	1970-01-01 00:00:00 +0000
+++ buildout.cfg	2012-08-24 19:57:18 +0000
@@ -0,0 +1,36 @@
+# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+[buildout]
+parts =
+    scripts
+unzip = true
+eggs-directory = eggs
+download-cache = download-cache
+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, reenable this option (and check in the new software to
+# lp:ca-dependencies if this is going to be reviewed/merged/deployed.)
+install-from-cache = true
+
+# This also will need to be temporarily disabled or changed for package
+# upgrades.  Newly-added packages should also add their desired version number
+# to versions.cfg.
+extends = versions.cfg
+
+allow-picked-versions = false
+
+prefer-final = true
+
+develop = .
+
+[scripts]
+recipe = z3c.recipe.scripts
+# Test dependencies get added here
+# python-subunit is needed for those that use testr
+eggs = pkgme
+       python-subunit
+include-site-packages = false
+interpreter = py

=== added file 'buildout.mk'
--- buildout.mk	1970-01-01 00:00:00 +0000
+++ buildout.mk	2012-08-24 19:57:18 +0000
@@ -0,0 +1,81 @@
+# Copyright (C) 2012  Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+EXTERNAL_PY?=python2.7
+PY=./bin/py
+
+EXTERNAL_BUILDOUT?=$(EXTERNAL_PY) bootstrap.py
+BUILDOUT=./bin/buildout
+
+CA_EGGS_DIR?=../eggs
+CA_DOWNLOAD_CACHE_DIR?=../download-cache
+
+clean:
+	$(RM) -r bin/buildout
+	$(RM) -r bin/py
+	$(RM) -r bin/discover
+	$(RM) -r develop-eggs
+	$(RM) -r parts
+	$(RM) -r .installed.cfg
+ifeq ($(CA_EGGS_DIR),eggs)
+	$(RM) -r eggs
+else
+	$(RM) eggs
+endif
+ifeq ($(CA_DOWNLOAD_CACHE_DIR),download-cache)
+	$(RM) -r download-cache
+else
+	$(RM) download-cache
+endif
+
+download-cache:
+ifeq ($(CA_DOWNLOAD_CACHE_DIR),$@)
+	bzr checkout lp:ca-download-cache $@
+else
+	[ -d $(CA_DOWNLOAD_CACHE_DIR) ] || bzr checkout lp:ca-download-cache $(CA_DOWNLOAD_CACHE_DIR)
+	ln -s $(CA_DOWNLOAD_CACHE_DIR) $@
+endif
+
+eggs:
+ifeq ($(CA_EGGS_DIR),$@)
+	mkdir $@
+else
+	[ -d $(CA_EGGS_DIR) ] || mkdir $(CA_EGGS_DIR)
+	ln -s $(CA_EGGS_DIR) $@
+endif
+
+$(BUILDOUT): bootstrap.py buildout.cfg setup.py versions.cfg eggs download-cache
+	$(EXTERNAL_BUILDOUT) --distribute --version 1.5.1 \
+				--download-base=download-cache/dist --eggs=eggs \
+				--setup-source distribute_setup.py
+	touch --no-create $@
+
+$(PY): $(BUILDOUT)
+	$(BUILDOUT)
+	touch --no-create $@
+
+bootstrap: clean $(PY)
+
+test: $(PY)
+	$(TEST_COMMAND)
+
+check: test
+
+# Can be used to update the dependencies when you change something
+# in versions.cfg.
+update-deps: $(BUILDOUT)
+	$(BUILDOUT) buildout:install-from-cache=false buildout:allow-picked-versions=true
+
+.PHONY: bootstrap check clean test update-deps
+.DEFAULT_GOAL := $(PY)

=== modified file 'distribute_setup.py'
--- distribute_setup.py	2012-08-03 14:30:04 +0000
+++ distribute_setup.py	2012-08-24 19:57:18 +0000
@@ -46,7 +46,7 @@
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.10"
+DEFAULT_VERSION = "0.6.28"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
@@ -63,7 +63,7 @@
 """ % SETUPTOOLS_FAKED_VERSION
 
 
-def _install(tarball):
+def _install(tarball, install_args=()):
     # extracting the tarball
     tmpdir = tempfile.mkdtemp()
     log.warn('Extracting in %s', tmpdir)
@@ -81,7 +81,7 @@
 
         # installing
         log.warn('Installing Distribute')
-        if not _python_cmd('setup.py', 'install'):
+        if not _python_cmd('setup.py', 'install', *install_args):
             log.warn('Something went wrong during the installation.')
             log.warn('See the error message above.')
     finally:
@@ -144,7 +144,7 @@
         except ImportError:
             return _do_download(version, download_base, to_dir, download_delay)
         try:
-            pkg_resources.require("distribute>="+version)
+            pkg_resources.require("distribute>=" + version)
             return
         except pkg_resources.VersionConflict:
             e = sys.exc_info()[1]
@@ -167,6 +167,7 @@
         if not no_fake:
             _create_fake_setuptools_pkg_info(to_dir)
 
+
 def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                         to_dir=os.curdir, delay=15):
     """Download distribute from a specified location and return its filename
@@ -204,6 +205,31 @@
     return os.path.realpath(saveto)
 
 
+def _no_sandbox(function):
+    def __no_sandbox(*args, **kw):
+        try:
+            from setuptools.sandbox import DirectorySandbox
+            if not hasattr(DirectorySandbox, '_old'):
+                def violation(*args):
+                    pass
+                DirectorySandbox._old = DirectorySandbox._violation
+                DirectorySandbox._violation = violation
+                patched = True
+            else:
+                patched = False
+        except ImportError:
+            patched = False
+
+        try:
+            return function(*args, **kw)
+        finally:
+            if patched:
+                DirectorySandbox._violation = DirectorySandbox._old
+                del DirectorySandbox._old
+
+    return __no_sandbox
+
+
 def _patch_file(path, content):
     """Will backup the file then patch it"""
     existing_content = open(path).read()
@@ -220,38 +246,20 @@
         f.close()
     return True
 
+_patch_file = _no_sandbox(_patch_file)
+
 
 def _same_content(path, content):
     return open(path).read() == content
 
-def _no_sandbox(function):
-    def __no_sandbox(*args, **kw):
-        try:
-            from setuptools.sandbox import DirectorySandbox
-            def violation(*args):
-                pass
-            DirectorySandbox._old = DirectorySandbox._violation
-            DirectorySandbox._violation = violation
-            patched = True
-        except ImportError:
-            patched = False
-
-        try:
-            return function(*args, **kw)
-        finally:
-            if patched:
-                DirectorySandbox._violation = DirectorySandbox._old
-                del DirectorySandbox._old
-
-    return __no_sandbox
-
-@_no_sandbox
+
 def _rename_path(path):
     new_name = path + '.OLD.%s' % time.time()
     log.warn('Renaming %s into %s', path, new_name)
     os.rename(path, new_name)
     return new_name
 
+
 def _remove_flat_installation(placeholder):
     if not os.path.isdir(placeholder):
         log.warn('Unkown installation at %s', placeholder)
@@ -285,13 +293,15 @@
                      'Setuptools distribution', element)
     return True
 
+_remove_flat_installation = _no_sandbox(_remove_flat_installation)
+
 
 def _after_install(dist):
     log.warn('After install bootstrap.')
     placeholder = dist.get_command_obj('install').install_purelib
     _create_fake_setuptools_pkg_info(placeholder)
 
-@_no_sandbox
+
 def _create_fake_setuptools_pkg_info(placeholder):
     if not placeholder or not os.path.exists(placeholder):
         log.warn('Could not find the install location')
@@ -304,6 +314,9 @@
         log.warn('%s already exists', pkg_info)
         return
 
+    if not os.access(pkg_info, os.W_OK):
+        log.warn("Don't have permissions to write %s, skipping", pkg_info)
+
     log.warn('Creating %s', pkg_info)
     f = open(pkg_info, 'w')
     try:
@@ -319,6 +332,11 @@
     finally:
         f.close()
 
+_create_fake_setuptools_pkg_info = _no_sandbox(
+    _create_fake_setuptools_pkg_info
+)
+
+
 def _patch_egg_dir(path):
     # let's check if it's already patched
     pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
@@ -337,6 +355,8 @@
         f.close()
     return True
 
+_patch_egg_dir = _no_sandbox(_patch_egg_dir)
+
 
 def _before_install():
     log.warn('Before install bootstrap.')
@@ -346,7 +366,7 @@
 def _under_prefix(location):
     if 'install' not in sys.argv:
         return True
-    args = sys.argv[sys.argv.index('install')+1:]
+    args = sys.argv[sys.argv.index('install') + 1:]
     for index, arg in enumerate(args):
         for option in ('--root', '--prefix'):
             if arg.startswith('%s=' % option):
@@ -354,10 +374,10 @@
                 return location.startswith(top_dir)
             elif arg == option:
                 if len(args) > index:
-                    top_dir = args[index+1]
+                    top_dir = args[index + 1]
                     return location.startswith(top_dir)
-            elif option == '--user' and USER_SITE is not None:
-                return location.startswith(USER_SITE)
+        if arg == '--user' and USER_SITE is not None:
+            return location.startswith(USER_SITE)
     return True
 
 
@@ -371,11 +391,14 @@
         return
     ws = pkg_resources.working_set
     try:
-        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools',
-                                  replacement=False))
+        setuptools_dist = ws.find(
+            pkg_resources.Requirement.parse('setuptools', replacement=False)
+            )
     except TypeError:
         # old distribute API
-        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
+        setuptools_dist = ws.find(
+            pkg_resources.Requirement.parse('setuptools')
+        )
 
     if setuptools_dist is None:
         log.warn('No setuptools distribution found')
@@ -416,6 +439,10 @@
 def _relaunch():
     log.warn('Relaunching...')
     # we have to relaunch the process
+    # pip marker to avoid a relaunch bug
+    _cmd = ['-c', 'install', '--single-version-externally-managed']
+    if sys.argv[:3] == _cmd:
+        sys.argv[0] = 'setup.py'
     args = [sys.executable] + sys.argv
     sys.exit(subprocess.call(args))
 
@@ -440,7 +467,7 @@
             # Extract directories with a safe mode.
             directories.append(tarinfo)
             tarinfo = copy.copy(tarinfo)
-            tarinfo.mode = 448 # decimal for oct 0700
+            tarinfo.mode = 448  # decimal for oct 0700
         self.extract(tarinfo, path)
 
     # Reverse sort directories.
@@ -467,10 +494,21 @@
                 self._dbg(1, "tarfile: %s" % e)
 
 
+def _build_install_args(argv):
+    install_args = []
+    user_install = '--user' in argv
+    if user_install and sys.version_info < (2, 6):
+        log.warn("--user requires Python 2.6 or later")
+        raise SystemExit(1)
+    if user_install:
+        install_args.append('--user')
+    return install_args
+
+
 def main(argv, version=DEFAULT_VERSION):
     """Install or upgrade setuptools and EasyInstall"""
     tarball = download_setuptools()
-    _install(tarball)
+    _install(tarball, _build_install_args(argv))
 
 
 if __name__ == '__main__':

=== modified file 'setup.py'
--- setup.py	2012-08-03 15:36:41 +0000
+++ setup.py	2012-08-24 19:57:18 +0000
@@ -65,7 +65,6 @@
     url='http://launchpad.net/pkgme',
     test_suite='pkgme.tests',
     install_requires = [
-        'argparse',
         'Cheetah',
         'python_debian',
         'fixtures',

=== renamed file 'Makefile' => 'sphinx.mk'
--- Makefile	2012-08-03 14:30:04 +0000
+++ sphinx.mk	2012-08-24 19:57:18 +0000
@@ -11,9 +11,9 @@
 PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
-.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
+.PHONY: sphinx-help clean-sphinx html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
 
-help:
+sphinx-help:
 	@echo "Please use \`make <target>' where <target> is one of"
 	@echo "  html      to make standalone HTML files"
 	@echo "  dirhtml   to make HTML files named index.html in directories"
@@ -26,7 +26,7 @@
 	@echo "  linkcheck to check all external links for integrity"
 	@echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
 
-clean:
+clean-sphinx:
 	-rm -rf _build/*
 
 html:

=== modified file 'tarmac_tests.sh'
--- tarmac_tests.sh	2012-08-03 14:30:04 +0000
+++ tarmac_tests.sh	2012-08-24 19:57:18 +0000
@@ -2,7 +2,10 @@
 
 set -e
 
-virtualenv --no-site-packages virtualenv > log
-. virtualenv/bin/activate >> log
-python setup.py develop >> log
-python -m testtools.run pkgme.tests.test_suite
+LOG_FILE=log
+
+echo "Running pkgme tests in tarmac" > $LOG_FILE
+make download-cache >> $LOG_FILE
+bzr up download-cache >> $LOG_FILE
+make bootstrap >> $LOG_FILE
+make test

=== added file 'versions.cfg'
--- versions.cfg	1970-01-01 00:00:00 +0000
+++ versions.cfg	2012-08-24 19:57:18 +0000
@@ -0,0 +1,34 @@
+[buildout]
+versions = versions
+
+# Update the version number here to upgrade to a new version.
+# You'll likely want to run 'make update-deps' when you have
+# changed something here.
+#
+# If you are forking a dependency then make sure you include a pointer
+# to the branch where the fork is maintained.
+#
+# Alphabetical, case-insensitive, please! :-)
+[versions]
+Cheetah = 2.4.4
+distribute = 0.6.28
+fixtures = 0.3.9
+httplib2 = 0.7.4
+keyring = 0.9.2
+launchpadlib = 1.10.2
+lazr.authentication = 0.1.2
+lazr.restfulclient = 0.13.0
+lazr.uri = 1.0.3
+Markdown = 2.2.0
+oauth = 1.0.1
+python-debian = 0.1.16
+python-subunit = 0.0.8
+simplejson = 2.6.1
+testresources = 0.2.5
+testtools = 0.9.15
+wadllib = 1.3.1
+wsgi-intercept = 0.5.1
+z3c.recipe.scripts = 1.0.1
+zc.buildout = 1.5.1
+zc.recipe.egg = 1.3.2
+zope.interface = 4.0.1