From 2b23eec0f7b593e68993510fec4510449c4e2ac7 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Fri, 10 Jul 2015 21:24:28 -0700 Subject: [PATCH] Fix pip 1.5.4 compatibility --- homeassistant/__main__.py | 4 ++-- homeassistant/util/package.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py index 809c5367c75..0a575afede0 100644 --- a/homeassistant/__main__.py +++ b/homeassistant/__main__.py @@ -22,8 +22,7 @@ def validate_python(): def install_package(package): """Install a package on PyPi. Accepts pip compatible package strings. Return boolean if install successfull.""" - args = ['python3', '-m', 'pip', 'install', '--disable-pip-version-check', - '--quiet', package] + args = ['python3', '-m', 'pip', 'install', '--quiet', package] if sys.base_prefix == sys.prefix: args.append('--user') return not subprocess.call(args) @@ -31,6 +30,7 @@ def install_package(package): def validate_dependencies(): """ Validate all dependencies that HA uses. """ + print("Validating dependencies...") import_fail = False for requirement in DEPENDENCIES: diff --git a/homeassistant/util/package.py b/homeassistant/util/package.py index 35f662c6cb7..ec49893177f 100644 --- a/homeassistant/util/package.py +++ b/homeassistant/util/package.py @@ -11,8 +11,7 @@ def install_package(package, upgrade=False, user=INSTALL_USER): """Install a package on PyPi. Accepts pip compatible package strings. Return boolean if install successfull.""" # Not using 'import pip; pip.main([])' because it breaks the logger - args = ['python3', '-m', 'pip', 'install', '--disable-pip-version-check', - '--quiet', package] + args = ['python3', '-m', 'pip', 'install', '--quiet', package] if upgrade: args.append('--upgrade') if user: