Revert "Merge pull request #933 from pypa/feature/581-depend-not-bundle"

This reverts commit 089cdeb, reversing
changes made to aaec654.

.gitignore

@@ -13,4 +13,3 @@ setuptools.egg-info
 *.swp
 *~
 .hg*
-requirements.txt

.travis.yml

@@ -15,15 +15,15 @@ matrix:
   - python: 2.7
     env: LC_ALL=C LC_CTYPE=C
 script:
- # need tox and rwt to get started
- - pip install tox rwt
+ - pip install tox
 
  # Output the env, to verify behavior
  - env
 
  # update egg_info based on setup.py in checkout
  - python bootstrap.py
 
+ #- python -m tox
  - tox
 
 before_deploy:

bootstrap.py

@@ -5,14 +5,7 @@
 egg-info command to flesh out the egg-info directory.
 """
 
-from __future__ import unicode_literals
-
 import os
-import io
-import re
-import contextlib
-import tempfile
-import shutil
 import sys
 import textwrap
 import subprocess
@@ -48,8 +41,7 @@ def build_egg_info():
     """
 
     os.mkdir('setuptools.egg-info')
-    filename = 'setuptools.egg-info/entry_points.txt'
-    with io.open(filename, 'w', encoding='utf-8') as ep:
+    with open('setuptools.egg-info/entry_points.txt', 'w') as ep:
         ep.write(minimal_egg_info)
 
 
@@ -61,44 +53,9 @@ def run_egg_info():
     subprocess.check_call(cmd)
 
 
-def gen_deps():
-    with io.open('setup.py', encoding='utf-8') as strm:
-        text = strm.read()
-    pattern = r'install_requires=\[(.*?)\]'
-    match = re.search(pattern, text, flags=re.M|re.DOTALL)
-    reqs = eval(match.group(1).replace('\n', ''))
-    with io.open('requirements.txt', 'w', encoding='utf-8') as reqs_file:
-        reqs_file.write('\n'.join(reqs))
-
-
-@contextlib.contextmanager
-def install_deps():
-    "Just in time make the deps available"
-    import pip
-    tmpdir = tempfile.mkdtemp()
-    args = [
-        'install',
-        '-t', tmpdir,
-        '-r', 'requirements.txt',
-    ]
-    pip.main(args)
-    os.environ['PYTHONPATH'] = tmpdir
-    try:
-        yield tmpdir
-    finally:
-        shutil.rmtree(tmpdir)
-
-
 def main():
     ensure_egg_info()
-    gen_deps()
-    try:
-        # first assume dependencies are present
-        run_egg_info()
-    except Exception:
-        # but if that fails, try again with dependencies just in time
-        with install_deps():
-            run_egg_info()
+    run_egg_info()
 
 
 __name__ == '__main__' and main()

pavement.py

@@ -0,0 +1,32 @@
+import re
+
+from paver.easy import task, path as Path
+import pip
+
+
+def remove_all(paths):
+    for path in paths:
+        path.rmtree() if path.isdir() else path.remove()
+
+
+@task
+def update_vendored():
+    vendor = Path('pkg_resources/_vendor')
+    # pip uninstall doesn't support -t, so do it manually
+    remove_all(vendor.glob('packaging*'))
+    remove_all(vendor.glob('six*'))
+    remove_all(vendor.glob('pyparsing*'))
+    remove_all(vendor.glob('appdirs*'))
+    install_args = [
+        'install',
+        '-r', str(vendor / 'vendored.txt'),
+        '-t', str(vendor),
+    ]
+    pip.main(install_args)
+    packaging = vendor / 'packaging'
+    for file in packaging.glob('*.py'):
+        text = file.text()
+        text = re.sub(r' (pyparsing|six)', r' pkg_resources.extern.\1', text)
+        file.write_text(text)
+    remove_all(vendor.glob('*.dist-info'))
+    remove_all(vendor.glob('*.egg-info'))

pkg_resources/__init__.py

@@ -45,8 +45,8 @@
     # Python 3.2 compatibility
     import imp as _imp
 
-import six
-from six.moves import urllib, map, filter
+from pkg_resources.extern import six
+from pkg_resources.extern.six.moves import urllib, map, filter
 
 # capture these to bypass sandboxing
 from os import utime
@@ -67,11 +67,12 @@
 except ImportError:
     importlib_machinery = None
 
-import packaging.version
-import packaging.specifiers
-import packaging.requirements
-import packaging.markers
-import appdirs
+from pkg_resources.extern import appdirs
+from pkg_resources.extern import packaging
+__import__('pkg_resources.extern.packaging.version')
+__import__('pkg_resources.extern.packaging.specifiers')
+__import__('pkg_resources.extern.packaging.requirements')
+__import__('pkg_resources.extern.packaging.markers')
 
 if (3, 0) < sys.version_info < (3, 3):
     raise RuntimeError("Python 3.3 or later is required")