Merge lp:~corey.bryant/charm-helpers/upgrade-pip into lp:charm-helpers

[Corey Bryant]

[Corey Bryant (corey.bryant)]

Upstream OpenStack is starting to use requirements file syntax such as the following to target specific python versions:

Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7'

Older pip versions don't understand this and as a result won't install the requirement.

By default virtualenv's on trusty install a pretty old version of pip. This patch upgrades pip after creating the virtualenv.

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2015-06-30 15:28:49 +0000
+++ charmhelpers/contrib/openstack/utils.py	2015-07-15 17:28:40 +0000
@@ -558,10 +558,11 @@
 
     pip_create_virtualenv(os.path.join(parent_dir, 'venv'))
 
-    # Upgrade setuptools from default virtualenv version. The default version
-    # in trusty breaks update.py in global requirements master branch.
-    pip_install('setuptools', upgrade=True, proxy=http_proxy,
-                venv=os.path.join(parent_dir, 'venv'))
+    # Upgrade setuptools and pip from default virtualenv versions. The default
+    # versions in trusty break master OpenStack branch deployments.
+    for p in ['pip', 'setuptools']:
+        pip_install(p, upgrade=True, proxy=http_proxy,
+                    venv=os.path.join(parent_dir, 'venv'))
 
     for p in projects['repositories']:
         repo = p['repository']