Merge lp://staging/~frankban/charms/precise/juju-gui/new-requirements into lp://staging/~juju-gui/charms/precise/juju-gui/trunk

Reviewers: mp+195100_code.launchpad.net,

Message:
Please take a look.

Description:
Update requirements and improve their handling.

Updated the juju-deployer and jujucleint
dependencies to the latest versions, which
include our recent fixes. This way we avoid
using our own forks of the projects.

Updated the code that installs the builtin
server dependencies: now a pip requirement
file is used, and the test requirement file
includes the former. The overall dependency
infrastructure should now be less confusing.

Also added documentation about how to update
the builtin server requirements.

Removed the no longer required --upload-tools
from the functional tests runner.

The deployer functional tests now also use
bundles including numunits > 1 and constraints.

QA:
- Bootstrap a Juju environment.
- Deploy and expose the GUI (make deploy).
- Wait for the GUI to be ready/started.
- Deploy this bundle: http://pastebin.ubuntu.com/6411548/
- Check everything is ok, xy annotations work (
   the services are vertically aligned), wordpress has
   customized constraints, mysql customized options and
   two units.
- No try to deploy the same bundle again, you
   will see a "services already there" kind of error.

https://code.launchpad.net/~frankban/charms/precise/juju-gui/new-requirements/+merge/195100

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/26130043/

Affected files (+85, -30 lines):
   M HACKING.md
   M Makefile
   A [revision details]
   D deps/juju-deployer-0.2.8.tar.gz
   A deps/juju-deployer-0.2.9.tar.gz
   D deps/jujuclient-0.13.tar.gz
   A deps/jujuclient-0.15.tar.gz
   M hooks/utils.py
   M revision
   A server-requirements.pip
   M test-requirements.pip
   M tests/00-setup
   M tests/example.py
   M tests/test_utils.py

LGTM with trivial comment request. Doing QA now.

https://codereview.appspot.com/26130043/diff/1/hooks/utils.py
File hooks/utils.py (right):

https://codereview.appspot.com/26130043/diff/1/hooks/utils.py#newcode550
hooks/utils.py:550: '--find-links', 'file:///{}'.format(deps), '-r',
requirements
yay, nice

https://codereview.appspot.com/26130043/diff/1/server-requirements.pip
File server-requirements.pip (right):

https://codereview.appspot.com/26130043/diff/1/server-requirements.pip#newcode19
server-requirements.pip:19: # Note: the order of the following
dependencies is important!
Would be nice to indicate why.

https://codereview.appspot.com/26130043/diff/1/test-requirements.pip
File test-requirements.pip (right):

https://codereview.appspot.com/26130043/diff/1/test-requirements.pip#newcode32
test-requirements.pip:32: -r server-requirements.pip
cool. I didn't know about this feature.

https://codereview.appspot.com/26130043/diff/1/tests/test_utils.py
File tests/test_utils.py (right):

https://codereview.appspot.com/26130043/diff/1/tests/test_utils.py#newcode1117
tests/test_utils.py:1117: mock.call(
wow. cool that you can do this.

https://codereview.appspot.com/26130043/

QA good. Thanks!

https://codereview.appspot.com/26130043/

*** Submitted:

Update requirements and improve their handling.

Updated the juju-deployer and jujucleint
dependencies to the latest versions, which
include our recent fixes. This way we avoid
using our own forks of the projects.

Updated the code that installs the builtin
server dependencies: now a pip requirement
file is used, and the test requirement file
includes the former. The overall dependency
infrastructure should now be less confusing.

Also added documentation about how to update
the builtin server requirements.

Removed the no longer required --upload-tools
from the functional tests runner.

The deployer functional tests now also use
bundles including numunits > 1 and constraints.

QA:
- Bootstrap a Juju environment.
- Deploy and expose the GUI (make deploy).
- Wait for the GUI to be ready/started.
- Deploy this bundle: http://pastebin.ubuntu.com/6411548/
- Check everything is ok, xy annotations work (
   the services are vertically aligned), wordpress has
   customized constraints, mysql customized options and
   two units.
- No try to deploy the same bundle again, you
   will see a "services already there" kind of error.

R=gary.poster
CC=
https://codereview.appspot.com/26130043

https://codereview.appspot.com/26130043/diff/1/server-requirements.pip
File server-requirements.pip (right):

https://codereview.appspot.com/26130043/diff/1/server-requirements.pip#newcode19
server-requirements.pip:19: # Note: the order of the following
dependencies is important!
On 2013/11/13 17:15:47, gary.poster wrote:
> Would be nice to indicate why.

Done.

https://codereview.appspot.com/26130043/