Fixed an issue when configuration file options partly ignored when `--project-conf` // Resolve #3034 (#3055)

* Fixed an issue when configuration file options partly ignored when using custom ``--project-conf`` // Resolve #3034

* Py2 compatible makedirs

* Fix circle dependency

* Fix broken import in test examples

* Fix history

* Remove YAPF markers

* PyLint fix

* Fix invalid project conf path

* Move PIO Core to the root on Windows, issue with long CPPPATHs

* Respect global PLATFORMIO_BUILD_CACHE_DIR env var

* Fix Appveyor paths

* Minor changes
This commit is contained in:
Ivan Kravets authored and GitHub committed 2019-09-27 14:13:53 +03:00
1 parent 94f8afec38
commit d2abac9b18
40 files changed
+411 -378

No files matched your search

+3 -3
View File
@@ -191,7 +191,7 @@ def get_logical_devices():
def get_mdns_services():
try:
import zeroconf
import zeroconf # pylint: disable=import-outside-toplevel
except ImportError:
from site import addsitedir
from platformio.managers.core import get_core_package_dir
@@ -199,7 +199,7 @@ def get_mdns_services():
contrib_pysite_dir = get_core_package_dir("contrib-pysite")
addsitedir(contrib_pysite_dir)
sys.path.insert(0, contrib_pysite_dir)
import zeroconf
import zeroconf # pylint: disable=import-outside-toplevel
class mDNSListener(object):
def __init__(self):
@@ -360,7 +360,7 @@ def get_api_result(url, params=None, data=None, auth=None, cache_valid=None):
time.sleep(2 * total)
raise exception.APIRequestError(
"Could not connect to PlatformIO API Service. " "Please try later."
"Could not connect to PlatformIO API Service. Please try later."
)