Merge lp:~allenap/maas/1.3-dev-env-distribute into lp:maas/1.3

[Gavin Panella]

Get the development environment working in Raring Ringtail.

Browser tests (using Firefox) do not currently pass.

Backport of r1462 from lp:maas.

[Gavin Panella (allenap)]

review: Approve

[MAAS Lander (maas-lander)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/maas-merger-1.3/3/console reported an error when processing this lp:~allenap/maas/1.3-dev-env-distribute branch.
Not merging it.

=== modified file 'required-packages/dev'
--- required-packages/dev	2012-10-24 13:59:18 +0000
+++ required-packages/dev	2013-05-10 20:31:26 +0000
@@ -5,6 +5,7 @@
 ipython
 libjs-yui3-full
 make
+python-cssselect
 python-lxml
 python-pip
 python-pocket-lint

=== modified file 'src/maasserver/tests/test_views_settings.py'
--- src/maasserver/tests/test_views_settings.py	2013-03-07 15:33:59 +0000
+++ src/maasserver/tests/test_views_settings.py	2013-05-10 20:31:26 +0000
@@ -59,7 +59,11 @@
         # "Add a user" link.
         self.assertIn(reverse('accounts-add'), all_links)
         for user in users:
-            rows = tab.cssselect('tr#"%s"' % user.username)
+            # Use the longhand way of matching an ID here - instead of tr#id -
+            # because the ID may contain non [a-zA-Z-]+ characters. These are
+            # not allowed in symbols, which is how cssselect treats text
+            # following "#" in a selector.
+            rows = tab.cssselect('tr[id="%s"]' % user.username)
             # Only one row for the user.
             self.assertEqual(1, len(rows))
             row = rows[0]

=== modified file 'versions.cfg'
--- versions.cfg	2013-02-26 13:15:15 +0000
+++ versions.cfg	2013-05-10 20:31:26 +0000
@@ -23,7 +23,7 @@
 buildout-versions = 1.7
 collective.recipe.sphinxbuilder = 0.7.0
 coverage = 3.5.1
-distribute = 0.6.24
+distribute = 0.6.34
 django-nose = 0.1.3
 fixtures = 0.3.8
 flake8 = 1.1