diff --git a/platformio/app.py b/platformio/app.py
index f4e5ea2b..b4e62452 100644
--- a/platformio/app.py
+++ b/platformio/app.py
@@ -354,7 +354,8 @@ def get_cid():
             except:  # pylint: disable=bare-except
                 pass
         cid = str(
-            uuid.UUID(bytes=hashlib.md5(str(_uid if _uid else uuid.getnode()))
-                      .digest()))
+            uuid.UUID(
+                bytes=hashlib.md5(str(_uid if _uid else uuid.getnode()))
+                .digest()))
         set_state_item("cid", cid)
     return cid
diff --git a/platformio/builder/main.py b/platformio/builder/main.py
index 9d0228d2..e355f68d 100644
--- a/platformio/builder/main.py
+++ b/platformio/builder/main.py
@@ -138,8 +138,9 @@ for var in ("BUILD_FLAGS", "SRC_BUILD_FLAGS", "SRC_FILTER", "EXTRA_SCRIPTS",
 
 # Configure extra library source directories for LDF
 if util.get_project_optional_dir("lib_extra_dirs"):
-    env.Prepend(LIBSOURCE_DIRS=util.parse_conf_multi_values(
-        util.get_project_optional_dir("lib_extra_dirs")))
+    env.Prepend(
+        LIBSOURCE_DIRS=util.parse_conf_multi_values(
+            util.get_project_optional_dir("lib_extra_dirs")))
 env.Prepend(LIBSOURCE_DIRS=env.get("LIB_EXTRA_DIRS", []))
 env['LIBSOURCE_DIRS'] = [
     expanduser(d) if d.startswith("~") else d for d in env['LIBSOURCE_DIRS']
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index 1a35a4b6..67b1d43f 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -35,8 +35,9 @@ SRC_FILTER_DEFAULT = ["+<*>", "-<.git%s>" % sep, "-<svn%s>" % sep]
 def BuildProgram(env):
 
     def _append_pio_macros():
-        env.AppendUnique(CPPDEFINES=[("PLATFORMIO", int(
-            "{0:02d}{1:02d}{2:02d}".format(*pioversion_to_intstr())))])
+        env.AppendUnique(CPPDEFINES=[(
+            "PLATFORMIO",
+            int("{0:02d}{1:02d}{2:02d}".format(*pioversion_to_intstr())))])
 
     _append_pio_macros()
 
diff --git a/platformio/commands/run.py b/platformio/commands/run.py
index f5a7683b..59654de5 100644
--- a/platformio/commands/run.py
+++ b/platformio/commands/run.py
@@ -180,13 +180,14 @@ class EnvironmentProcessor(object):
             self.options[k] = self.options[k].strip()
 
         if not self.silent:
-            click.echo(
-                "[%s] Processing %s (%s)" %
-                (datetime.now().strftime("%c"),
-                 click.style(self.name, fg="cyan", bold=True), "; ".join([
-                     "%s: %s" % (k, ", ".join(util.parse_conf_multi_values(v)))
-                     for k, v in self.options.items()
-                 ])))
+            click.echo("[%s] Processing %s (%s)" %
+                       (datetime.now().strftime("%c"),
+                        click.style(self.name, fg="cyan", bold=True),
+                        "; ".join([
+                            "%s: %s" %
+                            (k, ", ".join(util.parse_conf_multi_values(v)))
+                            for k, v in self.options.items()
+                        ])))
             click.secho("-" * terminal_width, bold=True)
 
         self.options = self._validate_options(self.options)
diff --git a/platformio/managers/core.py b/platformio/managers/core.py
index c540771d..dcf85bd1 100644
--- a/platformio/managers/core.py
+++ b/platformio/managers/core.py
@@ -36,13 +36,11 @@ PIOPLUS_AUTO_UPDATES_MAX = 100
 class CorePackageManager(PackageManager):
 
     def __init__(self):
-        PackageManager.__init__(
-            self,
-            join(util.get_home_dir(), "packages"), [
-                "https://dl.bintray.com/platformio/dl-packages/manifest.json",
-                "http%s://dl.platformio.org/packages/manifest.json" %
-                ("" if sys.version_info < (2, 7, 9) else "s")
-            ])
+        PackageManager.__init__(self, join(util.get_home_dir(), "packages"), [
+            "https://dl.bintray.com/platformio/dl-packages/manifest.json",
+            "http%s://dl.platformio.org/packages/manifest.json" %
+            ("" if sys.version_info < (2, 7, 9) else "s")
+        ])
 
     def install(self, name, requirements=None, *args, **kwargs):
         PackageManager.install(self, name, requirements, *args, **kwargs)
diff --git a/platformio/managers/package.py b/platformio/managers/package.py
index 54f361d0..6ee4b820 100644
--- a/platformio/managers/package.py
+++ b/platformio/managers/package.py
@@ -499,8 +499,8 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
             url_marker = "://"
 
         req_conditions = [
-            not requirements,
             "@" in text,
+            not requirements,
             not url_marker.startswith("git")
         ]  # yapf: disable
         if all(req_conditions):