Merge 5677ecb into 0802e4f

.activate.sh

@@ -0,0 +1,2 @@
+make venv
+. venv-venv_update/bin/activate

.deactivate.sh

@@ -0,0 +1 @@
+deactivate

.pep8

@@ -1,3 +1,7 @@
+[pep8]
+max-line-length=131
+exclude=.tox,*.tmp,tmp/
+
 [flake8]
 max-line-length=131
 exclude=.tox,*.tmp,tmp/

.pre-commit-config.yaml

@@ -1,19 +1,31 @@
 -   repo: git://github.com/pre-commit/pre-commit-hooks
-    sha: 15b678e9c67c42765c3d579e40672a332f4366d7
+    sha: 616c1ebd1898c91de9a0548866a59cbd9f4547f6
     hooks:
-    -   id: trailing-whitespace
-        files: \.(md|py|txt|sh)$
-    -   id: end-of-file-fixer
-        files: \.(md|py|txt|sh)$
+    -   id: autopep8-wrapper
+    -   id: check-added-large-files
+    -   id: check-case-conflict
+    -   id: check-docstring-first
+    -   id: check-json
+    -   id: check-merge-conflict
+    -   id: check-xml
+    -   id: check-yaml
     -   id: debug-statements
-        files: \.py$
-    -   id: name-tests-test
-        files: tests/.+\.py$
-        exclude: tests/testing.*\.py$
+    -   id: detect-private-key
+    -   id: double-quote-string-fixer
+    -   id: end-of-file-fixer
     -   id: flake8
-        files: \.py$
--   repo: git://github.com/bukzor/pre-commit-system-hook.git
-    sha: 64a3e3f0d11f74ccd0498ea3149c8e177dd9989c
+-   repo: git://github.com/asottile/reorder_python_imports
+    sha: 3d86483455ab5bd06cc1069fdd5ac57be5463f10
+    hooks:
+    -   id: reorder-python-imports
+        args:
+        - --add-import
+        - from __future__ import absolute_import
+        - --add-import
+        - from __future__ import print_function
+        - --add-import
+        - from __future__ import unicode_literals
+-   repo: local
     hooks:
     -   id: system
         name: PyLint

.travis.yml

@@ -3,7 +3,7 @@ env:
     # putting this ahead of the `python` directive
     #   means we start all lints before any tests
     - TOXENV=lint
-    - TOXENV=test
+    - TOXENV=python
 python:
     # in order of most-valuable tests first
     - "3.4"

Makefile

@@ -3,16 +3,22 @@ all: lint test
 
 .PHONY: lint
 lint:
-	pre-commit run --all
+	pre-commit run --all-files
 
 .PHONY: test tests
 test tests:
-	./.travis/test.sh $(ARGS)
+	./test $(ARGS)
 
 .PHONY: tox
 tox:
 	tox -e lint,test
 
+.PHONY: venv
+venv:
+	tox -ve venv
+	# see: https://bitbucket.org/ned/coveragepy/issue/340/keyerror-subpy#comment-13671053
+	rm -rf venv-venv_update/local/
+
 .PHONY: clean
 clean:
 	rm -rf .tox

pylintrc

@@ -26,6 +26,9 @@ max-line-length=131
 [TYPECHECK]
 ignored-classes=pytest,LocalPath
 
+[SIMILARITIES]
+ignore-imports=yes
+
 [DESIGN]
 min-public-methods=0
 

requirements.d/dev.txt

@@ -2,4 +2,6 @@
 -e .
 -r test.txt
 -r _lint.txt
-tox
+
+# <2 -- https://bitbucket.org/hpk42/tox/issue/246
+tox>=1.9,<2

requirements.d/prod.txt

@@ -1,2 +1,2 @@
-# minimal set of packasges for end-users
+# minimal set of packages for end-users
 virtualenv<2

requirements.d/travis.txt

@@ -1,4 +1,4 @@
 # minimal set of packages for travis to run our test suites
-tox
+tox>=1.9,<2
 coverage
 coveralls

setup.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
-
+from __future__ import absolute_import
+from __future__ import print_function
 from __future__ import unicode_literals
+
 from setuptools import find_packages
 from setuptools import setup
 
