diff --git a/README.md b/README.md index 305bbbb..357c6a9 100644 --- a/README.md +++ b/README.md @@ -71,15 +71,9 @@ Date: 17/06/2019 Author: E. Pallier (epallier@irap.omp.eu) -VERSION: 0.30.7 +VERSION: 0.30.8 Comment : -- Restructuration du projet - phase 5a : /src/devices_controller/ => réorganisation interne 1/2 : - - sortir /src/devices_controller/client/channel => /src/devices_controller/channel/ - - sortir /src/devices_controller/client/devices_abstract/ => /src/devices_controller/devices_abstract/ - - supprimer dossier client/ - - rename channel/ => channels/ - - rename devices_abstract/ => devices_controller_abstract_component/ TODO (coming) : - Restructuration du projet - phase 5b : /src/devices_controller/ => réorganisation interne 2/2 : @@ -120,14 +114,24 @@ TODO (coming) : Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master -The list below is obsolete. The new official changes history is here : https://tinyurl.com/pyros-dev#heading=h.2r55bflctpt5 +(The new official changes history is here : https://tinyurl.com/pyros-dev#heading=h.2r55bflctpt5) -**14/06/2019 : v0.30.3-6 (EP)** +**12/06-17/06/2019 : v0.30.3-8 (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/ - Restructuration du projet - phase 4 : /src/core/pyros_django/utils/celme/ => /src/core/celme/ - + - Restructuration du projet - phase 5a : /src/devices_controller/ => réorganisation interne 1/2 : + - sortir /src/devices_controller/client/channel => /src/devices_controller/channel/ + - sortir /src/devices_controller/client/devices_abstract/ => /src/devices_controller/devices_abstract/ + - supprimer dossier client/ + - rename channel/ => channels/ + - rename devices_abstract/ => devices_controller_abstract_component/ + - Restructuration du projet - phase 5b : /src/devices_controller/ => réorganisation interne 2/2 : + - create folder devices_controller/devices_controller_concrete/ + - migrer le dossier devices_controller/server/ => devices_controller/devices_controller_concrete/server/ + - rename server/ => device_simulator_common/ + **11/06/2019 : v0.30.2 (EP)** - Ajouté options "test" et "testall" dans pyros.py pour exécution des (anciens) tests unitaires - Restructuring : private/ => venv/ diff --git a/src/devices_controller/server_telescope_gemini_simulator_run.py b/src/devices_controller/server_telescope_gemini_simulator_run.py index 1b678db..8f295e8 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_controller.server.server_udp_or_tcp import get_SocketServer_UDP_TCP +from devices_controller.devices_controller_concrete.device_simulator_common.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 76b1204..cfb3d03 100755 --- a/src/devices_controller/test/test_client_gemini.py +++ b/src/devices_controller/test/test_client_gemini.py @@ -7,7 +7,7 @@ import unittest import sys sys.path.append('..') sys.path.append('../..') -from devices_controller.server.server_udp_or_tcp import get_SocketServer_UDP_TCP +from devices_controller.devices_controller_concrete.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP #from src_socket.client.socket_client_telescope_gemini import SocketClientTelescopeGEMINI import devices_controller.telescope_controller_gemini as gemini -- libgit2 0.21.2