Merge pull request #1003 from qwcode/test_new_setuptools

support the new setuptools

Author: qwcode

.travis.yml

@@ -10,7 +10,7 @@ before_install:
     - echo -e "[web]\ncacerts = /etc/ssl/certs/ca-certificates.crt" >> ~/.hgrc
     - git config --global user.email "[email protected]"
     - git config --global user.name "Pip"
-install: pip install nose virtualenv>=1.9.1 scripttest mock
+install: pip install nose git+https://github.com/pypa/virtualenv@develop#egg=virtualenv scripttest mock
 script: nosetests
 notifications:
   irc: "irc.freenode.org#pip"

pip/commands/install.py

@@ -232,13 +232,6 @@ def run(self, options, args):
             logger.warn(msg)
             return
 
-        import setuptools
-        if (options.use_user_site and
-            requirement_set.has_editables and
-            not getattr(setuptools, '_distribute', False)):
-
-            raise InstallationError('--user --editable not supported with setuptools, use distribute')
-
         try:
             if not options.no_download:
                 requirement_set.prepare_files(finder, force_root_egg_info=self.bundle, bundle=self.bundle)

pip/commands/wheel.py

@@ -10,7 +10,7 @@
 from pip.exceptions import CommandError
 from pip.req import InstallRequirement, RequirementSet, parse_requirements
 from pip.util import normalize_path
-from pip.wheel import WheelBuilder, wheel_distribute_support, distribute_requirement
+from pip.wheel import WheelBuilder, wheel_setuptools_support, distribute_requirement, setuptools_requirement
 from pip import cmdoptions
 
 DEFAULT_WHEEL_DIR = os.path.join(normalize_path(os.curdir), 'wheelhouse')
@@ -22,7 +22,7 @@ class WheelCommand(Command):
     Wheel is a built-package format, and offers the advantage of not recompiling your software during every install.
     For more details, see the wheel docs: http://wheel.readthedocs.org/en/latest.
 
-    Requirements: distribute>=0.6.34 (not setuptools), and wheel.
+    Requirements: distribute>=0.6.34 or setuptools>=0.7.2, and wheel.
 
     'pip wheel' uses the bdist_wheel setuptools extension from the wheel package to build individual wheels.
 
@@ -78,13 +78,13 @@ def __init__(self, *args, **kw):
 
     def run(self, options, args):
 
-        # requirements: wheel, and distribute
+        # confirm requirements
         try:
             import wheel.bdist_wheel
         except ImportError:
             raise CommandError("'pip wheel' requires bdist_wheel from the 'wheel' distribution.")
-        if not wheel_distribute_support():
-            raise CommandError("'pip wheel' requires %s." % distribute_requirement)
+        if not wheel_setuptools_support():
+            raise CommandError("'pip wheel' requires %s or %s." % (distribute_requirement, setuptools_requirement))
 
         index_urls = [options.index_url] + options.extra_index_urls
         if options.no_index:

pip/index.py

@@ -29,7 +29,7 @@
                                 Empty as QueueEmpty)
 from pip.backwardcompat import CertificateError
 from pip.download import urlopen, path_to_url2, url_to_path, geturl, Urllib2HeadRequest
-from pip.wheel import Wheel, wheel_ext, wheel_distribute_support, distribute_requirement
+from pip.wheel import Wheel, wheel_ext, wheel_setuptools_support, distribute_requirement
 from pip.pep425tags import supported_tags
 from pip.vendor import html5lib
 
@@ -90,7 +90,7 @@ def use_wheel(self):
     @use_wheel.setter
     def use_wheel(self, value):
         self._use_wheel = value
-        if self._use_wheel and not wheel_distribute_support():
+        if self._use_wheel and not wheel_setuptools_support():
             raise InstallationError("pip's wheel support requires %s." % distribute_requirement)
 
     def add_dependency_links(self, links):

pip/wheel.py

@@ -20,20 +20,27 @@
 
 wheel_ext = '.whl'
 distribute_requirement = pkg_resources.Requirement.parse("distribute>=0.6.34")
+setuptools_requirement = pkg_resources.Requirement.parse("setuptools>=0.7.2")
 
-def wheel_distribute_support(distribute_req=distribute_requirement):
+def wheel_setuptools_support():
     """
     Return True if we have a distribute that supports wheel.
 
     distribute_req: a pkg_resources.Requirement for distribute
     """
+
+    installed_distribute = installed_setuptools = ''
+    try:
+        installed_distribute = pkg_resources.get_distribution('distribute')
+    except pkg_resources.DistributionNotFound:
+        pass
     try:
-        installed_dist = pkg_resources.get_distribution('distribute')
-        supported = installed_dist in distribute_req
+        installed_setuptools = pkg_resources.get_distribution('setuptools')
     except pkg_resources.DistributionNotFound:
-        supported = False
+        pass
+    supported = (installed_distribute in distribute_requirement) or (installed_setuptools in setuptools_requirement)
     if not supported:
