Dont uninstall setuptools deps

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 -   repo: git://github.com/pre-commit/pre-commit-hooks
-    sha: 5edf945ca57abe10a8f090f18e575eabb6a9585a
+    sha: v0.7.0
     hooks:
     -   id: autopep8-wrapper
     -   id: check-added-large-files
@@ -10,14 +10,14 @@
     -   id: check-yaml
     -   id: debug-statements
     -   id: detect-private-key
-        exclude: '^\.activate\.sh$'
+        exclude: ^\.activate\.sh$
     -   id: double-quote-string-fixer
     -   id: end-of-file-fixer
-        exclude: '^\.activate\.sh$'
+        exclude: ^\.activate\.sh$
     -   id: flake8
         exclude: ^docs/
 -   repo: git://github.com/asottile/reorder_python_imports
-    sha: 8b583ac1beb0dd0f14c4bceb0a53bb1023cb3dd7
+    sha: v0.3.1
     hooks:
     -   id: reorder-python-imports
         args:

CI/coverage

@@ -5,4 +5,4 @@ export TOP=$PWD
 coverage xml
 
 pip-faster install codecov  # pending https://github.com/codecov/codecov-python/pull/57
-codecov -e CIRCLECI TRAVIS PYTHON --file coverage.xml
+codecov -e TRAVIS PYTHON --file coverage.xml

README.md