@@ -9,7 +11,7 @@ def main():
     setup(
         name='venv-update',
         version='0.1.2dev0',
-        description="Quickly and exactly synchronize a virtualenv with a requirements.txt",
+        description='Quickly and exactly synchronize a virtualenv with a requirements.txt',
         url='https://github.com/Yelp/venv-update',
         author='Buck Golemon',
         author_email='buck@yelp.com',

.travis/test.sh → test

@@ -6,14 +6,14 @@ export PROJECT=venv_update
 NCPU=$(getconf _NPROCESSORS_CONF)
 
 if python -c 'import platform; exit(not(platform.python_implementation() == "PyPy"))'; then
-    # coverage under pypy takes too dang long:
-    #   https://bitbucket.org/pypy/pypy/issue/1871/10x-slower-than-cpython-under-coverage#comment-14404182
     PYPY=true
 else
     PYPY=false
 fi
 
 if $PYPY; then
+    # coverage under pypy takes too dang long:
+    #   https://bitbucket.org/pypy/pypy/issue/1871/10x-slower-than-cpython-under-coverage#comment-14404182
     # Having issues with memory, let's try reducing CPUs by half
     py.test -n $((NCPU / 3)) \
         "$@" $TOP/tests $SITEPACKAGES/${PROJECT}.py

tests/conftest.py

@@ -1,15 +1,19 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import unicode_literals
+
 import pytest
 
 
-@pytest.fixture(scope="session", autouse=True)
+@pytest.fixture(scope='session', autouse=True)
 def no_pip_environment_vars():
     import os
     for var in dict(os.environ):
         if var.startswith('PIP_'):
             del os.environ[var]
 
 
-@pytest.fixture(scope="session", autouse=True)
+@pytest.fixture(scope='session', autouse=True)
 def no_pythonpath_environment_var():
     import os
     for var in dict(os.environ):

tests/functional/conflict_test.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import
+from __future__ import print_function
 from __future__ import unicode_literals
 
 from subprocess import CalledProcessError
 
 import pytest
-
 import testing as T
 
 
@@ -25,12 +25,15 @@ def test_conflicting_reqs(tmpdir):
     assert err == ''
 
     out = T.uncolor(out)
-    assert '''
+    assert (
+        '''
 Cleaning up...
-Error: version conflict: mccabe 0.2 <-> mccabe>=0.2.1 (from flake8==2.2.5 (from -r requirements.txt (line 3)))
+Error: version conflict: mccabe 0.2 (virtualenv_run/lib/python2.7/site-packages)'''
+        ''' <-> mccabe>=0.2.1 (from flake8==2.2.5 (from -r requirements.txt (line 3)))
 
 Something went wrong! Sending 'virtualenv_run' back in time, so make knows it's invalid.
-''' in out
+'''
+    ) in out
 
 
 def test_multiple_issues(tmpdir):
@@ -56,11 +59,15 @@ def test_multiple_issues(tmpdir):
     assert err == ''
 
     out = T.uncolor(out)
-    assert '''
+    assert (
+        '''
 Cleaning up...
-Error: version conflict: mccabe 0.2 <-> mccabe>=0.2.1 (from flake8==2.2.5 (from -r requirements.txt (line 3)))
-Error: version conflict: pep8 1.0 <-> pep8>=1.5.7 (from flake8==2.2.5 (from -r requirements.txt (line 3)))
+Error: version conflict: mccabe 0.2 (virtualenv_run/lib/python2.7/site-packages)'''
+        ''' <-> mccabe>=0.2.1 (from flake8==2.2.5 (from -r requirements.txt (line 3)))
+Error: version conflict: pep8 1.0 (virtualenv_run/lib/python2.7/site-packages) '''
+        '''<-> pep8>=1.5.7 (from flake8==2.2.5 (from -r requirements.txt (line 3)))
 Error: unmet dependency: pyflakes>=0.8.1 (from flake8==2.2.5 (from -r requirements.txt (line 3)))
 
 Something went wrong! Sending 'virtualenv_run' back in time, so make knows it's invalid.
-''' in out
+'''
+    ) in out

tests/functional/get_installed_test.py

@@ -1,7 +1,9 @@
+from __future__ import absolute_import
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from testing import run, venv_update_script
+from testing import run
+from testing import venv_update_script
 
 
 def get_installed():

tests/functional/help_test.py

@@ -1,4 +1,10 @@
-from testing import strip_coverage_warnings, venv_update
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from testing import strip_coverage_warnings
+from testing import venv_update
+
 from venv_update import __doc__ as HELP_OUTPUT
 
 

tests/functional/install_test.py

@@ -1,7 +1,9 @@
+from __future__ import absolute_import
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from testing import run, venv_update_script
+from testing import run
+from testing import venv_update_script
 
 
 def test_pip_install_flake8(tmpdir):

