diff --git a/README.md b/README.md index 8d01a49..2da5515 100644 --- a/README.md +++ b/README.md @@ -71,12 +71,12 @@ Date: 14/06/2019 Author: E. Pallier (epallier@irap.omp.eu) -VERSION: 0.30.5 +VERSION: 0.30.6 -Comment : Restructuration du projet - phase 3 : /devices_channel/ => /src/devices_controller/ +Comment : +- Restructuration du projet - phase 4 : /src/core/pyros_django/utils/celme/ => /src/core/celme/ TODO (coming) : -- Restructuration du projet - phase 4 : /src/core/pyros_django/utils/celme/ => /src/core/celme/ - Restructuration du projet - phase 5 : /devices_channel/ => réorganisation interne @@ -114,10 +114,11 @@ 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 -**14/06/2019 : v0.30.3-4 (EP)** +**14/06/2019 : v0.30.3-6 (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/ **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/logpyros.py b/src/core/pyros_django/agent/logpyros.py index 135491e..adca014 100644 --- a/src/core/pyros_django/agent/logpyros.py +++ b/src/core/pyros_django/agent/logpyros.py @@ -9,8 +9,9 @@ py_pwd = os.getcwd() + "/../utils" if (py_pwd not in py_path): (os.sys.path).append(py_pwd) -import utils.celme as celme #import celme +#import utils.celme as celme +import src.core.celme as celme class LogPyros: diff --git a/src/core/pyros_django/dashboard/views.py b/src/core/pyros_django/dashboard/views.py index df33c02..54267b7 100644 --- a/src/core/pyros_django/dashboard/views.py +++ b/src/core/pyros_django/dashboard/views.py @@ -1,3 +1,5 @@ +import sys + from django.http import HttpResponse from django.shortcuts import render, redirect @@ -23,7 +25,12 @@ from devices.CameraNIRRemoteControlDefault import CameraNIRRemoteControlDefault from devices import PLC from django.core.mail import send_mail import time -import utils.celme as celme + +sys.path.append("../../..") +#import utils.celme as celme +import src.core.celme as celme + + from collections import OrderedDict SUN_ELEV_DAY_THRESHOLD = -10 diff --git a/src/core/pyros_django/utils/report/status_json.py b/src/core/pyros_django/utils/report/status_json.py index b086a69..6964b8a 100644 --- a/src/core/pyros_django/utils/report/status_json.py +++ b/src/core/pyros_django/utils/report/status_json.py @@ -2,6 +2,7 @@ import doctest import json import os +import sys # --- update the path of Python py_path = os.sys.path @@ -15,7 +16,10 @@ py_pwd = os.getcwd() + "/../.." if (py_pwd not in py_path): (os.sys.path).append(py_pwd) -import utils.celme as celme + +#import utils.celme as celme +#sys.path.append('..') +import src.core.celme as celme # ======================================================== # ======================================================== 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 c013650..71d7ade 100755 --- a/src/devices_controller/client/devices_abstract/device_controller_abstract.py +++ b/src/devices_controller/client/devices_abstract/device_controller_abstract.py @@ -22,7 +22,8 @@ import time sys.path.append("..") # from src_socket/client/ sys.path.append("../../..") -import src.core.pyros_django.utils.celme as celme +#import src.core.pyros_django.utils.celme as celme +import src.core.celme as celme from devices_controller.client.logs import * diff --git a/src/devices_controller/client/devices_abstract/plc_controller_abstract.py b/src/devices_controller/client/devices_abstract/plc_controller_abstract.py index 14920a6..5c1ba8c 100755 --- a/src/devices_controller/client/devices_abstract/plc_controller_abstract.py +++ b/src/devices_controller/client/devices_abstract/plc_controller_abstract.py @@ -20,7 +20,8 @@ import time sys.path.append("..") # from src_socket/client/ sys.path.append("../../..") -import src.core.pyros_django.utils.celme as celme +#import src.core.pyros_django.utils.celme as celme +import src.core.celme as celme # Local application imports 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 f558f22..563144d 100755 --- a/src/devices_controller/client/devices_abstract/telescope_controller_abstract.py +++ b/src/devices_controller/client/devices_abstract/telescope_controller_abstract.py @@ -20,7 +20,8 @@ import time sys.path.append("..") # from src_socket/client/ sys.path.append("../../..") -import src.core.pyros_django.utils.celme as celme +#import src.core.pyros_django.utils.celme as celme +import src.core.celme as celme # Local application imports -- libgit2 0.21.2