Merge branch 'hotfix/v2.1.2' into develop

This commit is contained in:
Ivan Kravets
2015-06-21 21:56:16 +03:00
3 changed files with 9 additions and 3 deletions

View File

@ -16,6 +16,11 @@ Release History
* Fixed ``stk500v2_command(): command failed``
(`issue #238 <https://github.com/platformio/platformio/issues/238>`_)
2.1.2 (2015-06-21)
------------------
* Fixed broken link to SCons installer
2.1.1 (2015-06-09)
------------------

View File

@ -101,7 +101,8 @@ def main():
("Installing PlatformIO and dependencies", install_pypi_packages, [
[["setuptools"], ["platformio"], [
"--egg",
"http://sourceforge.net/projects/scons/files/latest/download"
"http://sourceforge.net/projects/platformio-storage/files/"
"scons.zip/download"
]]
])
]

View File

@ -11,7 +11,7 @@ deps =
isort
flake8
commands =
pip install --egg http://sourceforge.net/projects/scons/files/latest/download
pip install --egg http://sourceforge.net/projects/platformio-storage/files/scons.zip/download
[testenv:docs]
basepython = python2.7
@ -48,5 +48,5 @@ passenv = *
deps = pytest
commands =
{envpython} --version
pip install --egg http://sourceforge.net/projects/scons/files/latest/download
pip install --egg http://sourceforge.net/projects/platformio-storage/files/scons.zip/download
py.test -v --basetemp="{envtmpdir}" tests