tests/functional/relocation_test.py

@@ -2,7 +2,10 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from testing import Path, requirements, run, venv_update
+from testing import Path
+from testing import requirements
+from testing import run
+from testing import venv_update
 
 
 def test_relocatable(tmpdir):
@@ -41,16 +44,20 @@ def test_python_versions(tmpdir):
 
 
 def test_virtualenv_moved(tmpdir):
+    """if you move the virtualenv and venv-update again, the old will be blown away, and things will work"""
     original_path = 'original'
     new_path = 'new_dir'
 
     tmpdir.mkdir(original_path).chdir()
     requirements("flake8==2.4.0\n")
     Path('run.py').write("")
     venv_update()
+    run('virtualenv_run/bin/flake8', 'run.py')
+    run('virtualenv_run/bin/python', 'virtualenv_run/bin/flake8', 'run.py')
 
     tmpdir.chdir()
     Path(original_path).rename(new_path)
     tmpdir.join(new_path).chdir()
     venv_update()
     run('virtualenv_run/bin/flake8', 'run.py')
+    run('virtualenv_run/bin/python', 'virtualenv_run/bin/flake8', 'run.py')

tests/functional/simple_test.py

@@ -1,20 +1,19 @@
+from __future__ import absolute_import
 from __future__ import print_function
 from __future__ import unicode_literals
-import re
-from py._path.local import LocalPath as Path
-import pytest
-
-from testing import (
-    TOP,
-    requirements,
-    run,
-    strip_coverage_warnings,
-    uncolor,
-    venv_update,
-    venv_update_symlink_pwd,
-)
 
+import re
 from sys import version_info
+
+import pytest
+from py._path.local import LocalPath as Path
+from testing import requirements
+from testing import run
+from testing import strip_coverage_warnings
+from testing import TOP
+from testing import uncolor
+from testing import venv_update
+from testing import venv_update_symlink_pwd
 PY33 = (version_info >= (3, 3))
 
 
@@ -47,7 +46,9 @@ def install_twice(tmpdir, between):
 simplejson==3.6.5
 pyyaml==3.11
 pylint==1.4.0
+logilab-common==0.63.2
 astroid<1.3.3
+py==1.4.26
 pytest==2.6.4
 unittest2==0.8.0
 six<=1.8.0
@@ -163,6 +164,7 @@ def test_arguments_version(tmpdir):
 
     assert excinfo.value.returncode == 1
     out, err = excinfo.value.result
+    err = strip_coverage_warnings(err)
     lasterr = err.rsplit('\n', 2)[-2]
     assert lasterr.startswith('virtualenv executable not found: /'), err
     assert lasterr.endswith('/virtualenv_run/bin/python'), err

tests/functional/stage2_test.py

@@ -2,11 +2,17 @@
 We need to test "stage 2" independently for coverage measurements.
 The coverage tool loses track of it because it's run via os.exec().
 """
+from __future__ import absolute_import
 from __future__ import print_function
 from __future__ import unicode_literals
+
 import pytest
+from testing import requirements
+from testing import run
+from testing import strip_coverage_warnings
+from testing import TOP
+from testing import uncolor
 
-from testing import TOP, requirements, run, uncolor
 import venv_update
 
 
@@ -31,7 +37,7 @@ def test_trivial(tmpdir):
     run(
         'myvenv/bin/pip',
         'install',
-        '-r', (TOP/'requirements.d/coverage.txt').strpath
+        '-r', (TOP / 'requirements.d/coverage.txt').strpath
     )
 
     stage2('myvenv/bin/python', tmpdir)
@@ -48,9 +54,11 @@ def test_error_with_wrong_python(tmpdir):
 
     assert excinfo.value.returncode == 1
     out, err = excinfo.value.result
-    lasterr = err.rsplit('\n', 2)[-2]
 
+    err = strip_coverage_warnings(err)
+    lasterr = err.rsplit('\n', 2)[-2]
     assert lasterr == 'AssertionError: Executable not in venv: %s != %s/myvenv/bin/python' % (executable, tmpdir.strpath)
+
     assert out == ''
 
 
@@ -70,6 +78,7 @@ def test_touch_on_error(tmpdir):
     assert excinfo.value.returncode == 1
     out, err = excinfo.value.result
 
+    err = strip_coverage_warnings(err)
     lasterr = err.rsplit('\n', 2)[-2]
     assert lasterr == 'AssertionError: Executable not in venv: %s != %s/myvenv/bin/python' % (executable, tmpdir.strpath)