Merge pull request #14 from gtalarico/fix-python-version

Fix get python version calls

HISTORY.rst

@@ -2,6 +2,16 @@
 History
 =======
 
+0.6.1 (2018-05-15)
+--------------------------
+* Fix Python binary version detect call
+
+
+0.6.0 (2018-05-15)
+--------------------------
+* Added completion helper flag and completion docs
+
+
 0.5.1 (2018-05-13)
 --------------------------
 * Bug fix: Setup.py missing picker package

pipenv_pipes/core.py

@@ -58,11 +58,12 @@ def find_binary(envpath):
 def get_binary_version(envpath):
     """ Returns a string indicating the Python version (Python 3.5.6) """
     pybinpath = find_binary(envpath)
-    version, code = call_python_version(pybinpath)
+    output, code = call_python_version(pybinpath)
     if not code:
-        return version
+        return output
     else:
-        raise EnvironmentError('could not get binary version')
+        raise EnvironmentError(
+            'could not get binary version: {}'.format(output))
 
 
 ###############################

pipenv_pipes/environment.py

@@ -3,12 +3,15 @@
 """ Pipes: Pipenv Shell Switcher """
 
 import os
+import sys
 
 
 class EnvVars():
 
     def __init__(self):
-        self.IS_WINDOWS = os.name == 'nt'
+        self.IS_WINDOWS = sys.platform == 'win32'
+        self.IS_MAC = sys.platform == 'darwin'
+        self.IS_LINUX = sys.platform == 'linux'
 
         if self.IS_WINDOWS:
             default_home = '~/.virtualenvs'

pipenv_pipes/pipenv.py

@@ -52,5 +52,5 @@ def call_pipenv_shell(cwd, envname='pipenv-shell', timeout=None):
 def call_python_version(pybinpath):
     # TODO Rename this module
     binpath = os.path.dirname(pybinpath)
-    output, code = PipedPopen(cmds=['python', '--version'], cwd=binpath)
+    output, code = PipedPopen(cmds=['./python', '--version'], cwd=binpath)
     return output, code

setup.cfg

@@ -1,17 +1,17 @@
 [bumpversion]
-current_version = 0.6.0-beta1
+current_version = 0.6.0
 commit = True
 tag = True
 message = Bump version: {current_version} -> {new_version}
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<num>\d+))?
-serialize = 
+serialize =
 	{major}.{minor}.{patch}-{release}.{num}
 	{major}.{minor}.{patch}
 
 [bumpversion:part:release]
 first_value = alpha
 optional_value = alpha
-values = 
+values =
 	alpha
 	beta
 	rc

tests/conftest.py

@@ -1,5 +1,6 @@
 import pytest
 import os
+import sys
 from contextlib import contextmanager
 from tempfile import TemporaryDirectory
 import shutil
@@ -12,7 +13,7 @@
     find_environments,
     write_project_dir_project_file,
 )
-
+from pipenv_pipes.environment import EnvVars
 
 HERE = os.path.dirname(__file__)
 VENVS_ARCHIVE = os.path.join(HERE, 'venvs')
@@ -31,19 +32,24 @@ def unzip_tar(src, dst):
 
 
 @pytest.fixture
-def venv_archive_path():
-    filename = 'unix.tar.gz'
-    if 'nt' in os.name:
-        filename = 'win.tar.gz'
+def env_vars():
+    return EnvVars()
+
+
+@pytest.fixture
+def venv_archive_path(env_vars):
+    """ Note: This provides a path to zipped envs create for the
+    for the purpose of optimizing test run time """
+    filename = '{}.tar.gz'.format(sys.platform)
     return os.path.join(VENVS_ARCHIVE, filename)
 
 
 @pytest.fixture
-def win_tempdir():
+def win_tempdir(env_vars):
     # Default %TEMP% returns windows short path (C:\\Users\\GTALAR~1\\AppData)
     # The`~1`` breaks --venv hash resolution, so we must build path manually
     # On other systems this will be none, so default env will be used
-    if 'nt' not in os.name:
+    if not env_vars.IS_WINDOWS:
         return None
     path = os.path.join(os.environ['USERPROFILE'], 'AppData', 'Local', 'Temp')
     assert '~' not in path