Merge lp:~kelvin.li/isitdeployable/deployable-wheels-supports into lp:isitdeployable

[Kelvin Li]

1. refactoring isitdeployable to work with charm/spec.
2. Removed the buildout, use virtualenv wheels and cm to manage the dependencies.
3. use single gunicorn to host all the assets and combo assets
4. added the oops

1. refactoring isitdeployable to work with charm/spec.
2. Removed the buildout, use virtualenv wheels and cm to manage the dependencies.
3. use single gunicorn to host all the assets and combo assets
4. added the oops

[Kelvin Li (kelvin.li)]

As we just changed the trunk from lp:~james-w/isitdeployable/trunk to lp:isitdeployable, (due to change the owner from jamesw to ~ubuntuone-pqm-team)

This is a duplicate MP from: https://code.launchpad.net/~kelvin.li/isitdeployable/deployable-wheels-supports/+merge/283844

This one is trying to benefit from the tarmac job to be auto merged.

[Kelvin Li (kelvin.li)]

Due to Michael already reviewed in https://code.launchpad.net/~kelvin.li/isitdeployable/deployable-wheels-supports/+merge/283844 for the same changes.

Self approved.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~kelvin.li/isitdeployable/deployable-wheels-supports into lp:isitdeployable failed. Below is the output from the failed tests.

echo 'creating new virtualenv...'
creating new virtualenv...
virtualenv --clear --system-site-packages /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv
Not deleting /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin
New python executable in /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/python
Installing setuptools, pip...done.
/usr/lib/config-manager/cm.py update config-manager.txt
#touch branches/last_build
[ -d branches/wheels ] && (cd branches/wheels && bzr pull) || (bzr branch lp:~ubuntuone-pqm-team/isitdeployable/dependencies branches/wheels)
bzr version-info --format=python > lib/versioninfo.py
/mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/python /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/pip install -U pip --find-links=branches/wheels --no-index
Ignoring indexes: https://pypi.python.org/simple/
Unpacking ./branches/wheels/pip-8.0.0-py2.py3-none-any.whl
Installing collected packages: pip
  Found existing installation: pip 1.5.4
    Uninstalling pip:
      Successfully uninstalled pip
Successfully installed pip
Cleaning up...
/mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/python /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/pip install --no-binary django --find-links=branches/wheels --no-index -r requirements.txt
Ignoring indexes: https://pypi.python.org/simple
Collecting amqp==1.4.1 (from -r requirements.txt (line 1))
Requirement already satisfied (use --upgrade to upgrade): anyjson==0.3.3 in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 2))
Requirement already satisfied (use --upgrade to upgrade): BeautifulSoup==3.2.1 in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 3))
Collecting billiard==3.3.0.14 (from -r requirements.txt (line 4))
Collecting bson==0.3.3 (from -r requirements.txt (line 5))
Collecting celery==3.1.8 (from -r requirements.txt (line 6))
Collecting convoy==0.2.4 (from -r requirements.txt (line 7))
Collecting Django==1.5.1 (from -r requirements.txt (line 8))
Collecting django-celery==3.1.1 (from -r requirements.txt (line 9))
Collecting django-debug-toolbar==0.9.4 (from -r requirements.txt (line 10))
Collecting django-devserver==0.7.0 (from -r requirements.txt (line 11))
Collecting django-factory==0.10 (from -r requirements.txt (line 12))
Collecting django-kombu==0.9.4 (from -r requirements.txt (line 13))
Collecting django-openid-auth==0.4 (from -r requirements.txt (line 14))
Collecting django-ordered-model==0.3.0.jw1 (from -r requirements.txt (line 16))
Collecting django-picklefield==0.2.1 (from -r requirements.txt (line 17))
Collecting django-pgtools==0.2 (from -r requirements.txt (line 18))
Collecting django-waffle==0.9.2 (from -r requirements.txt (line 19))
Collecting gorun==1.7 (from -r requirements.txt (line 20))
Collecting gunicorn==19.3.0 (from -r requirements.txt (line 21))
Collecting jsmin==2.0.2 (from -r requirements.txt (line 22))
Collecting keyring==0.9.2 (from -r requirements.txt (line 23))
Collecting kombu==3.0.10 (from -r requ...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~kelvin.li/isitdeployable/deployable-wheels-supports into lp:isitdeployable failed. Below is the output from the failed tests.

echo 'creating new virtualenv...'
creating new virtualenv...
virtualenv --clear --system-site-packages /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv
Not deleting /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin
New python executable in /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/python
Installing setuptools, pip...done.
/usr/lib/config-manager/cm.py update config-manager.txt
#touch branches/last_build
[ -d branches/wheels ] && (cd branches/wheels && bzr pull) || (bzr branch lp:~ubuntuone-pqm-team/isitdeployable/dependencies branches/wheels)
bzr version-info --format=python > lib/versioninfo.py
/mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/python /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/pip install -U pip --find-links=branches/wheels --no-index
Ignoring indexes: https://pypi.python.org/simple/
Unpacking ./branches/wheels/pip-8.0.0-py2.py3-none-any.whl
Installing collected packages: pip
  Found existing installation: pip 1.5.4
    Uninstalling pip:
      Successfully uninstalled pip
Successfully installed pip
Cleaning up...
/mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/python /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/pip install --no-binary django --find-links=branches/wheels --no-index -r requirements.txt
Ignoring indexes: https://pypi.python.org/simple
Collecting amqp==1.4.1 (from -r requirements.txt (line 1))
Requirement already satisfied (use --upgrade to upgrade): anyjson==0.3.3 in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 2))
Requirement already satisfied (use --upgrade to upgrade): BeautifulSoup==3.2.1 in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 3))
Requirement already satisfied (use --upgrade to upgrade): billiard>=3.3.0.14 in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 4))
Collecting bson==0.3.3 (from -r requirements.txt (line 5))
Collecting celery==3.1.8 (from -r requirements.txt (line 6))
Collecting convoy==0.2.4 (from -r requirements.txt (line 7))
Collecting Django==1.5.1 (from -r requirements.txt (line 8))
Collecting django-celery==3.1.1 (from -r requirements.txt (line 9))
Collecting django-debug-toolbar==0.9.4 (from -r requirements.txt (line 10))
Collecting django-devserver==0.7.0 (from -r requirements.txt (line 11))
Collecting django-factory==0.10 (from -r requirements.txt (line 12))
Collecting django-kombu==0.9.4 (from -r requirements.txt (line 13))
Collecting django-openid-auth==0.4 (from -r requirements.txt (line 14))
Collecting django-ordered-model==0.3.0.jw1 (from -r requirements.txt (line 16))
Collecting django-picklefield==0.2.1 (from -r requirements.txt (line 17))
Collecting django-pgtools==0.2 (from -r requirements.txt (line 18))
Collecting django-waffle==0.9.2 (from -r requirements.txt (line 19))
Collecting gorun==1.7 (from -r requirements.txt (line 20))
Collecting gunicorn==19.3.0 (from -r requirements.txt (line 21))
Collecting jsmin==2.0.2 (from -r requirements.txt (line 22))
Collecting keyring...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~kelvin.li/isitdeployable/deployable-wheels-supports into lp:isitdeployable failed. Below is the output from the failed tests.

echo 'creating new virtualenv...'
creating new virtualenv...
virtualenv --clear --system-site-packages /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv
Not deleting /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin
New python executable in /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/python
Installing setuptools, pip...done.
/usr/lib/config-manager/cm.py update config-manager.txt
#touch branches/last_build
[ -d branches/wheels ] && (cd branches/wheels && bzr pull) || (bzr branch lp:~ubuntuone-pqm-team/isitdeployable/dependencies branches/wheels)
bzr version-info --format=python > lib/versioninfo.py
/mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/python /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/pip install -U pip --find-links=branches/wheels --no-index
Ignoring indexes: https://pypi.python.org/simple/
Unpacking ./branches/wheels/pip-8.0.0-py2.py3-none-any.whl
Installing collected packages: pip
  Found existing installation: pip 1.5.4
    Uninstalling pip:
      Successfully uninstalled pip