-        logger.warn("%s is required for wheel installs.", distribute_req)
+        logger.warn("%s or %s is required for wheel installs." % (setuptools_requirement, distribute_requirement))
     return supported
 
 

tests/functional/test_freeze.py

@@ -2,7 +2,7 @@
 import re
 import textwrap
 from doctest import OutputChecker, ELLIPSIS
-from tests.lib import reset_env, run_pip, write_file, get_env, pyversion
+from tests.lib import reset_env, run_pip, write_file, get_env, pyversion, pip_install_local
 from tests.lib.local_repos import local_checkout, local_repo
 
 
@@ -44,17 +44,17 @@ def test_freeze_basic():
     """
     env = reset_env()
     write_file('initools-req.txt', textwrap.dedent("""\
-        INITools==0.2
+        simple==2.0
         # and something else to test out:
-        MarkupSafe<=0.12
+        simple2<=3.0
         """))
-    result = run_pip('install', '-r', env.scratch_path/'initools-req.txt')
+    result = pip_install_local('-r', env.scratch_path/'initools-req.txt')
     result = run_pip('freeze', expect_stderr=True)
     expected = textwrap.dedent("""\
         Script result: pip freeze
         -- stdout: --------------------
-        INITools==0.2
-        MarkupSafe==0.12...
+        ...simple==2.0
+        simple2==3.0...
         <BLANKLINE>""")
     _check_output(result, expected)
 
@@ -236,7 +236,7 @@ def test_freeze_with_requirement_option():
         NoExist==4.2
         """) + ignores)
     result = run_pip('install', 'initools==0.2')
