Merge lp:~vila/u1-test-utils/fix-version-handling into lp:u1-test-utils

[Vincent Ladeuil]

Fix virtualenv version handling and work around fabric scary "let's pop sys.path blindly" bug.

virtualenv version handling was broken:

  '1.10' < '1.7' -> True

whereas
   [1, 10] < [1, 7] -> False

Trivial but conservative fix below (no need to go into 1.11.beta1 madness).

Once again, I wish fab tasks can be properly tested...

[lp:~vila/u1-test-utils/fix-version-handling]

98. By Vincent Ladeuil on 2013-09-25

Work around fabric removing the first entry in the path.

[Leo Arias (elopio)]

Thank you!

review: Approve (code review, reproduced the problems, tested the fixes)

=== modified file 'fabfile/environment.py'
--- fabfile/environment.py	2013-04-12 16:00:54 +0000
+++ fabfile/environment.py	2013-09-25 16:52:55 +0000
@@ -46,9 +46,12 @@
         virtualenv_bin_path = local('which virtualenv', capture=True)
         virtualenv_version = local('{0} {1} --version'.format(
             sys.executable, virtualenv_bin_path), capture=True)
+        # We only care about major.minor revision numbers
+        version_strings = virtualenv_version.split('.')[0:1]
+        virtualenv_version = [int(x) for x in version_strings]
         args = '--distribute --clear'
-        if virtualenv_version < '1.7':
-            args += ' --no-site-packagaes'
+        if virtualenv_version < [1, 7]:
+            args += ' --no-site-packages'
         local('{0} {1} {2} {3}'.format(sys.executable, virtualenv_bin_path,
             args, VIRTUALENV), capture=False)
 
@@ -57,6 +60,11 @@
     activate_this = os.path.abspath(
         '{0}/bin/activate_this.py'.format(env.virtualenv))
     execfile(activate_this, dict(__file__=activate_this))
+    # Work around fabric unconditionally removing first entry in sys.path by
+    # adding a dummy one. Agreed with Leo on IRC that the workaround is ok as
+    # the plan is to stop using fabric in the long run and the bug itself is a
+    # blocker. -- vila 2013-09-25
+    sys.path.insert(0, '/I-dont-exist-blow-me-away-I-dont-care')
 
 
 def _install_dependencies():