pin pip to py2.4 compat

socialplanning · May 5, 2013 · 4b074ab · 4b074ab
1 parent 966f6ac
commit 4b074ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/fassembler-boot.py b/fassembler-boot.py
@@ -398,14 +398,14 @@ def install_pip(py_executable):
     filenames.sort()
     filenames = [filename for basename, i, filename in filenames]
     if not filenames:
-        filename = 'pip'
+        filename = 'pip==1.1'
     else:
         filename = filenames[-1]
     easy_install_script = 'easy_install'
     if sys.platform == 'win32':
         easy_install_script = 'easy_install-script.py'
     cmd = [py_executable, join(os.path.dirname(py_executable), easy_install_script), filename]
-    if filename == 'pip':
+    if filename == 'pip==1.1':
         logger.info('Installing pip from network...')
     else:
         logger.info('Installing %s' % os.path.basename(filename))
@@ -655,7 +655,7 @@ def create_environment(home_dir, site_packages=True, clear=False,
     else:
         install_setuptools(py_executable, unzip=unzip_setuptools)
 
-    #install_pip(py_executable)
+    install_pip(py_executable)
 
     install_activate(home_dir, bin_dir, prompt)
 

diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@
           'virtualenv',
           'Pygments',
           'MySQL-python==1.2.3', # At least, some projects require MySQL access
-          'pip',
+          'pip==1.1',
       ],
       ## FIXME: release all of these once fassembler stabilizes:
       dependency_links=[