jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-25 22:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increase robustness dependency installation

Browse Source
This commit is contained in:
Paulus Schoutsen 2015-07-15 18:37:24 -07:00
parent 34b6627f9a
commit c532a28a98
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
homeassistant/__main__.py
View File

@ -7,6 +7,8 @@ import argparse
import subprocess import subprocess
DEPENDENCIES = ['requests>=2.0', 'pyyaml>=3.11', 'pytz>=2015.2'] DEPENDENCIES = ['requests>=2.0', 'pyyaml>=3.11', 'pytz>=2015.2']
IS_VIRTUAL = (getattr(sys, 'base_prefix', sys.prefix) != sys.prefix or
hasattr(sys, 'real_prefix'))
def validate_python(): def validate_python():
@ -22,10 +24,13 @@ def validate_python():
def install_package(package): def install_package(package):
"""Install a package on PyPi. Accepts pip compatible package strings. """Install a package on PyPi. Accepts pip compatible package strings.
Return boolean if install successfull.""" Return boolean if install successfull."""
args = ['python3', '-m', 'pip', 'install', '--quiet', package] args = [sys.executable, '-m', 'pip', 'install', '--quiet', package]
if sys.base_prefix == sys.prefix: if not IS_VIRTUAL:
args.append('--user') args.append('--user')
return not subprocess.call(args) try:
return 0 == subprocess.call(args)
except subprocess.SubprocessError:
return False
def validate_dependencies(): def validate_dependencies():

3
homeassistant/util/environment.py
View File

@ -5,4 +5,5 @@ import sys
def is_virtual(): def is_virtual():
""" Return if we run in a virtual environtment. """ """ Return if we run in a virtual environtment. """
# Check supports venv && virtualenv # Check supports venv && virtualenv
return sys.base_prefix != sys.prefix or hasattr(sys, 'real_prefix') return (getattr(sys, 'base_prefix', sys.prefix) != sys.prefix or
hasattr(sys, 'real_prefix'))

8
homeassistant/util/package.py
View File

@ -1,5 +1,6 @@
"""Helpers to install PyPi packages.""" """Helpers to install PyPi packages."""
import subprocess import subprocess
import sys
from . import environment as env from . import environment as env
@ -11,9 +12,12 @@ def install_package(package, upgrade=False, user=INSTALL_USER):
"""Install a package on PyPi. Accepts pip compatible package strings. """Install a package on PyPi. Accepts pip compatible package strings.
Return boolean if install successfull.""" Return boolean if install successfull."""
# Not using 'import pip; pip.main([])' because it breaks the logger # Not using 'import pip; pip.main([])' because it breaks the logger
args = ['python3', '-m', 'pip', 'install', '--quiet', package] args = [sys.executable, '-m', 'pip', 'install', '--quiet', package]
if upgrade: if upgrade:
args.append('--upgrade') args.append('--upgrade')
if user: if user:
args.append('--user') args.append('--user')
return not subprocess.call(args) try:
return 0 == subprocess.call(args)
except subprocess.SubprocessError:
return False