-    result = run_pip('install', 'MarkupSafe')
+    result = pip_install_local('simple')
     result = run_pip('freeze', '--requirement', 'hint.txt', expect_stderr=True)
     expected = textwrap.dedent("""\
         Script result: pip freeze --requirement hint.txt

tests/functional/test_install_index.py

@@ -27,7 +27,7 @@ def test_find_links_requirements_file_relative_path():
     e = reset_env()
     write_file('test-req.txt', textwrap.dedent("""
         --no-index
-        --find-links=../../../../data/packages/
+        --find-links=../../../data/packages/
         parent==0.1
         """))
     result = run_pip(

tests/functional/test_install_user.py

@@ -38,26 +38,11 @@ def test_reset_env_system_site_packages_usersite(self):
         assert 'INITools'== project_name, "'%s' should be 'INITools'" %project_name
 
 
-    def test_install_subversion_usersite_editable_with_setuptools_fails(self):
-        """
-        Test installing current directory ('.') into usersite using setuptools fails
-        """
-        # We don't try to use setuptools for 3.X.
-        if sys.version_info >= (3,):
-            raise SkipTest()
-        env = reset_env(use_distribute=False, system_site_packages=True)
-        result = run_pip('install', '--user', '-e',
-                         '%s#egg=initools-dev' %
-                         local_checkout('svn+http://svn.colorstudy.com/INITools/trunk'),
-                         expect_error=True)
-        assert '--user --editable not supported with setuptools, use distribute' in result.stdout
-
-
     def test_install_subversion_usersite_editable_with_distribute(self):
         """
         Test installing current directory ('.') into usersite after installing distribute
         """
-        env = reset_env(use_distribute=True, system_site_packages=True)
+        env = reset_env(system_site_packages=True)
         result = run_pip('install', '--user', '-e',
                          '%s#egg=initools-dev' %
                          local_checkout('svn+http://svn.colorstudy.com/INITools/trunk'))
@@ -68,7 +53,7 @@ def test_install_curdir_usersite(self):
         """
         Test installing current directory ('.') into usersite
         """
-        env = reset_env(use_distribute=True, system_site_packages=True)
+        env = reset_env(system_site_packages=True)
         run_from = abspath(join(tests_data, 'packages', 'FSPkg'))
         result = run_pip('install', '--user', curdir, cwd=run_from, expect_error=False)
         fspkg_folder = env.user_site/'fspkg'
@@ -225,7 +210,7 @@ def test_uninstall_editable_from_usersite(self):
         """
         Test uninstall editable local user install
         """
-        env = reset_env(use_distribute=True, system_site_packages=True)
+        env = reset_env(system_site_packages=True)
 
         #install
         to_install = abspath(join(tests_data, 'packages', 'FSPkg'))
@@ -245,7 +230,7 @@ def test_install_user_wheel(self):
         """
         Test user install from wheel
         """
-        env = reset_env(system_site_packages=True, use_distribute=True)
+        env = reset_env(system_site_packages=True)
         pip_install_local('wheel')
         result = run_pip('install', 'simple.dist==0.1', '--user', '--use-wheel',
                      '--no-index', '--find-links='+find_links)

tests/functional/test_install_wheel.py

@@ -9,7 +9,7 @@ def test_install_from_wheel():
     """
     Test installing from a wheel.
     """
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     result = run_pip('install', 'simple.dist', '--use-wheel',
                      '--no-index', '--find-links='+find_links,
                      expect_error=False)
@@ -27,7 +27,7 @@ def test_install_from_wheel_with_extras():
         import ast
     except ImportError:
         raise SkipTest("Need ast module to interpret wheel extras")
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     result = run_pip('install', 'complex-dist[simple]', '--use-wheel',
                      '--no-index', '--find-links='+find_links,
                      expect_error=False)
@@ -45,7 +45,7 @@ def test_install_from_wheel_file():
     """
     Test installing directly from a wheel file.
     """
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     package = abspath(join(tests_data,
                            'packages',
                            'headers.dist-0.1-py2.py3-none-any.whl'))
@@ -60,7 +60,7 @@ def test_install_wheel_with_target():
     """
     Test installing a wheel using pip install --target
     """
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     pip_install_local('wheel')
     target_dir = env.scratch_path/'target'
     result = run_pip('install', 'simple.dist==0.1', '-t', target_dir, '--use-wheel',
@@ -73,7 +73,7 @@ def test_install_from_wheel_installs_deps():
     Test can install dependencies of wheels
     """
     # 'requires_source' depends on the 'source' project
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     package = abspath(join(tests_data,
                            'packages',
                            'requires_source-1.0-py2.py3-none-any.whl'))
@@ -86,7 +86,7 @@ def test_install_from_wheel_no_deps():
     Test --no-deps works with wheel installs
     """
     # 'requires_source' depends on the 'source' project
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     package = abspath(join(tests_data,
                            'packages',
                            'requires_source-1.0-py2.py3-none-any.whl'))

tests/functional/test_search.py

@@ -80,7 +80,7 @@ def test_search_missing_argument():
     """
     Test missing required argument for search
     """
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     result = run_pip('search', expect_error=True)
     assert 'ERROR: Missing required argument (search query).' in result.stdout
 
@@ -111,7 +111,7 @@ def test_search_should_exit_status_code_zero_when_find_packages():
     """
     Test search exit status code for package found
     """
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     result = run_pip('search', 'pip')
     assert result.returncode == SUCCESS
 
@@ -120,6 +120,6 @@ def test_search_exit_status_code_when_finds_no_package():
     """
     Test search exit status code for no matches
     """
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     result = run_pip('search', 'non-existant-package', expect_error=True)
     assert result.returncode == NO_MATCHES_FOUND, result.returncode

tests/functional/test_wheel.py

@@ -14,27 +14,15 @@ def test_pip_wheel_fails_without_wheel():
     """
     Test 'pip wheel' fails without wheel
     """
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     result = run_pip('wheel', '--no-index', '-f', find_links, 'simple==3.0', expect_error=True)
     assert "'pip wheel' requires bdist_wheel" in result.stdout
 
-def test_pip_wheel_setuptools_fails():
-    """
-    Test 'pip wheel' fails with setuptools
-    """
-    if sys.version_info >= (3, 0):
-        # virtualenv installs distribute in py3
-        raise SkipTest()
-    env = reset_env(use_distribute=False)
-    pip_install_local('wheel')
-    result = run_pip('wheel', '--no-index', '-f', find_links, 'simple==3.0', expect_error=True)
-    assert "'pip wheel' requires %s" % wheel.distribute_requirement in result.stdout, result.stdout
-
 def test_pip_wheel_success():
     """
     Test 'pip wheel' success.
     """
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     pip_install_local('wheel')
     result = run_pip('wheel', '--no-index', '-f', find_links, 'simple==3.0')
     wheel_file_name = 'simple-3.0-py%s-none-any.whl' % pyversion_nodot
@@ -47,7 +35,7 @@ def test_pip_wheel_fail():
     """
     Test 'pip wheel' failure.
     """
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     pip_install_local('wheel')
     result = run_pip('wheel', '--no-index', '-f', find_links, 'wheelbroken==0.1')
     wheel_file_name = 'wheelbroken-0.1-py%s-none-any.whl' % pyversion_nodot
@@ -61,7 +49,7 @@ def test_pip_wheel_ignore_wheels_editables():
     """
     Test 'pip wheel' ignores editables and *.whl files in requirements
     """
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     pip_install_local('wheel')
 
     local_wheel = '%s/simple.dist-0.1-py2.py3-none-any.whl' % find_links
@@ -89,7 +77,7 @@ def test_no_clean_option_blocks_cleaning_after_wheel():
     """
     Test --no-clean option blocks cleaning after wheel build
     """
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     pip_install_local('wheel')
     result = run_pip('wheel', '--no-clean', '--no-index', '--find-links=%s' % find_links, 'simple')
     build = env.venv_path/'build'/'simple'
@@ -101,7 +89,7 @@ def test_pip_wheel_source_deps():
     Test 'pip wheel --use-wheel' finds and builds source archive dependencies of wheels
     """
     # 'requires_source' is a wheel that depends on the 'source' project
-    env = reset_env(use_distribute=True)
+    env = reset_env()
     pip_install_local('wheel')
     result = run_pip('wheel', '--use-wheel', '--no-index', '-f', find_links, 'requires_source')
     wheel_file_name = 'source-1.0-py%s-none-any.whl' % pyversion_nodot