diff --git a/HISTORY.rst b/HISTORY.rst index bf65b80f..8185432e 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -9,10 +9,10 @@ PlatformIO Core 4 4.2.1 (2020-02-??) ~~~~~~~~~~~~~~~~~~ +* Improved VSCode template with special ``forceInclude`` field for direct inludes via ``-include`` flag (`issue #3379 `_) * 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 `_) -* Improved VSCode template with special `forceInclude` field for direct inludes via `-include` flag (`issue #3379 `_) 4.2.0 (2020-02-12) diff --git a/platformio/__init__.py b/platformio/__init__.py index ef86e1f2..461bc7b6 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -VERSION = (4, 2, "1a1") +VERSION = (4, 2, "1a2") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff --git a/setup.py b/setup.py index edccd3b9..06a915a6 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ install_requires = [ "semantic_version>=2.8.1,<3", "tabulate>=0.8.3,<1", "pyelftools>=0.25,<1", - "marshmallow%s" % (">=2,<3" if PY2 else ">=3"), + "marshmallow%s" % (">=2,<3" if PY2 else ">=2"), ]