Successfully installed pip
Cleaning up...
/mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/python /mnt/tarmac/cache/isitdeployable/merges/trunk/virtualenv/bin/pip install --no-binary django --find-links=branches/wheels --no-index -r requirements.txt
Ignoring indexes: https://pypi.python.org/simple
Collecting amqp==1.4.1 (from -r requirements.txt (line 1))
Requirement already satisfied (use --upgrade to upgrade): anyjson==0.3.3 in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 2))
Requirement already satisfied (use --upgrade to upgrade): BeautifulSoup==3.2.1 in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 3))
Requirement already satisfied (use --upgrade to upgrade): billiard>=3.3.0.14 in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 4))
Collecting bson==0.3.3 (from -r requirements.txt (line 5))
Collecting celery==3.1.8 (from -r requirements.txt (line 6))
Collecting convoy==0.2.4 (from -r requirements.txt (line 7))
Collecting Django==1.5.1 (from -r requirements.txt (line 8))
Collecting django-celery==3.1.1 (from -r requirements.txt (line 9))
Collecting django-debug-toolbar==0.9.4 (from -r requirements.txt (line 10))
Collecting django-devserver==0.7.0 (from -r requirements.txt (line 11))
Collecting django-factory==0.10 (from -r requirements.txt (line 12))
Collecting django-kombu==0.9.4 (from -r requirements.txt (line 13))
Collecting django-openid-auth==0.4 (from -r requirements.txt (line 14))
Collecting django-ordered-model==0.3.0.jw1 (from -r requirements.txt (line 16))
Collecting django-picklefield==0.2.1 (from -r requirements.txt (line 17))
Collecting django-pgtools==0.2 (from -r requirements.txt (line 18))
Collecting django-waffle==0.9.2 (from -r requirements.txt (line 19))
Collecting gorun==1.7 (from -r requirements.txt (line 20))
Requirement already satisfied (use --upgrade to upgrade): gunicorn>=17.5 in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 21)...

[lp:~kelvin.li/isitdeployable/deployable-wheels-supports]

251. By Kelvin Li on 2016-01-27

continue fixing the requirements conflicts on CI env

