Merge lp:~allenap/maas/force-django16-in-development into lp:maas/trunk

Proposed by Gavin Panella
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 4333
Merge reported by: Andres Rodriguez
Merged at revision: not available
Proposed branch: lp:~allenap/maas/force-django16-in-development
Merge into: lp:maas/trunk
Diff against target: 11 lines (+1/-0)
1 file modified
buildout.cfg (+1/-0)
To merge this branch: bzr merge lp:~allenap/maas/force-django16-in-development
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email:

Commit message

Force the use of Django 1.6 in the development environment.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

What was this doing before this change?

review: Needs Information
Revision history for this message
Gavin Panella (allenap) wrote :

> What was this doing before this change?

When running tests it was fine, because src/maasserver/
modifies sys.path to put /usr/lib/django16 near the top. However it
breaks when running regiond (via `make services/regiond/@run`) because
the fix in src/maasserver/ was coming too late; the system
Django, which is 1.7 on Vivid, had already been imported.

Revision history for this message
Blake Rouse (blake-rouse) wrote :

Okay cool. Thanks for the explanation.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (1.0 MiB)

The attempt to merge lp:~allenap/maas/force-django16-in-development into lp:maas failed. Below is the output from the failed tests.

Ign trusty InRelease
Ign trusty-security InRelease
Get:1 trusty-security Release.gpg [933 B]
Ign trusty-updates InRelease
Hit trusty Release.gpg
Get:2 trusty-security Release [63.5 kB]
Get:3 trusty-updates Release.gpg [933 B]
Hit trusty Release
Get:4 trusty-updates Release [63.5 kB]
Hit trusty/main Sources
Hit trusty/universe Sources
Get:5 trusty-security/main Sources [96.9 kB]
Hit trusty/main amd64 Packages
Hit trusty/universe amd64 Packages
Hit trusty/main Translation-en
Hit trusty/universe Translation-en
Get:6 trusty-updates/main Sources [237 kB]
Get:7 trusty-security/universe Sources [31.1 kB]
Get:8 trusty-security/main amd64 Packages [350 kB]
Get:9 trusty-updates/universe Sources [139 kB]
Get:10 trusty-security/universe amd64 Packages [117 kB]
Get:11 trusty-updates/main amd64 Packages [627 kB]
Hit trusty-security/main Translation-en
Hit trusty-security/universe Translation-en
Get:12 trusty-updates/universe amd64 Packages [320 kB]
Hit trusty-updates/main Translation-en
Hit trusty-updates/universe Translation-en
Ign trusty/main Translation-en_US
Ign trusty/universe Translation-en_US
Fetched 2,046 kB in 3s (529 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oaut...