diff --git a/README.md b/README.md index 2140df9..8d01a49 100644 --- a/README.md +++ b/README.md @@ -71,12 +71,11 @@ Date: 14/06/2019 Author: E. Pallier (epallier@irap.omp.eu) -VERSION: 0.30.4 +VERSION: 0.30.5 -Comment : Restructuration du projet - phase 2 : /pyros_django/ => /src/core/pyros_django/ +Comment : Restructuration du projet - phase 3 : /devices_channel/ => /src/devices_controller/ TODO (coming) : -- Restructuration du projet - phase 3 : /devices_channel/ => /src/devices_controller/ - Restructuration du projet - phase 4 : /src/core/pyros_django/utils/celme/ => /src/core/celme/ - Restructuration du projet - phase 5 : /devices_channel/ => réorganisation interne @@ -118,6 +117,7 @@ The list below is obsolete. The new official changes history is here : https:// **14/06/2019 : v0.30.3-4 (EP)** - Restructuration du projet - phase 1 : /src/ => /pyros_django/ - Restructuration du projet - phase 2 : /pyros_django/ => /src/core/pyros_django/ + - Restructuration du projet - phase 3 : /devices_channel/ => /src/devices_controller/ **11/06/2019 : v0.30.2 (EP)** - Ajouté options "test" et "testall" dans pyros.py pour exécution des (anciens) tests unitaires diff --git a/src/core/pyros_django/agent/AgentDevice.py b/src/core/pyros_django/agent/AgentDevice.py index 76c01f0..c469458 100755 --- a/src/core/pyros_django/agent/AgentDevice.py +++ b/src/core/pyros_django/agent/AgentDevice.py @@ -9,7 +9,7 @@ import time sys.path.append("..") from agent.Agent import Agent, extract_parameters from common.models import AgentDeviceTelescopeStatus, get_or_create_unique_row_from_model -from devices_channel.client.telescope_controller_gemini import TelescopeControllerGEMINI +from devices_controller.client.telescope_controller_gemini import TelescopeControllerGEMINI ##log = L.setupLogger("AgentXTaskLogger", "AgentX") diff --git a/src/devices_controller/client/channel/client_channel.py b/src/devices_controller/client/channel/client_channel.py index 51f820e..84330ad 100755 --- a/src/devices_controller/client/channel/client_channel.py +++ b/src/devices_controller/client/channel/client_channel.py @@ -12,7 +12,7 @@ To be used as a base class (interface) for any concrete socket client class # None # Local application imports -from devices_channel.client.logs import * +from devices_controller.client.logs import * diff --git a/src/devices_controller/client/channel/client_channel_serial.py b/src/devices_controller/client/channel/client_channel_serial.py index 52b70a5..035a098 100755 --- a/src/devices_controller/client/channel/client_channel_serial.py +++ b/src/devices_controller/client/channel/client_channel_serial.py @@ -11,7 +11,7 @@ # None # Local application imports -from devices_channel.client.channel.client_channel import * +from devices_controller.client.channel.client_channel import * diff --git a/src/devices_controller/client/channel/client_channel_socket.py b/src/devices_controller/client/channel/client_channel_socket.py index 231f6f0..9dcb9c6 100755 --- a/src/devices_controller/client/channel/client_channel_socket.py +++ b/src/devices_controller/client/channel/client_channel_socket.py @@ -12,7 +12,7 @@ import socket # None # Local application imports -from devices_channel.client.channel.client_channel import * +from devices_controller.client.channel.client_channel import * diff --git a/src/devices_controller/client/channel/client_channel_usb.py b/src/devices_controller/client/channel/client_channel_usb.py index 869c2fa..a2921b1 100755 --- a/src/devices_controller/client/channel/client_channel_usb.py +++ b/src/devices_controller/client/channel/client_channel_usb.py @@ -11,7 +11,7 @@ # None # Local application imports -from devices_channel.client.channel.client_channel import * +from devices_controller.client.channel.client_channel import * diff --git a/src/devices_controller/client/devices_abstract/device_controller_abstract.py b/src/devices_controller/client/devices_abstract/device_controller_abstract.py index 91b5d29..c013650 100755 --- a/src/devices_controller/client/devices_abstract/device_controller_abstract.py +++ b/src/devices_controller/client/devices_abstract/device_controller_abstract.py @@ -23,7 +23,7 @@ sys.path.append("..") # from src_socket/client/ sys.path.append("../../..") import src.core.pyros_django.utils.celme as celme -from devices_channel.client.logs import * +from devices_controller.client.logs import * # Local application imports @@ -31,9 +31,9 @@ from devices_channel.client.logs import * #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract ##from src_socket.client.socket_client_abstract import * ##from src_device.client.client_channel import * -from devices_channel.client.channel.client_channel_socket import ClientChannelSocket -from devices_channel.client.channel.client_channel_serial import ClientChannelSerial -from devices_channel.client.channel.client_channel_usb import ClientChannelUSB +from devices_controller.client.channel.client_channel_socket import ClientChannelSocket +from devices_controller.client.channel.client_channel_serial import ClientChannelSerial +from devices_controller.client.channel.client_channel_usb import ClientChannelUSB diff --git a/src/devices_controller/client/devices_abstract/telescope_controller_abstract.py b/src/devices_controller/client/devices_abstract/telescope_controller_abstract.py index 1ff9d5d..f558f22 100755 --- a/src/devices_controller/client/devices_abstract/telescope_controller_abstract.py +++ b/src/devices_controller/client/devices_abstract/telescope_controller_abstract.py @@ -27,7 +27,7 @@ import src.core.pyros_django.utils.celme as celme #sys.path.append('../..') #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract ##from src_socket.client.socket_client_abstract import * -from devices_channel.client.devices_abstract.device_controller_abstract import * +from devices_controller.client.devices_abstract.device_controller_abstract import * diff --git a/src/devices_controller/client/telescope_controller_gemini.py b/src/devices_controller/client/telescope_controller_gemini.py index fc8ca67..4a0e1d2 100755 --- a/src/devices_controller/client/telescope_controller_gemini.py +++ b/src/devices_controller/client/telescope_controller_gemini.py @@ -17,7 +17,7 @@ import time sys.path.append('../..') #from src.client.socket_client_telescope_abstract import Position, UnknownCommandException, TimeoutException, SocketClientTelescopeAbstract ##from src_socket.client.socket_client_telescope_abstract import * -from devices_channel.client.devices_abstract.telescope_controller_abstract import * +from devices_controller.client.devices_abstract.telescope_controller_abstract import * # Default timeouts TIMEOUT_SEND = 10 diff --git a/src/devices_controller/client_telescope_controller_gemini_run.py b/src/devices_controller/client_telescope_controller_gemini_run.py index e6b8542..99414fb 100755 --- a/src/devices_controller/client_telescope_controller_gemini_run.py +++ b/src/devices_controller/client_telescope_controller_gemini_run.py @@ -6,7 +6,7 @@ import sys sys.path.append("..") -from devices_channel.client.telescope_controller_gemini import TelescopeControllerGEMINI +from devices_controller.client.telescope_controller_gemini import TelescopeControllerGEMINI #DEBUG = False DEBUG = True diff --git a/src/devices_controller/server_telescope_gemini_simulator_run.py b/src/devices_controller/server_telescope_gemini_simulator_run.py index 76b9745..1b678db 100755 --- a/src/devices_controller/server_telescope_gemini_simulator_run.py +++ b/src/devices_controller/server_telescope_gemini_simulator_run.py @@ -4,7 +4,7 @@ import sys sys.path.append("..") -from devices_channel.server.server_udp_or_tcp import get_SocketServer_UDP_TCP +from devices_controller.server.server_udp_or_tcp import get_SocketServer_UDP_TCP #from server.server_udp_or_tcp import get_SocketServer_UDP_TCP HOST, PORT = "localhost", 11110 diff --git a/src/devices_controller/test/test_client_gemini.py b/src/devices_controller/test/test_client_gemini.py index 658beef..944b012 100755 --- a/src/devices_controller/test/test_client_gemini.py +++ b/src/devices_controller/test/test_client_gemini.py @@ -7,9 +7,9 @@ import unittest import sys sys.path.append('..') sys.path.append('../..') -from devices_channel.server.server_udp_or_tcp import get_SocketServer_UDP_TCP +from devices_controller.server.server_udp_or_tcp import get_SocketServer_UDP_TCP #from src_socket.client.socket_client_telescope_gemini import SocketClientTelescopeGEMINI -import devices_channel.client.telescope_controller_gemini as gemini +import devices_controller.client.telescope_controller_gemini as gemini #HOST, PORT = "localhost", 9999 #HOST, PORT = "localhost", 20001 -- libgit2 0.21.2