Move "run" command to the root

platformio/commands/ci.py

@@ -20,10 +20,10 @@ import tempfile
 import click
 
 from platformio import app, fs
-from platformio.commands.run.command import cli as cmd_run
 from platformio.exception import CIBuildEnvsEmpty
 from platformio.project.commands.init import project_init_cmd, validate_boards
 from platformio.project.config import ProjectConfig
+from platformio.run.cli import cli as cmd_run
 
 
 def validate_path(ctx, param, value):  # pylint: disable=unused-argument

platformio/debug/helpers.py

@@ -21,11 +21,11 @@ from hashlib import sha1
 from io import BytesIO
 
 from platformio.cli import PlatformioCLI
-from platformio.commands.run.command import cli as cmd_run
-from platformio.commands.run.command import print_processing_header
 from platformio.compat import IS_WINDOWS, is_bytes
 from platformio.debug.exception import DebugInvalidOptionsError
 from platformio.device.list import list_serial_ports
+from platformio.run.cli import cli as cmd_run
+from platformio.run.cli import print_processing_header
 from platformio.test.helpers import list_test_names
 from platformio.test.result import TestSuite
 from platformio.test.runners.base import TestRunnerOptions

platformio/project/helpers.py

@@ -142,7 +142,7 @@ load_project_ide_data = load_build_metadata
 
 def _load_build_metadata(project_dir, env_names):
     # pylint: disable=import-outside-toplevel
-    from platformio.commands.run.command import cli as cmd_run
+    from platformio.run.cli import cli as cmd_run
 
     args = ["--project-dir", project_dir, "--target", "_idedata"]
     for name in env_names:

platformio/remote/cli.py

@@ -24,7 +24,6 @@ from time import sleep
 import click
 
 from platformio import fs, proc
-from platformio.commands.run.command import cli as cmd_run
 from platformio.device.commands.monitor import (
     apply_project_monitor_options,
     device_monitor_cmd,
@@ -34,6 +33,7 @@ from platformio.device.commands.monitor import (
 from platformio.package.manager.core import inject_contrib_pysite
 from platformio.project.exception import NotPlatformIOProjectError
 from platformio.project.options import ProjectOptions
+from platformio.run.cli import cli as cmd_run
 from platformio.test.cli import test_cmd
 
 

platformio/run/cli.py

@@ -22,11 +22,11 @@ import click
 from tabulate import tabulate
 
 from platformio import app, exception, fs, util
-from platformio.commands.run.helpers import clean_build_dir, handle_legacy_libdeps
-from platformio.commands.run.processor import EnvironmentProcessor
 from platformio.device.commands.monitor import device_monitor_cmd
 from platformio.project.config import ProjectConfig
 from platformio.project.helpers import find_project_dir_above, load_build_metadata
+from platformio.run.helpers import clean_build_dir, handle_legacy_libdeps
+from platformio.run.processor import EnvironmentProcessor
 from platformio.test.runners.base import CTX_META_TEST_IS_RUNNING
 
 # pylint: disable=too-many-arguments,too-many-locals,too-many-branches

platformio/test/runners/base.py

@@ -174,7 +174,7 @@ class TestRunnerBase:
 
     def run_project_targets(self, targets):
         # pylint: disable=import-outside-toplevel
-        from platformio.commands.run.command import cli as run_cmd
+        from platformio.run.cli import cli as run_cmd
 
         assert self.cmd_ctx
         return self.cmd_ctx.invoke(

tests/commands/test_run.py

@@ -14,7 +14,7 @@
 
 from pathlib import Path
 
-from platformio.commands.run.command import cli as cmd_run
+from platformio.run.cli import cli as cmd_run
 
 
 def test_build_flags(clirunner, validate_cliresult, tmpdir):