feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Froze "marshmallow" dependency to 2.X for Python 2 // Resolve #3380

Browse Source
This commit is contained in:
Ivan Kravets
2020-02-14 13:49:41 +02:00
parent 22e8e02f3d
commit a57ea79bf8
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY.rst
View File

@ -10,6 +10,7 @@ PlatformIO Core 4
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
* Improved support of PIO Home on card-sized PC (Raspberry Pi, etc.) (`issue #3313 <https://github.com/platformio/platformio-core/issues/3313>`_) * Improved support of PIO Home on card-sized PC (Raspberry Pi, etc.) (`issue #3313 <https://github.com/platformio/platformio-core/issues/3313>`_)
* Froze "marshmallow" dependency to 2.X for Python 2 (`issue #3380 <https://github.com/platformio/platformio-core/issues/3380>`_)
* Fixed "TypeError: unsupported operand type(s)" when system environment variable is used by project configuration parser (`issue #3377 <https://github.com/platformio/platformio-core/issues/3377>`_) * Fixed "TypeError: unsupported operand type(s)" when system environment variable is used by project configuration parser (`issue #3377 <https://github.com/platformio/platformio-core/issues/3377>`_)

5
setup.py
View File

@ -23,6 +23,8 @@ from platformio import (
__url__, __url__,
__version__, __version__,
) )
from platformio.compat import PY2
install_requires = [ install_requires = [
"bottle<0.13", "bottle<0.13",
@ -33,9 +35,10 @@ install_requires = [
"semantic_version>=2.8.1,<3", "semantic_version>=2.8.1,<3",
"tabulate>=0.8.3,<1", "tabulate>=0.8.3,<1",
"pyelftools>=0.25,<1", "pyelftools>=0.25,<1",
"marshmallow>=2.20.5", "marshmallow%s" % (">=2,<3" if PY2 else ">=3"),
] ]
setup( setup(
name=__title__, name=__title__,
version=__version__, version=__version__,