diff --git a/docs b/docs index 437d9b82..a1ee45a3 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 437d9b8201d75aadd028272d971c94c1a2dbda66 +Subproject commit a1ee45a30b57a266d41760e2d80cdd4bd4e07418 diff --git a/platformio/managers/core.py b/platformio/managers/core.py index 8b45b42f..8477c624 100644 --- a/platformio/managers/core.py +++ b/platformio/managers/core.py @@ -21,9 +21,9 @@ from platformio import __version__, exception, util from platformio.managers.package import PackageManager CORE_PACKAGES = { - "contrib-piohome": ">=0.6.0,<2", + "contrib-piohome": ">=0.6.1,<2", "contrib-pysite": ">=0.1.2,<2", - "tool-pioplus": ">=0.13.0,<2", + "tool-pioplus": ">=0.13.2,<2", "tool-unity": "~1.20302.1", "tool-scons": "~3.20501.2" } diff --git a/platformio/util.py b/platformio/util.py index 6b41949d..3d63926a 100644 --- a/platformio/util.py +++ b/platformio/util.py @@ -22,6 +22,7 @@ import socket import stat import subprocess import sys +from configparser import ConfigParser from functools import wraps from glob import glob from os.path import (abspath, basename, dirname, expanduser, isdir, isfile, @@ -35,12 +36,7 @@ import requests from platformio import __apiurl__, __version__, exception -# pylint: disable=wrong-import-order, too-many-ancestors - -try: - from configparser import ConfigParser -except ImportError: - from ConfigParser import ConfigParser +# pylint: too-many-ancestors class ProjectConfig(ConfigParser): @@ -449,6 +445,10 @@ def get_serial_ports(filter_hwid=False): return result +# Backward compatibility for PIO Core <3.5 +get_serialports = get_serial_ports + + def get_logical_devices(): items = [] if platform.system() == "Windows": @@ -487,14 +487,6 @@ def get_logical_devices(): return items -### Backward compatibility for PIO Core <3.5 -get_serialports = get_serial_ports -get_logicaldisks = lambda: [{ - "disk": d['path'], - "name": d['name'] -} for d in get_logical_devices()] - - def get_mdns_services(): try: import zeroconf