From a57ea79bf85cc6ee1be29a7d13a3d7ca93d09a69 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 14 Feb 2020 13:49:41 +0200 Subject: [PATCH] Froze "marshmallow" dependency to 2.X for Python 2 // Resolve #3380 --- HISTORY.rst | 1 + setup.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 0df431e2..6aa9204d 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -10,6 +10,7 @@ PlatformIO Core 4 ~~~~~~~~~~~~~~~~~~ * Improved support of PIO Home on card-sized PC (Raspberry Pi, etc.) (`issue #3313 `_) +* Froze "marshmallow" dependency to 2.X for Python 2 (`issue #3380 `_) * Fixed "TypeError: unsupported operand type(s)" when system environment variable is used by project configuration parser (`issue #3377 `_) diff --git a/setup.py b/setup.py index 6413ffbd..edccd3b9 100644 --- a/setup.py +++ b/setup.py @@ -23,6 +23,8 @@ from platformio import ( __url__, __version__, ) +from platformio.compat import PY2 + install_requires = [ "bottle<0.13", @@ -33,9 +35,10 @@ install_requires = [ "semantic_version>=2.8.1,<3", "tabulate>=0.8.3,<1", "pyelftools>=0.25,<1", - "marshmallow>=2.20.5", + "marshmallow%s" % (">=2,<3" if PY2 else ">=3"), ] + setup( name=__title__, version=__version__,