Removed SCons from requirements list

This commit is contained in:
Ivan Kravets
2015-12-21 17:35:30 +02:00
parent 54d650aa40
commit 66ca204697
4 changed files with 10 additions and 5 deletions

View File

@ -7,6 +7,8 @@ PlatformIO 2.0
2.6.2 (2015-12-??) 2.6.2 (2015-12-??)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
* Removed ``SCons`` from requirements list. PlatformIO will try to install it
automatically, otherwise users need to install it manually
* Fixed ``ChunkedEncodingError`` when SF connection is broken * Fixed ``ChunkedEncodingError`` when SF connection is broken
(`issue #356 <https://github.com/platformio/platformio/issues/356>`_) (`issue #356 <https://github.com/platformio/platformio/issues/356>`_)

View File

@ -103,8 +103,8 @@ Troubleshooting
Installation Installation
~~~~~~~~~~~~ ~~~~~~~~~~~~
PlatformIO and ``SCons`` aren't installed properly ``SCons`` is not installed in your system
'''''''''''''''''''''''''''''''''''''''''''''''''' '''''''''''''''''''''''''''''''''''''''''
PlatformIO depends on awesome and irreplaceable software construction tool PlatformIO depends on awesome and irreplaceable software construction tool
named `SCons <http://www.scons.org>`_. PlatformIO Code Builder uses it to build named `SCons <http://www.scons.org>`_. PlatformIO Code Builder uses it to build

View File

@ -193,9 +193,10 @@ class CIBuildEnvsEmpty(PlatformioException):
class SConsNotInstalledError(PlatformioException): class SConsNotInstalledError(PlatformioException):
MESSAGE = "The PlatformIO and `scons` aren't installed properly. "\ MESSAGE = "SCons is not installed in your system. "\
"More details in FAQ/Troubleshooting section: "\ "More details in FAQ/Troubleshooting section: "\
"http://docs.platformio.org/en/latest/faq.html" "http://docs.platformio.org/en/latest/faq.html"\
"#scons-is-not-installed-in-your-system"
class UpgradeError(PlatformioException): class UpgradeError(PlatformioException):

View File

@ -30,7 +30,9 @@ install_requires = [
if system() == "Windows": if system() == "Windows":
install_requires.append("colorama") install_requires.append("colorama")
if (not util.test_scons() and not util.install_scons()) or util.scons_in_pip(): if not util.test_scons():
util.install_scons()
elif util.scons_in_pip():
install_requires.append("scons") install_requires.append("scons")
setup( setup(