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

platformio · Feb 14, 2020 · a57ea79 · a57ea79
1 parent 22e8e02
commit a57ea79
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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 <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>`_)
 
 

diff --git a/setup.py b/setup.py
@@ -23,6 +23,8 @@
     __url__,
     __version__,
 )
+from platformio.compat import PY2
+
 
 install_requires = [
     "bottle<0.13",
@@ -33,9 +35,10 @@
     "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__,