third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-19 17:14:43 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #258 from meunierd/expanduser

Browse source 
Allow specifying python version relative to user's home directory.
This commit is contained in:
Anthony Sottile 2015-08-13 11:32:28 -07:00
commit 4da968a5ea
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pre_commit/languages/python.py
View file

@ -31,8 +31,11 @@ def in_env(repo_cmd_runner, language_version):
def norm_version(version): def norm_version(version):
version = os.path.expanduser(version)
if os.name == 'nt': # pragma: no cover (windows) if os.name == 'nt': # pragma: no cover (windows)
if not distutils.spawn.find_executable(version): if not distutils.spawn.find_executable(version):
# expanduser introduces a leading slash
version = version.strip('\\')
# The default place for python on windows is: # The default place for python on windows is:
# C:\PythonXX\python.exe # C:\PythonXX\python.exe
version = r'C:\{0}\python.exe'.format(version.replace('.', '')) version = r'C:\{0}\python.exe'.format(version.replace('.', ''))

14
tests/repository_test.py
View file

@ -2,6 +2,7 @@ from __future__ import absolute_import
from __future__ import unicode_literals from __future__ import unicode_literals
import io import io
import os
import os.path import os.path
import shutil import shutil
@ -12,6 +13,7 @@ from pre_commit import five
from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA
from pre_commit.clientlib.validate_config import validate_config_extra from pre_commit.clientlib.validate_config import validate_config_extra
from pre_commit.jsonschema_extensions import apply_defaults from pre_commit.jsonschema_extensions import apply_defaults
from pre_commit.languages.python import norm_version
from pre_commit.languages.python import PythonEnv from pre_commit.languages.python import PythonEnv
from pre_commit.repository import Repository from pre_commit.repository import Repository
from pre_commit.util import cmd_output from pre_commit.util import cmd_output
@ -414,3 +416,15 @@ def test_local_repository():
with pytest.raises(NotImplementedError): with pytest.raises(NotImplementedError):
local_repo.manifest local_repo.manifest
assert len(local_repo.hooks) == 1 assert len(local_repo.hooks) == 1
def test_norm_version_expanduser(): # pragma: no cover
home = os.path.expanduser('~')
if os.name == 'nt':
path = r'~\python343'
expected_path = r'C:{0}\python343\python.exe'.format(home)
else:
path = '~/.pyenv/versions/3.4.3/bin/python'
expected_path = home + '/.pyenv/versions/3.4.3/bin/python'
result = norm_version(path)
assert result == expected_path