=== modified file '.bzrignore'
--- .bzrignore	2014-03-28 20:01:18 +0000
+++ .bzrignore	2016-01-27 16:38:37 +0000
@@ -1,4 +1,4 @@
-branches
+branches/*
 test.db
 ./.installed.cfg
 ./bin
@@ -15,3 +15,8 @@
 ./tmp/supervisor-childlogs/*
 ./.sass-cache
 ./revtracker/static/css/*
+./virtualenv
+./lib/versioninfo.py
+./static
+./logs/*
+

=== modified file 'Makefile'
--- Makefile	2014-03-30 03:19:53 +0000
+++ Makefile	2016-01-27 16:38:37 +0000
@@ -12,15 +12,118 @@
 # 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 makefiles/buildout.mk
-include makefiles/deploy.mk
-include makefiles/services.mk
 include makefiles/css.mk
 include makefiles/gem.mk
 include makefiles/js.mk
 
 
-MANAGE=$(PY) django_project/manage.py
-TEST_COMMAND=$(MANAGE) test revtracker
+HERE := $(shell pwd)
+PYTHONPATH := ${HERE}/revtracker:${HERE}/lib:${HERE}:${PYTHONPATH}
+
+CM ?= /usr/lib/config-manager/cm.py
+CONFIGMANAGER = config-manager.txt
+PYTHON = $(VIRTUALENV_DIR)/bin/python
+# use env's python to run pip in order to overcome shebang's max line length limitation
+PIP = $(PYTHON) $(VIRTUALENV_DIR)/bin/pip
+
+WHEELS_BRANCH_URL ?= lp:~ubuntuone-pqm-team/isitdeployable/dependencies
+WHEELS_DIR = branches/wheels
+
+DJANGO_MANAGE=$(PYTHON) django_project/manage.py
+TEST_COMMAND=$(DJANGO_MANAGE) test revtracker
+
+CONN_CHECK_CONFIG_PATH ?= /tmp/deployable_conn_check_config.yaml
 
 TMP_DIR = tmp
+
+JUJU_ENV ?= local
+JUJU_REPO ?= ../.juju-repo
+PROJECT_NAME = deployable
+
+# Create archives in labelled directories (ie. r27/deployable.tbz2)
+TARBALL_BUILD_LABEL ?= r$(shell bzr revno)
+TARBALL_FILE_NAME = deployable.tbz2
+TARBALL_BUILDS_DIR ?= $(JUJU_REPO)/builds
+TARBALL_BUILD_DIR = $(TARBALL_BUILDS_DIR)/$(TARBALL_BUILD_LABEL)
+TARBALL_BUILD_PATH = $(TARBALL_BUILD_DIR)/$(TARBALL_FILE_NAME)
+
+VIRTUALENV_DIR ?= ${HERE}/virtualenv
+VIRTUALENV_BIN := ${VIRTUALENV_DIR}/bin
+
+
+$(VIRTUALENV_DIR):
+	echo 'creating new virtualenv...'
+	virtualenv --clear --system-site-packages $(VIRTUALENV_DIR)
+
+clean-virtualenv:
+	echo 'cleaning virtualenv...'
+	rm -rf $(VIRTUALENV_DIR)
+
+version:
+	bzr version-info --format=python > lib/versioninfo.py
+
+branches/last_build: $(CONFIGMANAGER)
+	$(CM) update $(CONFIGMANAGER)
+	#touch $@
+
+# use the flag file to avoid re-run config-manager if nothing changed
+fetch-sourcedeps: branches/last_build wheels version
+
+sourcedeps: fetch-sourcedeps install-wheels
+
+bootstrap: $(VIRTUALENV_DIR) sourcedeps
+
+
+### wheels ###
+wheels:
+	[ -d $(WHEELS_DIR)  ] && (cd $(WHEELS_DIR) && bzr pull) || (bzr branch $(WHEELS_BRANCH_URL) $(WHEELS_DIR))
+
+update-wheels: ARGS=-r requirements-devel.txt
+update-wheels: $(VIRTUALENV_DIR)
+	$(PIP) wheel -w $(WHEELS_DIR) -f $(WHEELS_DIR) $(ARGS)
+
+install-wheels: ARGS=-r requirements.txt
+install-wheels: $(VIRTUALENV_DIR)
+	$(PIP) install -U pip --find-links=$(WHEELS_DIR) --no-index
+	$(PIP) install --no-binary django --find-links=$(WHEELS_DIR) --no-index $(ARGS)
+
+install-wheels-dev: $(VIRTUALENV_DIR) install-wheels
+	$(MAKE) install-wheels ARGS="-r requirements-devel.txt --pre"
+
+
+
+
+#Tarball
+$(TARBALL_BUILD_DIR):
+	@mkdir -p $(TARBALL_BUILD_DIR)
+
+STATIC_ROOT ?= $(CURDIR)/static
+REV_DIR=$(STATIC_ROOT)/combo/rev-r$$(cat $(STATIC_ROOT)/combo/revno)
+
+collectstatic:
+	DJANGO_SETTINGS_MODULE=django_project.settings_base $(DJANGO_MANAGE) collectstatic --noinput \
+		> logs/collectstatic.log 2>&1 || (cat logs/collectstatic.log && false)
+	cd $(STATIC_ROOT)/combo
+	[ -L $(REV_DIR) ] && (echo 'existing rev symbolink, removing' &&  rm $(REV_DIR)) \
+		 || (echo 'empty rev symbolink')
+	ln -sf . $(REV_DIR)
+
+
+$(TARBALL_BUILD_PATH): $(TARBALL_BUILD_DIR) tarball_exclude.txt collectstatic
+	@echo "creating deployment tarball at $(TARBALL_BUILD_PATH)"
+	@tar -cj --exclude-from tarball_exclude.txt -f $(TARBALL_BUILD_PATH) ./
+
+build-tarball: install-wheels clean_js js css $(TARBALL_BUILD_PATH)
+
+clean: clean_js clean-virtualenv
+	rm -rf $(STATIC_ROOT)
+
+conn-check:
+	@echo "Generating conn-check config from Django settings..."
+	@sudo -u $$(ls -ld $(CURDIR) | awk '{print $$3}') PYTHONPATH=$(PYTHONPATH) \
+		python scripts/settings-to-conncheck.py -m $(DJANGO_SETTINGS_MODULE) -f $(CONN_CHECK_CONFIG_PATH)
+	@echo "Running conn-check..."
+	conn-check $(CONN_CHECK_CONFIG_PATH)
+
+
+.PHONY: build-tarball install-wheels

=== removed file 'bootstrap.py'
--- bootstrap.py	2012-09-26 01:02:57 +0000
+++ bootstrap.py	1970-01-01 00:00:00 +0000
@@ -1,262 +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'
-
-
-# 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 directory 'branches'
=== removed file 'buildout.cfg'
--- buildout.cfg	2014-02-01 15:46:25 +0000
+++ buildout.cfg	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-[buildout]
-parts =
-    scripts
-    django
-    deploy
-unzip = true
-use-dependency-links = false
-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 versions file.  Once you have the
-# desired software, enable it again (and check the new software in to
-# lp:ca-dependencies if this is going to be reviewed/merged/deployed.)
-install-from-cache = true
-
-# This also will need to be temporarily enabled.  Newly-added packages should
-# then add their desired version number to versions.cfg.
-allow-picked-versions = false
-
-extensions =
-    buildout-versions
-buildout_versions_file = versions.cfg
-versions = versions
-extends = versions.cfg
-
-prefer-final = true
-
-develop = .
-
-[scripts]
-recipe = z3c.recipe.scripts
-# Test dependencies get added here
-eggs = isitdeployable
-       convoy
-       jsmin
-       gunicorn
-       gorun
-       supervisor
-include-site-packages = false
-interpreter = py
-
-[django]
-recipe = djangorecipe
-settings = settings
-project = django_project
-projectegg = django_project
-eggs =
-  ${scripts:eggs}
-test =
-  revtracker
-
-[deploy]
-recipe = djangorecipe
-settings = settings
-project = django_project
-projectegg = django_project
-eggs =
-  ${scripts:eggs}
-test =
-  revtracker
-wsgi = true

=== removed file 'combo.py'
--- combo.py	2012-10-04 21:33:13 +0000
+++ combo.py	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-"""WSGI file to serve the combo JS out of convoy"""
-import os
-from convoy.combo import combo_app
-
-root_dir = os.path.dirname(__file__)
-JS_FILES = root_dir + '/build/revtracker/js'
-application = combo_app(JS_FILES)

=== added file 'config-manager.txt'
--- config-manager.txt	1970-01-01 00:00:00 +0000
+++ config-manager.txt	2016-01-27 16:38:37 +0000
@@ -0,0 +1,2 @@
+branches/yui-min                    bzr+ssh://bazaar.launchpad.net/~ubuntuone-pqm-team/yui/stable-min;revno=3
+branches/conn-check-config          bzr+ssh://bazaar.launchpad.net/~ubuntuone-hackers/conn-check/configs;revno=23

=== added file 'dependencies.txt'
--- dependencies.txt	1970-01-01 00:00:00 +0000
+++ dependencies.txt	2016-01-27 16:38:37 +0000
@@ -0,0 +1,50 @@
+bzr
+gettext
+iso-codes
+librsvg2-common
+python3-apt
+python3-chardet
+python3-debian
+python3-lxml
+python3-magic
+python3-pkg-resources
+python3-six
+python3-xdg
+python3-yaml
+python-amqplib
+python-apt
+python-crypto
+python-dateutil
+python-debian
+python-docutils
+python-epydoc
+python-gtk2
+python-imaging
+python-iso8601
+python-keystoneclient
+python-launchpadlib
+python-lazr.restfulclient
+python-lxml
+python-markdown
+python-memcache
+python-oauth
+python-openid
+python-paste
+python-piston-mini-client
+python-polib
+python-psycopg2
+python-pygooglechart
+python-reportlab
+python-restrictedpython
+python-sphinx
+python-swiftclient
+python-tz
+python-xlwt
+python-yaml
+ruby
+ruby-dev
+ruby-compass
+supervisor
+squashfs-tools
+ttf-ubuntu-font-family
+unzip

=== added file 'dev_config/gorun_settings.py'
--- dev_config/gorun_settings.py	1970-01-01 00:00:00 +0000
+++ dev_config/gorun_settings.py	2016-01-27 16:38:37 +0000
@@ -0,0 +1,11 @@
+import os
+
+BASE_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+
+DIRECTORIES = (
+    (os.path.join(BASE_DIR, 'django_project'), 'make restart_app'),
+    (os.path.join(BASE_DIR, 'revtracker'), 'make restart_app'),
+    (os.path.join(BASE_DIR, 'checklist'), 'make restart_app'),
+    (os.path.join(BASE_DIR, 'revtracker/static/'), 'make js'),
+    (os.path.join(BASE_DIR, 'revtracker/static/scss/'), 'make css'),
+)

=== removed file 'dev_config/gorun_settings.py'
--- dev_config/gorun_settings.py	2014-03-28 20:01:18 +0000
+++ dev_config/gorun_settings.py	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-DIRECTORIES = (
-    ('django_project', 'make restart_app'),
-    ('revtracker', 'make restart_app'),
-    ('checklist', 'make restart_app'),
-    ('revtracker/static/', 'make js'),
-    ('revtracker/static/scss/', 'make css'),
-)

=== modified file 'dev_config/supervisor.conf'
--- dev_config/supervisor.conf	2014-03-30 16:54:02 +0000
+++ dev_config/supervisor.conf	2016-01-27 16:38:37 +0000
@@ -11,7 +11,7 @@
 [supervisorctl]
 serverurl=unix:///%(here)s/../tmp/supervisord.sock
 
-[program:appserver]
+[program:appserver_dev]
 command=%(here)s/../bin/django runserver --noreload --werkzeug
 stopsignal=KILL
 killasgroup=true
@@ -19,10 +19,26 @@
 autostart=false
 redirect_stderr=true
 
+[program:appserver]
+command=%(here)s/../bin/gunicorn_django -b 127.0.0.1:8000
+autostart=true
+redirect_stderr=true
+
 [program:celeryd]
-command=%(here)s/../bin/django celerybeat --pidfile %(here)s/../tmp/celeryd.pid
-autostart=false
-redirect_stderr=true
+command=%(here)s/../bin/django celery worker --pidfile %(here)s/../tmp/celeryd.pid
+stdout_logfile=%(here)s/../tmp/celeryd.log
+stderr_logfile=%(here)s/../tmp/celeryd.log
+autostart=true
+autorestart=true
+startsecs=10
+
+[program:celerybeat]
+command=%(here)s/../bin/django celerybeat --pidfile %(here)s/../tmp/celerybeat.pid
+stdout_logfile=%(here)s/../tmp/celerybeat.log
+stderr_logfile=%(here)s/../tmp/celerybeat.log
+autostart=true
+autorestart=true
+startsecs=10
 
 [program:combo]
 command=%(here)s/../bin/gunicorn combo:application -b 127.0.0.1:8001

=== modified file 'django_project/celeryapp.py'
--- django_project/celeryapp.py	2014-02-01 15:46:25 +0000
+++ django_project/celeryapp.py	2016-01-27 16:38:37 +0000
@@ -2,8 +2,10 @@
 
 import os
 
+import paths
+paths.setup_paths()
+
 from celery import Celery
-
 from django.conf import settings
 
 # set the default Django settings module for the 'celery' program.
@@ -15,3 +17,8 @@
 # pickle the object when using Windows.
 app.config_from_object('django.conf:settings')
 app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
+
+
+if __name__ == '__main__':
+    from celery.bin.celery import main
+    main()

=== modified file 'django_project/manage.py'
--- django_project/manage.py	2014-01-31 20:09:20 +0000
+++ django_project/manage.py	2016-01-27 16:38:37 +0000
@@ -2,6 +2,9 @@
 import os
 import sys
 
+import paths
+paths.setup_paths()
+
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 

=== added file 'django_project/paths.py'
--- django_project/paths.py	1970-01-01 00:00:00 +0000
+++ django_project/paths.py	2016-01-27 16:38:37 +0000
@@ -0,0 +1,42 @@
+#! /usr/bin/env python
+
+import sys
+import os
+
+PATHS = [
+    # src and config
+    '.',
+    'revtracker',
+    # dependencies
+    'lib',
+]
+
+CURRENT_DIR = os.path.dirname(os.path.realpath(__file__))
+PROJECT_ROOT_DIR = os.path.abspath(os.path.join(CURRENT_DIR, os.pardir))
+
+LOCAL_SETTINGS_DIR = os.path.abspath(
+    os.path.join(PROJECT_ROOT_DIR, os.pardir, 'local_config'))
+LOCAL_SETTINGS_PATH = os.path.join(LOCAL_SETTINGS_DIR, 'settings.py')
+
+
+def get_paths(paths):
+    """Sets up necessary python paths for Pay in prod/staging"""
+    # only include a path if not already in sys.path to avoid duplication of
+    # paths when using code reloading
+    path_set = set(sys.path)
+    for p in paths:
+        path = os.path.abspath(os.path.join(PROJECT_ROOT_DIR, p))
+        if path not in path_set:
+            yield path
+
+
+def setup_paths():
+    sys.path = list(get_paths(PATHS)) + sys.path
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'django_project.settings')
+
+
+if __name__ == '__main__':
+    # For use in shell scripting
+    # e.g. $(python paths.py)
+    print "export PYTHONPATH=%s" % ":".join(get_paths(PATHS))
+    print "export DJANGO_SETTINGS_MODULE=django_project.settings"

=== modified file 'django_project/settings.py'
--- django_project/settings.py	2014-03-27 02:06:42 +0000
+++ django_project/settings.py	1970-01-01 00:00:00 +0000
@@ -1,238 +0,0 @@
-# Django settings for deploy_tracker project.
-
-import os
-
-# Needed to have celery work from management commands
-import djcelery
-djcelery.setup_loader()
-
-from datetime import timedelta
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    # ('Your Name', '[e-mail]'),
-)
-
-MANAGERS = ADMINS
-
-DB_HOST = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'tmp', 'db')
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'revtracker',                      # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': DB_HOST,
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
-    }
-}
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'America/Chicago'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale
-USE_L10N = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = ''
-
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = ''
-
-# URL prefix for static files.
-# Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
-
-# URL prefix for admin static files -- CSS, JavaScript and images.
-# Make sure to use a trailing slash.
-# Examples: "http://foo.com/static/admin/", "/static/admin/".
-ADMIN_MEDIA_PREFIX = '/static/admin/'
-
-# Additional locations of static files
-STATICFILES_DIRS = (
-    # Put strings here, like "/home/html/static" or "C:/www/django/static".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '6s!*-&#t8mks^8+7_2w%!oh8wh9uzzm-vzh5)l+7r2403+tm^!'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-    'django.template.loaders.eggs.Loader',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'waffle.middleware.WaffleMiddleware',
-    #'debug_toolbar.middleware.DebugToolbarMiddleware',
-)
-
-INTERNAL_IPS = ('127.0.0.1',)
-
-ROOT_URLCONF = 'django_project.urls'
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.contrib.auth.context_processors.auth",
-    "django.core.context_processors.csrf",
-    "django.core.context_processors.static",
-    "django.core.context_processors.request",
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.contrib.comments',
-    'django.contrib.admin',
-    'south',
-    'devserver',
-    'django_openid_auth',
-    'djcelery',
-    'revtracker',
-    'waffle',
-    'ordered_model',
-    'checklist',
-    #'debug_toolbar',
-)
-
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'handlers': {
-        'mail_admins': {
-            'level': 'ERROR',
-            'class': 'django.utils.log.AdminEmailHandler',
-            'filters': ['require_debug_false'],
-        },
-        'file': {
-            'level': 'INFO',
-            'class': 'logging.handlers.WatchedFileHandler',
-            'formatter': 'verbose',
-            'filename': 'django.log',
-        },
-    },
-    'loggers': {
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
-        'django': {
-            'handlers': ['file'],
-            'level': 'WARNING',
-        },
-    },
-    'formatters': {
-        'verbose': {
-            'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s',
-        },
-    },
-    'filters': {
-         'require_debug_false': {
-              '()': 'django.utils.log.RequireDebugFalse',
-         },
-    }
-}
-
-DEBUG_TOOLBAR_CONFIG = {
-    'INTERCEPT_REDIRECTS': False,
-}
-
-BRANCH_CACHE_DIR = "branches"
-
-CELERYBEAT_SCHEDULE = {
-    "update_all_projects": {
-        "task": "revtracker.tasks.update_all_projects",
-            "schedule": timedelta(minutes=5),
-        },
-    }
-# Only reserve one task per worker, so that workers don't sit idle
-# during long running tasks.
-CELERYD_PREFETCH_MULTIPLIER = 1
-CELERYBEAT_SCHEDULE_FILENAME = 'tmp/celerybeat-schedule'
-
-LOGIN_URL = '/openid/login'
-LOGIN_REDIRECT_URL = '/'
-
-AUTHENTICATION_BACKENDS = (
-    'django_openid_auth.auth.OpenIDBackend',
-    'django.contrib.auth.backends.ModelBackend',
-    )
-
-OPENID_SSO_SERVER_URL = 'https://login.ubuntu.com/'
-OPENID_CREATE_USERS = True
-OPENID_UPDATE_DETAILS_FROM_SREG = True
-MULTILANG_OP_ENDPOINTS = False
-OPENID_SREG_REQUIRED_FIELDS = ['nickname']
-OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO = True
-
-COMBO_URL = 'http://127.0.0.1:8001/'
-
-WAFFLE_OVERRIDE = True
-
-import os
-import sys
-sys.path.insert(0, os.path.dirname(__file__))
-try:
-    from local_settings import *
-except ImportError:
-    pass

=== target is u'../../local_config/settings.py'
=== added file 'django_project/settings_base.py'
--- django_project/settings_base.py	1970-01-01 00:00:00 +0000
+++ django_project/settings_base.py	2016-01-27 16:38:37 +0000
@@ -0,0 +1,221 @@
+# Django settings for deploy_tracker project.
+
+import os
+import sys
+
+# Needed to have celery work from management commands
+import djcelery
+djcelery.setup_loader()
+
+from datetime import timedelta
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+SRC_DIR = os.path.join(BASE_DIR, 'revtracker')
+HOST_DIR = os.path.abspath(
+    os.getenv('DPA_LP_CACHE_HOST_DIR', os.path.abspath(
+        os.path.join(BASE_DIR, os.path.pardir, os.path.pardir))))
+LOGS_DIR = os.path.abspath(
+    os.getenv('DPA_LOGS_DIR', os.path.join(BASE_DIR, 'tmp')))
+OOPS_DIR = os.path.join(LOGS_DIR, 'www-oops')
+
+
+ADMINS = (
+    # ('Your Name', '[e-mail]'),
+)
+
+MANAGERS = ADMINS
+
+DB_HOST = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'tmp', 'db')
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': 'revtracker',                      # Or path to database file if using sqlite3.
+        'USER': '',                      # Not used with sqlite3.
+        'PASSWORD': '',                  # Not used with sqlite3.
+        'HOST': DB_HOST,
+        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
+    }
+}
+
+TIME_ZONE = 'UTC'
+
+LANGUAGE_CODE = 'en-us'
+
+SITE_ID = 1
+
+USE_I18N = True
+
+USE_L10N = True
+
+MEDIA_ROOT = ''
+
+MEDIA_URL = ''
+
+STATIC_ROOT = 'static'
+
+STATIC_URL = '/static/'
+
+ADMIN_MEDIA_PREFIX = '/static/admin/'
+
+STATICFILES_DIRS = (
+    os.path.join(BASE_DIR, 'build/revtracker/js'),
+)
+
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)
+
+SECRET_KEY = '6s!*-&#t8mks^8+7_2w%!oh8wh9uzzm-vzh5)l+7r2403+tm^!'
+
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+    'django.template.loaders.eggs.Loader',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'waffle.middleware.WaffleMiddleware',
+    #'debug_toolbar.middleware.DebugToolbarMiddleware',
+)
+
+INTERNAL_IPS = ('127.0.0.1',)
+
+ROOT_URLCONF = 'django_project.urls'
+
+TEMPLATE_DIRS = (
+    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+)
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.contrib.auth.context_processors.auth",
+    "django.core.context_processors.csrf",
+    "django.core.context_processors.static",
+    "django.core.context_processors.request",
+)
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'django.contrib.comments',
+    'django.contrib.admin',
+    'south',
+    'devserver',
+    'django_openid_auth',
+    'djcelery',
+    'revtracker',
+    'waffle',
+    'ordered_model',
+    'checklist',
+    'pgtools',
+    #'debug_toolbar',
+)
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'handlers': {
+        'mail_admins': {
+            'level': 'ERROR',
+            'class': 'django.utils.log.AdminEmailHandler',
+            'filters': ['require_debug_false'],
+        },
+        'file': {
+            'level': 'INFO',
+            'class': 'logging.handlers.WatchedFileHandler',
+            'formatter': 'verbose',
+            'filename': 'django.log',
+        },
+    },
+    'loggers': {
+        'django.request': {
+            'handlers': ['mail_admins'],
+            'level': 'ERROR',
+            'propagate': True,
+        },
+        'django': {
+            'handlers': ['file'],
+            'level': 'WARNING',
+        },
+    },
+    'formatters': {
+        'verbose': {
+            'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s',
+        },
+    },
+    'filters': {
+         'require_debug_false': {
+              '()': 'django.utils.log.RequireDebugFalse',
+         },
+    }
+}
+
+DEBUG_TOOLBAR_CONFIG = {
+    'INTERCEPT_REDIRECTS': False,
+}
+
+BRANCH_CACHE_DIR = "branches"
+
+CELERYBEAT_SCHEDULE = {
+    "update_all_projects": {
+        "task": "revtracker.tasks.update_all_projects",
+            "schedule": timedelta(minutes=5),
+        },
+    }
+# Only reserve one task per worker, so that workers don't sit idle
+# during long running tasks.
+CELERYD_PREFETCH_MULTIPLIER = 1
+CELERYBEAT_SCHEDULE_FILENAME = 'tmp/celerybeat-schedule'
+
+LOGIN_URL = '/openid/login'
+LOGIN_REDIRECT_URL = '/'
+
+AUTHENTICATION_BACKENDS = (
+    'django_openid_auth.auth.OpenIDBackend',
+    'django.contrib.auth.backends.ModelBackend',
+    )
+
+OOPSES = {
+    'publishers': [{
+        'inherit_id': False,
+        'error_dir': OOPS_DIR,
+        'type': 'datedir',
+        'new_only': False,
+    }],
+    'template': {'reporter': 'DEFAULT'},
+}
+
+USE_HTTPS = True
+
+OPENID_SSO_SERVER_URL = 'https://login.ubuntu.com/'
+OPENID_CREATE_USERS = True
+OPENID_UPDATE_DETAILS_FROM_SREG = True
+OPENID_SREG_REQUIRED_FIELDS = ['nickname']
+OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO = True
+
+MULTILANG_OP_ENDPOINTS = False
+
+COMBO_URL = 'http://127.0.0.1:8001/'
+
+CONVOY_ROOT = os.path.join(STATIC_ROOT, 'combo')
+
+WAFFLE_OVERRIDE = True
+
+sys.path.insert(0, os.path.dirname(__file__))

=== modified file 'django_project/urls.py'
--- django_project/urls.py	2014-03-27 20:10:52 +0000
+++ django_project/urls.py	2016-01-27 16:38:37 +0000
@@ -15,7 +15,14 @@
     url(r'^admin/', include(admin.site.urls)),
     url(r'^openid/', include(django_openid_auth.urls)),
     url(r'^checklist/', include('checklist.urls')),
+    # combo view for serving css outside dev/ prefi
+    url(r'^combo/rev-\w+/$', 'revtracker.views.combo_view', name='dpa-combo-link'),
+    url(r'^combo/$', 'revtracker.views.combo_view', name='dpa-combo'),
     (r'^favicon\.ico$', RedirectView.as_view(url='%s/favicon.ico' % settings.STATIC_URL)),
 )
 
+urlpatterns += patterns('',
+    (r'^assets/(.*)', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
+)
+
 urlpatterns += staticfiles_urlpatterns()

=== added file 'django_project/wsgi.py'
--- django_project/wsgi.py	1970-01-01 00:00:00 +0000
+++ django_project/wsgi.py	2016-01-27 16:38:37 +0000
@@ -0,0 +1,31 @@
+import os
+import sys
+
+# before doing anything else, patch stdout to avoid breakage in production
+# see LP: #1099459 for details
+sys.stdout = sys.stderr
+
+# add current dir to system path if not already there
+# check if path is already there to avoid path duplication when
+# modwsgi is configured for code reloading
+curdir = os.path.abspath(os.path.dirname(__file__))
+if curdir not in sys.path:
+    sys.path.append(curdir)
+import paths
+paths.setup_paths()
+
+from django.conf import settings
+
+
+from revtracker.wsgi import make_app
+
+app = make_app()
+
+
+def application(environ, start_response):
+    # Patch environment if we should be serving https
+    if getattr(settings, 'USE_HTTPS'):
+        environ['HTTPS'] = 'on'
+        environ['wsgi.url_scheme'] = 'https'
+
+    return app(environ, start_response)

=== added directory 'lib'
=== added symlink 'lib/conn_check_configs'
=== target is u'../branches/conn-check-config/conn_check_configs'
=== added directory 'logs'
=== removed file 'makefiles/buildout.mk'
--- makefiles/buildout.mk	2014-03-30 03:19:53 +0000
+++ makefiles/buildout.mk	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-# 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 'makefiles/css.mk'
--- makefiles/css.mk	2014-04-23 15:45:36 +0000
+++ makefiles/css.mk	2016-01-27 16:38:37 +0000
@@ -1,6 +1,6 @@
-COMPASS = tmp/bin/compass
+COMPASS = /usr/bin/compass
 
-css: $(COMPASS)
+css:
 	$(RUN_GEM) $(COMPASS) compile .
 
 $(COMPASS):

=== removed file 'makefiles/deploy.mk'
--- makefiles/deploy.mk	2014-03-30 03:19:53 +0000
+++ makefiles/deploy.mk	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-REVNO = $(shell bzr revno)
-DIRNAME = isitdeployable-$(REVNO)
-TARBALL = $(DIRNAME).tar.bz2
-BASEDIR = /srv/isitdeployable.net/production/
-CODE_DIR = $(BASEDIR)/$(DIRNAME)
-HOST ?= isitdeployable.net
-
-prod: $(PY) js css $(JS_BUILD_PATH)/combo $(JS_BUILD_PATH)/revno js_revno_link
-
-$(JS_BUILD_PATH)/combo:
-	# Because we have to strip out the prefix that
-	# convoy sees because it's not at the root
-	ln -sf . $(JS_BUILD_PATH)/combo
-
-$(JS_BUILD_PATH)/revno:
-	bzr log $(REVTRACKER_JS) --limit 1 | head -n2 | tail -n1 | sed 's/[^0-9]*//' > $(JS_BUILD_PATH)/revno
-
-js_revno_link: $(JS_BUILD_PATH)/revno
-	ln -sf . $(JS_BUILD_PATH)/rev-$$(cat $(JS_BUILD_PATH)/revno)
-
-push: prod
-	tar --exclude 'download-cache/*' --exclude 'build/yui/*' -cjf $(TARBALL) * .bzr .bzrignore
-	scp $(TARBALL) $(HOST):
-	ssh $(HOST) 'sudo mkdir -p $(CODE_DIR) && sudo chown ubuntu $(CODE_DIR) && \
-		         sudo apt-get install -y puppet && \
-		         tar xf /home/ubuntu/$(TARBALL) -C $(CODE_DIR) && \
-				 (rm $(CODE_DIR)/download-cache && mkdir -p $(CODE_DIR)/download-cache/dist) && \
-				 (cd $(CODE_DIR) && ./bin/buildout)'
-
-remote_prod_deploy:
-	ssh $(HOST) 'sudo /etc/init.d/deploy-tracker-celeryd stop && \
-				 $(CODE_DIR)/dev_config/apply && \
-				 sudo chown deploytracker:deploytracker -R $(CODE_DIR) && \
-				 sudo -u deploytracker $(CODE_DIR)/bin/deploy collectstatic --noinput && \
-				 sudo -u deploytracker $(CODE_DIR)/bin/deploy syncdb --noinput && \
-				 sudo -u deploytracker $(CODE_DIR)/bin/deploy migrate --noinput && \
-				 sudo /etc/init.d/deploy-tracker-celeryd start && \
-				 (sudo stop deploy-tracker-combo || true) && \
-				 sudo start deploy-tracker-combo && \
-				 (sudo stop squid3 || true) && \
-				 sudo start squid3 && \
-				 sudo /etc/init.d/apache2 reload && \
-				 sudo ln -snf $(CODE_DIR) $(BASEDIR)/isitdeployable-current'
-	for i in seq 4; do wget -O/dev/null -q http://$(HOST); done
-
-deploy: push remote_prod_deploy
-
-.PHONY: prod push remote_prod_deploy deploy js_revno_link

