From 907a72d3bd2ab17d7230b13dd32032805b7962f5 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 3 Oct 2014 19:48:17 +0300 Subject: [PATCH] Move to latest version of SCons --- scripts/get-platformio.py | 12 ++++++++---- tox.ini | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/get-platformio.py b/scripts/get-platformio.py index aff8ba6c..be38fcde 100644 --- a/scripts/get-platformio.py +++ b/scripts/get-platformio.py @@ -73,16 +73,20 @@ def install_pip(): def install_pypi_packages(packages): - for p in packages: - print (exec_python_cmd(["-m", "pip", "install", "-U"] + p.split())) + for pipargs in packages: + print (exec_python_cmd(["-m", "pip", "install", "-U"] + pipargs)) def main(): steps = [ ("Fixing Windows %PATH% Environment", fix_winpython_pathenv, []), ("Installing Python Package Manager", install_pip, []), - ("Installing PlatformIO and dependencies", install_pypi_packages, - (["platformio", "--egg scons"],)), + ("Installing PlatformIO and dependencies", install_pypi_packages, [ + [["platformio"], [ + "--egg", + "http://sourceforge.net/projects/scons/files/latest/download" + ]] + ]) ] if not IS_WINDOWS: diff --git a/tox.ini b/tox.ini index 0185fd25..28baf1c1 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,7 @@ deps = isort flake8 commands = - pip install --egg scons + pip install --egg http://sourceforge.net/projects/scons/files/latest/download [testenv:docs] deps =