changeset 2309:d5fa8dae5055

Merged thomaswaldmann/moin-2.0 into default
author ana-balica <ana.balica@gmail.com>
date Fri, 24 Jan 2014 02:31:43 +0100
parents 636b2ee1c5fe (current diff) 773f0e488722 (diff)
children 3322182f3fe2
files
diffstat 1 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/quickinstall.py	Mon Nov 18 16:17:58 2013 +0100
+++ b/quickinstall.py	Fri Jan 24 02:31:43 2014 +0100
@@ -8,6 +8,8 @@
 needs: virtualenv, pip
 """
 
+PIP15 = False  # dirty hack to support pip >= 1.5 incompatibilities
+
 import MoinMoin  # validate python version
 import argparse
 import logging
@@ -52,15 +54,22 @@
         virtualenv.create_environment(self.dir_venv)
 
     def do_install(self):
-        subprocess.check_call((
+        args = [
             os.path.join(self.dir_venv_bin, 'pip'),
             'install',
             # XXX: move cache to XDG cache dir
             '--download-cache',
             os.path.join(os.path.dirname(self.dir_venv), '.pip-download-cache'),
             '--editable',
-            self.dir_source
-        ))
+            self.dir_source,
+        ]
+        if PIP15:
+            args += [
+            '--process-dependency-links',
+            '--allow-external', 'flatland',
+            '--allow-unverified', 'flatland',
+        ]
+        subprocess.check_call(args)
 
     def do_catalog(self):
         subprocess.check_call((