mirror of
https://github.com/platformio/platformio-core.git
synced 2025-07-30 10:07:14 +02:00
Merge branch 'hotfix/v2.1.2'
This commit is contained in:
@ -1,6 +1,12 @@
|
|||||||
Release History
|
Release History
|
||||||
===============
|
===============
|
||||||
|
|
||||||
|
2.1.2 (2015-06-21)
|
||||||
|
------------------
|
||||||
|
|
||||||
|
* Fixed broken link to SCons installer
|
||||||
|
|
||||||
|
|
||||||
2.1.1 (2015-06-09)
|
2.1.1 (2015-06-09)
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Copyright (C) Ivan Kravets <me@ikravets.com>
|
# Copyright (C) Ivan Kravets <me@ikravets.com>
|
||||||
# See LICENSE for details.
|
# See LICENSE for details.
|
||||||
|
|
||||||
VERSION = (2, 1, 1)
|
VERSION = (2, 1, 2)
|
||||||
__version__ = ".".join([str(s) for s in VERSION])
|
__version__ = ".".join([str(s) for s in VERSION])
|
||||||
|
|
||||||
__title__ = "platformio"
|
__title__ = "platformio"
|
||||||
|
@ -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
4
tox.ini
@ -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
|
||||||
|
Reference in New Issue
Block a user