platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-31 10:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/v2.1.2' into develop

Browse Source
This commit is contained in:
Ivan Kravets
2015-06-21 21:56:16 +03:00
parent 829d5781a5 d8dba90f77
commit 46461b0721
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY.rst
View File

@ -16,6 +16,11 @@ Release History
* Fixed ``stk500v2_command(): command failed`` * Fixed ``stk500v2_command(): command failed``
(`issue #238 <https://github.com/platformio/platformio/issues/238>`_) (`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) 2.1.1 (2015-06-09)
------------------ ------------------

3
scripts/get-platformio.py
View File

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

4
tox.ini
View File

@ -11,7 +11,7 @@ deps =
isort isort
flake8 flake8
commands = 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] [testenv:docs]
basepython = python2.7 basepython = python2.7
@ -48,5 +48,5 @@ passenv = *
deps = pytest deps = pytest
commands = commands =
{envpython} --version {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 py.test -v --basetemp="{envtmpdir}" tests