@@ -5,8 +5,6 @@ Quickly and exactly synchronize a large python project's virtualenv with its
 
 [![PyPI version](https://badge.fury.io/py/venv-update.svg)]
 (https://pypi.python.org/pypi/venv-update)
-[![Circle CI](https://circleci.com/gh/Yelp/venv-update/tree/master.svg?style=shield)]
-(https://circleci.com/gh/Yelp/venv-update/tree/master)
 [![Travis CI](https://img.shields.io/travis/Yelp/venv-update/master.svg?label=travis-ci)]
 (https://travis-ci.org/Yelp/venv-update/branches)
 [![Coverage](https://codecov.io/github/Yelp/venv-update/coverage.svg?branch=master)]

docs/source/_templates/about.html

@@ -18,12 +18,3 @@
     />
 </a>
 </p>
-
-<p>
-<a href="https://circleci.com/gh/Yelp/venv-update/tree/master">
-    <img
-        alt="https://circleci.com/gh/Yelp/venv-update/tree/master.svg?style=shield"
-        src="https://circleci.com/gh/Yelp/venv-update/tree/master.svg?style=shield"
-    />
-</a>
-</p>

docs/source/index.rst

@@ -2,7 +2,7 @@ venv-update: quick, exact
 =========================
 `Issues <https://github.com/yelp/pip-faster/issues>`_ |
 `Github <https://github.com/yelp/pip-faster>`_ |
-`CI <https://circleci.com/gh/Yelp/pip-faster>`_ |
+`CI <https://travis-ci.org/Yelp/venv-update>`_ |
 `PyPI <https://pypi.python.org/pypi/pip-faster/>`_
 
 Release v\ |release| (:ref:`Installation`)

pip_faster.py

@@ -33,6 +33,7 @@
 from pip.index import HTMLPage
 from pip.index import Link
 from pip.index import PackageFinder
+from pip.req import InstallRequirement
 from pip.wheel import Wheel
 
 from venv_update import colorize
@@ -311,7 +312,6 @@ def trace_requirements(requirements):
         # TODO: pip does no validation of extras. should we?
         extras = [extra for extra in req.extras if extra in dist.extras]
         for sub_req in sorted(dist.requires(extras=extras), key=lambda req: req.key):
-            from pip.req import InstallRequirement
             sub_req = InstallRequirement(sub_req, req)
 
             if req_cycle(sub_req):
@@ -388,8 +388,7 @@ def run(self, options, args):
             reqnames(previously_installed) -
             reqnames(required) -
             reqnames(successfully_installed) -
-            # TODO: instead of this, add `venv-update` to the `required`, and let trace-requirements do its work
-            set(['venv-update', 'virtualenv', 'pip', 'setuptools', 'wheel', 'argparse'])  # the stage1 bootstrap packages
+            reqnames(trace_requirements([InstallRequirement.from_line('venv-update')]))  # the stage1 bootstrap packages
         )
 
         if extraneous:

tests/functional/faster.py

@@ -43,13 +43,20 @@ def venv_setup():
             yield
 
             expected = '\n'.join((
+                'appdirs==1.4.0',
                 'dependant-package==1',
                 'implicit-dependency==1',
                 'many-versions-package==2.1',
+                'packaging==16.8',
+                'pip==9.0.1',
                 'project-with-c==0.1.0',
                 'pure-python-package==0.2.1',
+                'pyparsing==2.1.10',
+                'setuptools==34.0.2',
+                'six==1.10.0',
                 'slow-python-package==0.1.0',
                 'venv-update==%s' % __version__,
+                'wheel==0.29.0',
                 ''
             ))
             assert pip_freeze() == expected

tests/functional/get_installed_test.py

@@ -7,7 +7,10 @@
 from testing import run
 from venv_update import __version__
 
-ALWAYS = set(['pip', 'venv-update', 'setuptools', 'wheel'])
+ALWAYS = set((
+    'appdirs', 'packaging', 'pip', 'pyparsing', 'six', 'setuptools',
+    'venv-update', 'wheel',
+))
 
 
 def get_installed():

tests/functional/pip_faster.py

@@ -32,8 +32,15 @@ def it_installs_stuff(tmpdir):
     install_coverage(venv)
 
     assert pip_freeze(str(venv)) == '''\
+appdirs==1.4.0
 coverage==4.3.4
 coverage-enable-subprocess==1.0
+packaging==16.8
+pip==9.0.1
+pyparsing==2.1.10
+setuptools==34.0.2
+six==1.10.0
+wheel==0.29.0
 '''
 
     pip = venv.join('bin/pip').strpath
@@ -42,7 +49,18 @@ def it_installs_stuff(tmpdir):
     assert [
         req.split('==')[0]
         for req in pip_freeze(str(venv)).split()
-    ] == ['coverage', 'coverage-enable-subprocess', 'venv-update']
+    ] == [
+        'appdirs',
+        'coverage',
+        'coverage-enable-subprocess',
+        'packaging',
+        'pip',
+        'pyparsing',
+        'setuptools',
+        'six',
+        'venv-update',
+        'wheel',
+    ]
 
     run(str(venv.join('bin/pip-faster')), 'install', 'pure_python_package')
 
@@ -88,9 +106,16 @@ def it_installs_stuff_with_dash_e_without_wheeling(tmpdir):
     frozen_requirements = pip_freeze(str(venv)).split('\n')
     assert set(frozen_requirements) == set([
         '-e git://github.com/Yelp/dumb-init.git@87545be699a13d0fd31f67199b7782ebd446437e#egg=dumb_init',  # noqa
+        'appdirs==1.4.0',
         'coverage-enable-subprocess==1.0',
         'coverage==4.3.4',
+        'packaging==16.8',
+        'pip==9.0.1',
+        'pyparsing==2.1.10',
+        'setuptools==34.0.2',
+        'six==1.10.0',
         'venv-update==' + __version__,
+        'wheel==0.29.0',
         '',
     ])
 
@@ -133,13 +158,20 @@ def it_doesnt_wheel_local_dirs(tmpdir):
 
     frozen_requirements = pip_freeze(str(venv)).split('\n')
     assert set(frozen_requirements) == set([
+        'appdirs==1.4.0',
         'coverage==4.3.4',
         'coverage-enable-subprocess==1.0',
         'dependant-package==1',
         'implicit-dependency==1',
         'many-versions-package==3',
+        'packaging==16.8',
+        'pip==9.0.1',
         'pure-python-package==0.2.1',
+        'pyparsing==2.1.10',
+        'setuptools==34.0.2',
+        'six==1.10.0',
         'venv-update==' + __version__,
+        'wheel==0.29.0',
         '',
     ])
 
@@ -166,10 +198,17 @@ def it_doesnt_wheel_git_repos(tmpdir):
 
     frozen_requirements = pip_freeze(str(venv)).split('\n')
     assert set(frozen_requirements) == set([
+        'appdirs==1.4.0',
         'coverage-enable-subprocess==1.0',
         'coverage==4.3.4',
         'dumb-init==0.5.0',
+        'packaging==16.8',
+        'pip==9.0.1',
+        'pyparsing==2.1.10',
+        'setuptools==34.0.2',
+        'six==1.10.0',
         'venv-update==' + __version__,
+        'wheel==0.29.0',
         '',
     ])