PYROS-IRAP / pyros

Commit 1baa7ca335fc2764678807b3123e1484ccb10ca8

Authored by Etienne Pallier
1 parent 07b2b5c3
Exists in dev

Restructuration 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/
Showing 3 changed files with 16 additions and 12 deletions   Show diff stats
Inline Side-by-side
@@ -71,15 +71,9 @@ Date: 17/06/2019 @@ -71,15 +71,9 @@ Date: 17/06/2019
71 71
72 Author: E. Pallier (epallier@irap.omp.eu) 72 Author: E. Pallier (epallier@irap.omp.eu)
73 73
74 -VERSION: 0.30.7 74 +VERSION: 0.30.8
75 75
76 Comment : 76 Comment :
77 -- Restructuration du projet - phase 5a : /src/devices_controller/ => réorganisation interne 1/2 :  
78 - - sortir /src/devices_controller/client/channel => /src/devices_controller/channel/  
79 - - sortir /src/devices_controller/client/devices_abstract/ => /src/devices_controller/devices_abstract/  
80 - - supprimer dossier client/  
81 - - rename channel/ => channels/  
82 - - rename devices_abstract/ => devices_controller_abstract_component/  
83 77
84 TODO (coming) : 78 TODO (coming) :
85 - Restructuration du projet - phase 5b : /src/devices_controller/ => réorganisation interne 2/2 : 79 - Restructuration du projet - phase 5b : /src/devices_controller/ => réorganisation interne 2/2 :
@@ -120,14 +114,24 @@ TODO (coming) : @@ -120,14 +114,24 @@ TODO (coming) :
120 114
121 Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master 115 Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master
122 116
123 -The list below is obsolete. The new official changes history is here : https://tinyurl.com/pyros-dev#heading=h.2r55bflctpt5 117 +(The new official changes history is here : https://tinyurl.com/pyros-dev#heading=h.2r55bflctpt5)
124 118
125 -**14/06/2019 : v0.30.3-6 (EP)** 119 +**12/06-17/06/2019 : v0.30.3-8 (EP)**
126 - Restructuration du projet - phase 1 : /src/ => /pyros_django/ 120 - Restructuration du projet - phase 1 : /src/ => /pyros_django/
127 - Restructuration du projet - phase 2 : /pyros_django/ => /src/core/pyros_django/ 121 - Restructuration du projet - phase 2 : /pyros_django/ => /src/core/pyros_django/
128 - Restructuration du projet - phase 3 : /devices_channel/ => /src/devices_controller/ 122 - Restructuration du projet - phase 3 : /devices_channel/ => /src/devices_controller/
129 - Restructuration du projet - phase 4 : /src/core/pyros_django/utils/celme/ => /src/core/celme/ 123 - Restructuration du projet - phase 4 : /src/core/pyros_django/utils/celme/ => /src/core/celme/
130 - 124 + - Restructuration du projet - phase 5a : /src/devices_controller/ => réorganisation interne 1/2 :
  125 + - sortir /src/devices_controller/client/channel => /src/devices_controller/channel/
  126 + - sortir /src/devices_controller/client/devices_abstract/ => /src/devices_controller/devices_abstract/
  127 + - supprimer dossier client/
  128 + - rename channel/ => channels/
  129 + - rename devices_abstract/ => devices_controller_abstract_component/
  130 + - Restructuration du projet - phase 5b : /src/devices_controller/ => réorganisation interne 2/2 :
  131 + - create folder devices_controller/devices_controller_concrete/
  132 + - migrer le dossier devices_controller/server/ => devices_controller/devices_controller_concrete/server/
  133 + - rename server/ => device_simulator_common/
  134 +
131 **11/06/2019 : v0.30.2 (EP)** 135 **11/06/2019 : v0.30.2 (EP)**
132 - Ajouté options "test" et "testall" dans pyros.py pour exécution des (anciens) tests unitaires 136 - Ajouté options "test" et "testall" dans pyros.py pour exécution des (anciens) tests unitaires
133 - Restructuring : private/ => venv/ 137 - Restructuring : private/ => venv/
src/devices_controller/server_telescope_gemini_simulator_run.py
  Diff comments   View file @1baa7ca
@@ -4,7 +4,7 @@ import sys @@ -4,7 +4,7 @@ import sys
4 4
5 5
6 sys.path.append("..") 6 sys.path.append("..")
7 -from devices_controller.server.server_udp_or_tcp import get_SocketServer_UDP_TCP 7 +from devices_controller.devices_controller_concrete.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
8 #from server.server_udp_or_tcp import get_SocketServer_UDP_TCP 8 #from server.server_udp_or_tcp import get_SocketServer_UDP_TCP
9 9
10 HOST, PORT = "localhost", 11110 10 HOST, PORT = "localhost", 11110
src/devices_controller/test/test_client_gemini.py
  Diff comments   View file @1baa7ca
@@ -7,7 +7,7 @@ import unittest @@ -7,7 +7,7 @@ import unittest
7 import sys 7 import sys
8 sys.path.append('..') 8 sys.path.append('..')
9 sys.path.append('../..') 9 sys.path.append('../..')
10 -from devices_controller.server.server_udp_or_tcp import get_SocketServer_UDP_TCP 10 +from devices_controller.devices_controller_concrete.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
11 #from src_socket.client.socket_client_telescope_gemini import SocketClientTelescopeGEMINI 11 #from src_socket.client.socket_client_telescope_gemini import SocketClientTelescopeGEMINI
12 import devices_controller.telescope_controller_gemini as gemini 12 import devices_controller.telescope_controller_gemini as gemini
13 13