From f149eed9542fea1780d63970f54a453221131cb4 Mon Sep 17 00:00:00 2001 From: Martin Kankaanranta <55850510+norkator@users.noreply.github.com> Date: Sat, 26 Jun 2021 15:34:55 +0300 Subject: [PATCH] Change project structure for proper build --- setup.py | 3 ++- {nx100_remote_control => src/nx100_remote_control}/__init__.py | 0 .../nx100_remote_control}/module/Commands.py | 0 .../nx100_remote_control}/module/Gripper.py | 0 .../nx100_remote_control}/module/LinearMove.py | 0 .../nx100_remote_control}/module/MockResponse.py | 0 .../nx100_remote_control}/module/Socket.py | 0 .../nx100_remote_control}/module/Utils.py | 0 .../nx100_remote_control}/module/WebServer.py | 0 .../nx100_remote_control}/module/__init__.py | 0 .../nx100_remote_control}/module/index.html | 0 .../nx100_remote_control}/module/xbox360_controller.py | 0 .../nx100_remote_control}/objects/Alarm.py | 0 .../nx100_remote_control}/objects/Command.py | 0 .../nx100_remote_control}/objects/CurrentPos.py | 0 .../nx100_remote_control}/objects/Gripper.py | 0 .../nx100_remote_control}/objects/IO.py | 0 .../nx100_remote_control}/objects/JobDetail.py | 0 .../nx100_remote_control}/objects/MoveL.py | 0 .../nx100_remote_control}/objects/Response.py | 0 .../nx100_remote_control}/objects/Status.py | 0 .../nx100_remote_control}/objects/Time.py | 0 .../nx100_remote_control}/objects/__init__.py | 0 .../nx100_remote_control}/tests/__init__.py | 0 .../nx100_remote_control}/tests/test_commands.py | 0 .../nx100_remote_control}/tests/test_gripper.py | 0 26 files changed, 2 insertions(+), 1 deletion(-) rename {nx100_remote_control => src/nx100_remote_control}/__init__.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/module/Commands.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/module/Gripper.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/module/LinearMove.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/module/MockResponse.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/module/Socket.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/module/Utils.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/module/WebServer.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/module/__init__.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/module/index.html (100%) rename {nx100_remote_control => src/nx100_remote_control}/module/xbox360_controller.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/objects/Alarm.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/objects/Command.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/objects/CurrentPos.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/objects/Gripper.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/objects/IO.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/objects/JobDetail.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/objects/MoveL.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/objects/Response.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/objects/Status.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/objects/Time.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/objects/__init__.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/tests/__init__.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/tests/test_commands.py (100%) rename {nx100_remote_control => src/nx100_remote_control}/tests/test_gripper.py (100%) diff --git a/setup.py b/setup.py index 23576d0..ded440a 100644 --- a/setup.py +++ b/setup.py @@ -3,9 +3,10 @@ setup( name='nx100_remote_control', packages=[ + 'nx100_remote_control', 'nx100_remote_control.module', 'nx100_remote_control.objects' ], - package_dir={'': 'nx100_remote_control'}, + package_dir={'': 'src'}, include_package_data=True, ) diff --git a/nx100_remote_control/__init__.py b/src/nx100_remote_control/__init__.py similarity index 100% rename from nx100_remote_control/__init__.py rename to src/nx100_remote_control/__init__.py diff --git a/nx100_remote_control/module/Commands.py b/src/nx100_remote_control/module/Commands.py similarity index 100% rename from nx100_remote_control/module/Commands.py rename to src/nx100_remote_control/module/Commands.py diff --git a/nx100_remote_control/module/Gripper.py b/src/nx100_remote_control/module/Gripper.py similarity index 100% rename from nx100_remote_control/module/Gripper.py rename to src/nx100_remote_control/module/Gripper.py diff --git a/nx100_remote_control/module/LinearMove.py b/src/nx100_remote_control/module/LinearMove.py similarity index 100% rename from nx100_remote_control/module/LinearMove.py rename to src/nx100_remote_control/module/LinearMove.py diff --git a/nx100_remote_control/module/MockResponse.py b/src/nx100_remote_control/module/MockResponse.py similarity index 100% rename from nx100_remote_control/module/MockResponse.py rename to src/nx100_remote_control/module/MockResponse.py diff --git a/nx100_remote_control/module/Socket.py b/src/nx100_remote_control/module/Socket.py similarity index 100% rename from nx100_remote_control/module/Socket.py rename to src/nx100_remote_control/module/Socket.py diff --git a/nx100_remote_control/module/Utils.py b/src/nx100_remote_control/module/Utils.py similarity index 100% rename from nx100_remote_control/module/Utils.py rename to src/nx100_remote_control/module/Utils.py diff --git a/nx100_remote_control/module/WebServer.py b/src/nx100_remote_control/module/WebServer.py similarity index 100% rename from nx100_remote_control/module/WebServer.py rename to src/nx100_remote_control/module/WebServer.py diff --git a/nx100_remote_control/module/__init__.py b/src/nx100_remote_control/module/__init__.py similarity index 100% rename from nx100_remote_control/module/__init__.py rename to src/nx100_remote_control/module/__init__.py diff --git a/nx100_remote_control/module/index.html b/src/nx100_remote_control/module/index.html similarity index 100% rename from nx100_remote_control/module/index.html rename to src/nx100_remote_control/module/index.html diff --git a/nx100_remote_control/module/xbox360_controller.py b/src/nx100_remote_control/module/xbox360_controller.py similarity index 100% rename from nx100_remote_control/module/xbox360_controller.py rename to src/nx100_remote_control/module/xbox360_controller.py diff --git a/nx100_remote_control/objects/Alarm.py b/src/nx100_remote_control/objects/Alarm.py similarity index 100% rename from nx100_remote_control/objects/Alarm.py rename to src/nx100_remote_control/objects/Alarm.py diff --git a/nx100_remote_control/objects/Command.py b/src/nx100_remote_control/objects/Command.py similarity index 100% rename from nx100_remote_control/objects/Command.py rename to src/nx100_remote_control/objects/Command.py diff --git a/nx100_remote_control/objects/CurrentPos.py b/src/nx100_remote_control/objects/CurrentPos.py similarity index 100% rename from nx100_remote_control/objects/CurrentPos.py rename to src/nx100_remote_control/objects/CurrentPos.py diff --git a/nx100_remote_control/objects/Gripper.py b/src/nx100_remote_control/objects/Gripper.py similarity index 100% rename from nx100_remote_control/objects/Gripper.py rename to src/nx100_remote_control/objects/Gripper.py diff --git a/nx100_remote_control/objects/IO.py b/src/nx100_remote_control/objects/IO.py similarity index 100% rename from nx100_remote_control/objects/IO.py rename to src/nx100_remote_control/objects/IO.py diff --git a/nx100_remote_control/objects/JobDetail.py b/src/nx100_remote_control/objects/JobDetail.py similarity index 100% rename from nx100_remote_control/objects/JobDetail.py rename to src/nx100_remote_control/objects/JobDetail.py diff --git a/nx100_remote_control/objects/MoveL.py b/src/nx100_remote_control/objects/MoveL.py similarity index 100% rename from nx100_remote_control/objects/MoveL.py rename to src/nx100_remote_control/objects/MoveL.py diff --git a/nx100_remote_control/objects/Response.py b/src/nx100_remote_control/objects/Response.py similarity index 100% rename from nx100_remote_control/objects/Response.py rename to src/nx100_remote_control/objects/Response.py diff --git a/nx100_remote_control/objects/Status.py b/src/nx100_remote_control/objects/Status.py similarity index 100% rename from nx100_remote_control/objects/Status.py rename to src/nx100_remote_control/objects/Status.py diff --git a/nx100_remote_control/objects/Time.py b/src/nx100_remote_control/objects/Time.py similarity index 100% rename from nx100_remote_control/objects/Time.py rename to src/nx100_remote_control/objects/Time.py diff --git a/nx100_remote_control/objects/__init__.py b/src/nx100_remote_control/objects/__init__.py similarity index 100% rename from nx100_remote_control/objects/__init__.py rename to src/nx100_remote_control/objects/__init__.py diff --git a/nx100_remote_control/tests/__init__.py b/src/nx100_remote_control/tests/__init__.py similarity index 100% rename from nx100_remote_control/tests/__init__.py rename to src/nx100_remote_control/tests/__init__.py diff --git a/nx100_remote_control/tests/test_commands.py b/src/nx100_remote_control/tests/test_commands.py similarity index 100% rename from nx100_remote_control/tests/test_commands.py rename to src/nx100_remote_control/tests/test_commands.py diff --git a/nx100_remote_control/tests/test_gripper.py b/src/nx100_remote_control/tests/test_gripper.py similarity index 100% rename from nx100_remote_control/tests/test_gripper.py rename to src/nx100_remote_control/tests/test_gripper.py