=== modified file 'makefiles/js.mk'
--- makefiles/js.mk	2014-03-30 03:19:53 +0000
+++ makefiles/js.mk	2016-01-27 16:38:37 +0000
@@ -1,12 +1,15 @@
 YUIRELEASES := http://yui.zenfs.com/releases/yui3/
 YUI := yui_3.15.0.zip
-JS_BUILD_PATH = build/revtracker/js/
-JS_META_SCRIPT = $(PY) scripts/js/generate_meta.py
+JS_BUILD_PATH = build/revtracker/js/combo
+JS_META_SCRIPT = $(PYTHON) scripts/js/generate_meta.py
 REVTRACKER_JS = revtracker/static/js/
 DEV_JS_FILES := $(wildcard $(REVTRACKER_JS)/*.js)
 BUILD_JS_FILES := $(patsubst $(REVTRACKER_JS)/%.js,$(JS_BUILD_PATH)/i/%.js,$(DEV_JS_FILES))
 
-js: js_dirs jsmin $(JS_BUILD_PATH)/i/meta.js
+$(JS_BUILD_PATH)/revno:
+	bzr log --limit 1 | head -n2 | tail -n1 | sed 's/[^0-9]*//' | sed 's/\[merge\]//' > $(JS_BUILD_PATH)/revno
+
+js: js_dirs jsmin $(JS_BUILD_PATH)/i/meta.js $(JS_BUILD_PATH)/revno
 
 js_dirs: $(JS_BUILD_PATH)/i $(JS_BUILD_PATH)/y
 
@@ -15,16 +18,17 @@
 
 $(JS_BUILD_PATH)/y: build/yui
 	mkdir -p $(JS_BUILD_PATH)/y
-	cp -r build/yui/build/* $(JS_BUILD_PATH)/y
+	cp -r branches/yui-min/build/* $(JS_BUILD_PATH)/y
+	rm -rf branches/yui-min
 
 build/yui:
 	mkdir -p build/yui
-	wget $(YUIRELEASES)$(YUI) -O /tmp/$(YUI)
-	unzip /tmp/$(YUI) -d build
+	#wget $(YUIRELEASES)$(YUI) -O /tmp/$(YUI)
+	#unzip /tmp/$(YUI) -d build
 
 jsmin: $(BUILD_JS_FILES)
 	rm $(JS_BUILD_PATH)/i/meta.js || true
-	$(PY) scripts/js/jsmin_all.py $(JS_BUILD_PATH)/i
+	$(PYTHON) scripts/js/jsmin_all.py $(JS_BUILD_PATH)/i
 
 $(BUILD_JS_FILES): $(DEV_JS_FILES)
 	cp $(REVTRACKER_JS)/$(@F) $@

=== removed file 'makefiles/services.mk'
--- makefiles/services.mk	2014-03-30 03:19:53 +0000
+++ makefiles/services.mk	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-DB_DIR = $(TMP_DIR)/db
-export PGHOST=$(DB_DIR)
-export PGDATA=$(DB_DIR)/data
-PG_BIN_DIR = /usr/lib/postgresql/9.1/bin
-SUPERVISOR_CONFIG = $(PWD)/dev_config/supervisor.conf
-SUPERVISORD = bin/supervisord
-SUPERVISORCTL = bin/supervisorctl -c $(SUPERVISOR_CONFIG)
-SUPERVISORD_SOCK = tmp/supervisord.sock
-GUNICORN := bin/gunicorn
-
-SERVICES = appserver combo celeryd gorun
-RUN_RULES = $(patsubst %,run_%,$(SERVICES))
-STOP_RULES = $(patsubst %,stop_%,$(SERVICES))
-TAIL_RULES = $(patsubst %,tail_%,$(SERVICES))
-
-run: run_db $(RUN_RULES)
-
-start: run
-
-$(RUN_RULES): run_%: $(SUPERVISORD_SOCK)
-	$(SUPERVISORCTL) start $*
-
-run_db:
-	scripts/start-database.sh
-	$(MANAGE) syncdb --noinput
-	$(MANAGE) migrate --noinput
-
-$(SUPERVISORD_SOCK):
-	$(SUPERVISORD) -c $(SUPERVISOR_CONFIG)
-
-stop: $(STOP_RULES) stop_db stop_supervisord
-
-$(STOP_RULES): stop_%: $(SUPERVISORD_SOCK)
-	$(SUPERVISORCTL) stop $*
-
-stop_db:
-	$(PG_BIN_DIR)/pg_ctl status > /dev/null && $(PG_BIN_DIR)/pg_ctl stop -t 60 -w -m fast
-
-stop_supervisord:
-	$(SUPERVISORCTL) shutdown
-
-restart_app: stop_app run_app
-
-reload_supervisord:
-	$(SUPERVISORCTL) reread
-
-$(TAIL_RULES): tail_%: $(SUPERVISORD_SOCK)
-	$(SUPERVISORCTL) tail -f $*
-
-.PHONY: run start run_db $(RUN_RULES) stop stop_db $(STOP_RULES) run_supervisord stop_supervisord reload_supervisord $(TAIL_RULES)

=== added file 'requirements-devel.txt'
=== added file 'requirements.txt'
--- requirements.txt	1970-01-01 00:00:00 +0000
+++ requirements.txt	2016-01-27 16:38:37 +0000
@@ -0,0 +1,45 @@
+amqp>=1.3.3
+anyjson==0.3.3
+BeautifulSoup==3.2.1
+billiard>=3.3.0.14
+bson==0.3.3
+celery==3.1.8
+convoy==0.2.4
+Django==1.5.1
+django-celery==3.1.1
+django-debug-toolbar==0.9.4
+django-devserver==0.7.0
+django-factory==0.10
+django-kombu==0.9.4
+django-openid-auth==0.4
+# A checkout of https://github.com/bfirsh/django-ordered-model at 2998740eeda348473d8a8965b40b2292c31efd85
+django-ordered-model==0.3.0.jw1
+django-picklefield==0.2.1
+django-pgtools==0.2
+django-waffle==0.9.2
+gorun==1.7
+gunicorn>=17.5
+jsmin==2.0.2
+keyring>=0.9.2
+kombu>=3.0.7
+lazr.authentication==0.1.2
+lazr.uri==1.0.3
+meld3==0.6.10
+oops==0.0.13
+oops-amqp>=0.0.7
+oops-celery>=0.0.1
+oops-datedir-repo>=0.0.20
+oops-dictconfig>=0.0.2
+oops-wsgi==0.0.10
+Paste==1.7.5.1
+psycopg2==2.4.5
+pybars==0.0.4
+PyMeta==0.5.0
+pyinotify>=0.9.3
+South==0.7.3
+soupmatchers==0.2
+testresources==0.2.5
+testtools>=0.9.16
+wadllib==1.3.1
+werkzeug==0.9.4
+txstatsd==1.0.0

=== modified file 'revtracker/tasks.py'
--- revtracker/tasks.py	2014-02-01 05:25:13 +0000
+++ revtracker/tasks.py	2016-01-27 16:38:37 +0000
@@ -41,7 +41,7 @@
                 branch_from = Branch.open(branch_url)
                 branch_from.lock_read()
                 try:
-                    branch_from_revs = branch_from.revision_history()
+                    branch_from_revs = branch_from._revision_history()
                     branch_from_revs_count = len(branch_from_revs)
                     branch_to_revno = branch_to.revno()
                     if branch_from_revs_count >= branch_to_revno:
@@ -68,7 +68,7 @@
             to_transport = transport.get_transport(project_dir)
             to_transport.mkdir('.')
             revision_id = None
-            branch_from_revs = branch_from.revision_history()
+            branch_from_revs = branch_from._revision_history()
             branch_from_revs_count = len(branch_from_revs)
             if not all_revs and branch_from_revs_count > 1000:
                 revision_id = branch_from_revs[1000]

=== modified file 'revtracker/views.py'
--- revtracker/views.py	2014-03-28 16:30:03 +0000
+++ revtracker/views.py	2016-01-27 16:38:37 +0000
@@ -1,6 +1,9 @@
 from datetime import datetime
+import os
 
+from convoy.combo import combine_files, parse_qs
 from checklist import data as checklist_data
+from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.comments.forms import CommentForm
 from django.core.urlresolvers import reverse
@@ -541,3 +544,27 @@
         return ajax_response({'status': 'ok', 'description': info['description']})
     else:
         return ajax_response({'status': 'failed', 'errors': errors})
+
+
+# combo view is only used for YUI, which will never change, so save to cache
+# this for a long time (1 year).
+def combo_view(request):
+    """Handle a request for combining a set of files."""
+    fnames = parse_qs(request.META.get("QUERY_STRING", ""))
+    content_type = "text/plain"
+
+    if fnames:
+        if fnames[0].endswith(".js"):
+            content_type = "text/javascript"
+        elif fnames[0].endswith(".css"):
+            content_type = "text/css"
+        content = combine_files(fnames, os.path.abspath(settings.CONVOY_ROOT),
+                                resource_prefix=settings.STATIC_URL,
+                                rewrite_urls=True)
+        # We're turning the generator returned by combine_files into a string
+        # here since GZipMiddleware would consume it if not. See Bug #822888.
+        return HttpResponse(
+            content_type=content_type, status=200,
+            content="".join(content))
+    return HttpResponse(content_type=content_type, status=404)
+

=== added file 'revtracker/wsgi.py'
--- revtracker/wsgi.py	1970-01-01 00:00:00 +0000
+++ revtracker/wsgi.py	2016-01-27 16:38:37 +0000
@@ -0,0 +1,71 @@
+import oops_dictconfig
+import oops_wsgi
+import uuid
+
+from django.conf import settings
+from django.core.handlers import wsgi
+
+from versioninfo import version_info
+
+
+class EagerOOPSWSGIHandler(wsgi.WSGIHandler):
+    """Pre-generates an oops id on exception."""
+    def handle_uncaught_exception(self, request, resolver, exc_info):
+        # This will pass the exception information back to oops.  It
+        # should not be necessary once
+        # https://code.djangoproject.com/ticket/16674 has been merged.
+        if 'oops.context' in request.environ:
+            request.environ['oops.context']['exc_info'] = exc_info
+        # Generate OOPS id early so that we can render the error page right
+        # away and not depend on passing thread locals around.
+        if 'oops.report' in request.environ:
+            unique_id = uuid.uuid4().hex
+            request.environ['oops.report']['id'] = "OOPS-%s" % unique_id
+
+        return super(EagerOOPSWSGIHandler, self).handle_uncaught_exception(
+            request, resolver, exc_info)
+
+    def __call__(self, environ, start_response):
+        def start_response_with_exc_info(status, headers, exc_info=None):
+            """Custom start_response callback for wsgi."""
+            # This will pass the exception information back to oops_wgi.  It
+            # should not be necessary once
+            # https://code.djangoproject.com/ticket/16674 has been merged.
+            if exc_info is None:
+                exc_info = environ['oops.context'].get('exc_info', None)
+            return start_response(status, headers, exc_info)
+        return super(EagerOOPSWSGIHandler, self).__call__(
+            environ, start_response_with_exc_info)
+
+
+class BzrRevnoMiddleware(object):
+    REVNO_HEADER = ('X-Bzr-Revision-Number', version_info['revno'])
+
+    def __init__(self, app):
+        self.app = app
+
+    def __call__(self, environ, start_response):
+
+        def custom_start_response(status, headers, exc_info=None):
+            headers.append(self.REVNO_HEADER)
+            return start_response(status, headers, exc_info)
+
+        return self.app(environ, custom_start_response)
+
+
+def make_app():
+    """Encapsulate our RNR handler in an OOPS app for error reporting."""
+
+    non_oops_app = EagerOOPSWSGIHandler()
+
+    non_oops_app = BzrRevnoMiddleware(non_oops_app)
+
+    config = oops_dictconfig.config_from_dict(settings.OOPSES)
+    oops_wsgi.install_hooks(config)
+    soft_timeout = settings.SOFT_TIMEOUT_MILLISECONDS
+    oops_app = oops_wsgi.make_app(non_oops_app, config, oops_on_status=['500'],
+                                  soft_start_timeout=soft_timeout)
+    return oops_app
+
+
+application = make_app()

=== removed file 'scripts/deploy.sh'
--- scripts/deploy.sh	2012-10-05 13:46:00 +0000
+++ scripts/deploy.sh	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-TEMPDIR=$(mktemp -d)
-trap "rm -r $TEMPDIR" EXIT SIGINT SIGTERM
-CODE_DIR=${TEMPDIR}/isitdeployable
-
-bzr push ${CODE_DIR}
-
-if [ -n "$CA_EGGS_DIR" ]; then
-    cp -a "$CA_EGGS_DIR" "${CODE_DIR}/eggs"
-fi
-
-make -C ${CODE_DIR} deploy "$@" CA_EGGS_DIR=eggs
-

=== added file 'scripts/settings-to-conncheck.py'
--- scripts/settings-to-conncheck.py	1970-01-01 00:00:00 +0000
+++ scripts/settings-to-conncheck.py	2016-01-27 16:38:37 +0000
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+
+from conn_check_configs.django import *  # noqa
+
+STATSD_CHECK['send'] = 'Hakuna'
+STATSD_CHECK['expect'] = 'Matata'
+
+def make_http_checks(settings, options):
+    checks = []
+    urls = (
+        (
+            settings['OPENID_SSO_SERVER_URL'],
+            '',
+            200,
+            'HEAD',
+        ),
+    )
+
+    for url in urls:
+        if not url[0]:
+            continue
+
+        checks.append({
+            'type': 'http',
+            'url': '{0}{1}'.format(url[0], url[1]),
+            'method': url[3],
+            'expected_code': url[2],
+        })
+
+    return checks
+
+EXTRA_CHECK_MAKERS.append(make_http_checks)
+
+
+if __name__ == '__main__':
+    run()
+

=== removed file 'scripts/start-database.sh'
--- scripts/start-database.sh	2014-01-31 18:04:49 +0000
+++ scripts/start-database.sh	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#! /bin/bash
-
-ROOTDIR=${ROOTDIR:-`bzr root`}
-if [ ! -d "$ROOTDIR"  ]; then
-    echo "ROOTDIR '$ROOTDIR' doesn't exist" >&2
-    exit 1
-fi
-
-function setup_database() {
-    local TESTDIR=$1
-
-    echo "## Starting postgres in $TESTDIR ##"
-    mkdir -p "$TESTDIR/data"
-    chmod 700 "$TESTDIR/data"
-
-    export PGHOST="$TESTDIR"
-    export PGDATA="$TESTDIR/data"
-    if [ -d /usr/lib/postgresql/9.1 ]; then
-        export PGBINDIR=/usr/lib/postgresql/9.1/bin
-    elif [ -d /usr/lib/postgresql/8.4 ]; then
-        export PGBINDIR=/usr/lib/postgresql/8.4/bin
-    else
-        echo "Cannot find valid parent for PGBINDIR"
-    fi
-    $PGBINDIR/initdb -E UNICODE -D $PGDATA
-    $PGBINDIR/initdb -A trust &>/dev/null
-    $PGBINDIR/pg_ctl start -w -D $TESTDIR/data -l $TESTDIR/postgres.log -o "-F -k $TESTDIR -h ''"
-    $PGBINDIR/createdb --encoding UNICODE "revtracker" &>/dev/null
-    $PGBINDIR/createlang plpgsql "revtracker"
-    $PGBINDIR/createuser --superuser --createdb "postgres" &>/dev/null
-    echo "To set your environment so psql will connect to this DB instance type:"
-    echo "    export PGHOST=$TESTDIR"
-    echo "## Done. ##"
-}
-
-setup_database $ROOTDIR/tmp/db

=== modified file 'setup.py'
--- setup.py	2014-03-27 02:35:23 +0000
+++ setup.py	2016-01-27 16:38:37 +0000
@@ -25,7 +25,13 @@
         'django-waffle',
         'django-devserver',
         'django-ordered-model',
+        'django-pgtools',
         'werkzeug',
+        #'oops',
+        'oops_dictconfig',
+        'oops_datedir_repo',
+        'oops_celery',
+        'oops-wsgi',
         ],
     zip_safe=False,
     packages=find_packages(),

=== added file 'tarball_exclude.txt'
--- tarball_exclude.txt	1970-01-01 00:00:00 +0000
+++ tarball_exclude.txt	2016-01-27 16:38:37 +0000
@@ -0,0 +1,9 @@
+.env
+*.pyc
+
+tmp/
+tmp/*
+download-cache/*
+build/yui/*
+debian/*
+isitdeployable.egg-info/*

=== added file 'tarmac_verify.sh'
--- tarmac_verify.sh	1970-01-01 00:00:00 +0000
+++ tarmac_verify.sh	2016-01-27 16:38:37 +0000
@@ -0,0 +1,6 @@
+#! /bin/bash
+
+set -e
+set -u
+
+make bootstrap

=== removed file 'versions.cfg'
--- versions.cfg	2015-05-13 17:32:19 +0000
+++ versions.cfg	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-[buildout]
-versions = versions
-
-# Update the version number here to upgrade to a new version.
-#
-# 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]
-amqp = 1.4.1
-amqplib = 1.0.2
-anyjson = 0.3.3
-BeautifulSoup = 3.2.1
-billiard = 3.3.0.14
-bson = 0.3.3
-buildout-versions = 1.7
-bzr = 2.5.1
-celery = 3.1.8
-convoy = 0.2.4
-distribute = 0.6.28
-Django = 1.5.1
-django-celery = 3.1.1
-django-debug-toolbar = 0.9.4
-django-devserver = 0.7.0
-django-factory = 0.10
-django-kombu = 0.9.4
-django-openid-auth = 0.4
-# A checkout of https://github.com/bfirsh/django-ordered-model at 2998740eeda348473d8a8965b40b2292c31efd85
-django-ordered-model = 0.3.0.jw1
-django-picklefield = 0.2.1
-django-waffle = 0.9.2
-djangorecipe = 1.3
-gorun = 1.7
-gunicorn = 0.14.6
-httplib2 = 0.9.1
-jsmin = 2.0.2
-keyring = 0.9.2
-kombu = 3.0.10
-launchpadlib = 1.10.2
-lazr.authentication = 0.1.2
-lazr.restfulclient = 0.13.0
-lazr.uri = 1.0.3
-Markdown = 2.2.0
-meld3 = 0.6.10
-oauth = 1.0.1
-oops = 0.0.10
-oops_celery = 0.0.1
-oops_datedir_repo = 0.0.15
-oops_dictconfig = 0.0.1
-Paste = 1.7.5.1
-psycopg2 = 2.4.5
-pybars = 0.0.4
-PyMeta = 0.5.0
-pyinotify = 0.9.3
-python-dateutil = 1.5
-python-openid = 2.2.5
-pytz = 2013.9
-simplejson = 2.6.1
-South = 0.7.3
-soupmatchers = 0.2
-supervisor = 3.0
-testresources = 0.2.5
-testtools = 0.9.16
-wadllib = 1.3.1
-werkzeug = 0.9.4
-wsgi-intercept = 0.5.1
-z3c.recipe.scripts = 1.0.1
-# Also upgrade the zc.buildout version in the Makefile's bin/buildout section.
-zc.buildout = 1.5.1
-zc.recipe.egg = 1.3.2
-zope.interface = 4.0.1