Move "remote" command to the root

platformio/remote/ac/process.py

@@ -16,7 +16,7 @@ import os
 
 from twisted.internet import protocol, reactor  # pylint: disable=import-error
 
-from platformio.commands.remote.ac.base import AsyncCommandBase
+from platformio.remote.ac.base import AsyncCommandBase
 
 
 class ProcessAsyncCmd(protocol.ProcessProtocol, AsyncCommandBase):

platformio/remote/ac/psync.py

@@ -17,8 +17,8 @@ import os
 import zlib
 from io import BytesIO
 
-from platformio.commands.remote.ac.base import AsyncCommandBase
+from platformio.remote.ac.base import AsyncCommandBase
-from platformio.commands.remote.projectsync import PROJECT_SYNC_STAGE, ProjectSync
+from platformio.remote.projectsync import PROJECT_SYNC_STAGE, ProjectSync
 
 
 class ProjectSyncAsyncCmd(AsyncCommandBase):

platformio/remote/ac/serial.py

@@ -17,7 +17,7 @@ from time import sleep
 from twisted.internet import protocol, reactor  # pylint: disable=import-error
 from twisted.internet.serialport import SerialPort  # pylint: disable=import-error
 
-from platformio.commands.remote.ac.base import AsyncCommandBase
+from platformio.remote.ac.base import AsyncCommandBase
 
 
 class SerialPortAsyncCmd(protocol.Protocol, AsyncCommandBase):

platformio/remote/cli.py

@@ -60,14 +60,14 @@ def remote_agent():
     type=click.Path(file_okay=False, dir_okay=True, writable=True, resolve_path=True),
 )
 def remote_agent_start(name, share, working_dir):
-    from platformio.commands.remote.client.agent_service import RemoteAgentService
+    from platformio.remote.client.agent_service import RemoteAgentService
 
     RemoteAgentService(name, share, working_dir).connect()
 
 
 @remote_agent.command("list", short_help="List active agents")
 def remote_agent_list():
-    from platformio.commands.remote.client.agent_list import AgentListClient
+    from platformio.remote.client.agent_list import AgentListClient
 
     AgentListClient().connect()
 
@@ -84,7 +84,7 @@ def remote_agent_list():
 )
 @click.pass_obj
 def remote_update(agents, only_check, dry_run):
-    from platformio.commands.remote.client.update_core import UpdateCoreClient
+    from platformio.remote.client.update_core import UpdateCoreClient
 
     UpdateCoreClient("update", agents, dict(only_check=only_check or dry_run)).connect()
 
@@ -120,7 +120,7 @@ def remote_run(
     verbose,
 ):
 
