From 895f08af6e6b9c9b1e8e35d25eee9c7a472ee796 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Wed, 12 Aug 2015 11:23:25 -0700 Subject: [PATCH] Fix pre-commit when python-future is installed and a py3 virtualenv is being created --- pre_commit/languages/python.py | 2 +- requirements-dev.txt | 2 ++ setup.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py index 0ee0c04b..00e7ea3b 100644 --- a/pre_commit/languages/python.py +++ b/pre_commit/languages/python.py @@ -56,7 +56,7 @@ def install_environment( # Install a virtualenv with clean_path_on_failure(repo_cmd_runner.path(directory)): venv_cmd = [ - sys.executable, '-m', 'virtualenv', + sys.executable, '-m', 'virtualenv_hax', '{{prefix}}{0}'.format(directory) ] if version != 'default': diff --git a/requirements-dev.txt b/requirements-dev.txt index 17613a38..62d6f616 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,6 +3,8 @@ astroid<1.3.3 coverage flake8 +# To ensure py2 creating py3 virtualenv works under test +future mock pylint<1.4 pytest diff --git a/setup.py b/setup.py index 43b69da1..4156a9c9 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ setup( 'ordereddict', 'pyyaml', 'simplejson', - 'virtualenv', + 'virtualenv-hax', ], entry_points={ 'console_scripts': [