-    from platformio.commands.remote.client.run_or_test import RunOrTestClient
+    from platformio.remote.client.run_or_test import RunOrTestClient
 
     cr = RunOrTestClient(
         "run",
@@ -213,7 +213,7 @@ def remote_test(  # pylint: disable=redefined-builtin
     verbose,
 ):
 
-    from platformio.commands.remote.client.run_or_test import RunOrTestClient
+    from platformio.remote.client.run_or_test import RunOrTestClient
 
     cr = RunOrTestClient(
         "test",
@@ -263,7 +263,7 @@ def remote_device():
 @click.option("--json-output", is_flag=True)
 @click.pass_obj
 def device_list(agents, json_output):
-    from platformio.commands.remote.client.device_list import DeviceListClient
+    from platformio.remote.client.device_list import DeviceListClient
 
     DeviceListClient(agents, json_output).connect()
 
@@ -346,7 +346,7 @@ def device_list(agents, json_output):
 @click.pass_obj
 @click.pass_context
 def device_monitor(ctx, agents, **kwargs):
-    from platformio.commands.remote.client.device_monitor import DeviceMonitorClient
+    from platformio.remote.client.device_monitor import DeviceMonitorClient
 
     if kwargs["sock"]:
         return DeviceMonitorClient(agents, **kwargs).connect()

platformio/remote/client/agent_list.py

@@ -16,7 +16,7 @@ from datetime import datetime
 
 import click
 
-from platformio.commands.remote.client.base import RemoteClientBase
+from platformio.remote.client.base import RemoteClientBase
 
 
 class AgentListClient(RemoteClientBase):

platformio/remote/client/agent_service.py

@@ -18,13 +18,13 @@ from twisted.logger import LogLevel  # pylint: disable=import-error
 from twisted.spread import pb  # pylint: disable=import-error
 
 from platformio import proc
-from platformio.commands.remote.ac.process import ProcessAsyncCmd
-from platformio.commands.remote.ac.psync import ProjectSyncAsyncCmd
-from platformio.commands.remote.ac.serial import SerialPortAsyncCmd
-from platformio.commands.remote.client.base import RemoteClientBase
 from platformio.device.list import list_serial_ports
 from platformio.project.config import ProjectConfig
 from platformio.project.exception import NotPlatformIOProjectError
+from platformio.remote.ac.process import ProcessAsyncCmd
+from platformio.remote.ac.psync import ProjectSyncAsyncCmd
+from platformio.remote.ac.serial import SerialPortAsyncCmd
+from platformio.remote.client.base import RemoteClientBase
 
 
 class RemoteAgentService(RemoteClientBase):

platformio/remote/client/async_base.py

@@ -15,7 +15,7 @@
 import click
 from twisted.spread import pb  # pylint: disable=import-error
 
-from platformio.commands.remote.client.base import RemoteClientBase
+from platformio.remote.client.base import RemoteClientBase
 
 
 class AsyncClientBase(RemoteClientBase):

platformio/remote/client/base.py

@@ -26,8 +26,8 @@ from twisted.spread import pb  # pylint: disable=import-error
 from zope.interface import provider  # pylint: disable=import-error
 
 from platformio import __pioremote_endpoint__, __version__, app, exception, maintenance
-from platformio.commands.remote.factory.client import RemoteClientFactory
+from platformio.remote.factory.client import RemoteClientFactory
-from platformio.commands.remote.factory.ssl import SSLContextFactory
+from platformio.remote.factory.ssl import SSLContextFactory
 
 
 class RemoteClientBase(  # pylint: disable=too-many-instance-attributes

platformio/remote/client/device_list.py

@@ -16,7 +16,7 @@ import json
 
 import click
 
-from platformio.commands.remote.client.base import RemoteClientBase
+from platformio.remote.client.base import RemoteClientBase
 
 
 class DeviceListClient(RemoteClientBase):

platformio/remote/client/device_monitor.py

@@ -19,7 +19,7 @@ import click
 from twisted.internet import protocol, reactor, task  # pylint: disable=import-error
 from twisted.spread import pb  # pylint: disable=import-error
 
-from platformio.commands.remote.client.base import RemoteClientBase
+from platformio.remote.client.base import RemoteClientBase
 
 
 class SMBridgeProtocol(protocol.Protocol):  # pylint: disable=no-init

platformio/remote/client/run_or_test.py

@@ -21,10 +21,10 @@ from io import BytesIO
 from twisted.spread import pb  # pylint: disable=import-error
 
 from platformio import fs
-from platformio.commands.remote.client.async_base import AsyncClientBase
-from platformio.commands.remote.projectsync import PROJECT_SYNC_STAGE, ProjectSync
 from platformio.compat import hashlib_encode_data
 from platformio.project.config import ProjectConfig
+from platformio.remote.client.async_base import AsyncClientBase
+from platformio.remote.projectsync import PROJECT_SYNC_STAGE, ProjectSync
 
 
 class RunOrTestClient(AsyncClientBase):

platformio/remote/client/update_core.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from platformio.commands.remote.client.async_base import AsyncClientBase
+from platformio.remote.client.async_base import AsyncClientBase
 
 
 class UpdateCoreClient(AsyncClientBase):