diff --git a/src/core/pyros_django/majordome/agent/A_Basic.py b/src/core/pyros_django/majordome/agent/A_Basic.py index 7ab0f82..a1791d9 100755 --- a/src/core/pyros_django/majordome/agent/A_Basic.py +++ b/src/core/pyros_django/majordome/agent/A_Basic.py @@ -14,13 +14,17 @@ import os ###sys.path.append("../../../..") +# pwd = PYROS/ pwd = os.environ['PROJECT_ROOT_PATH'] if pwd not in sys.path: sys.path.append(pwd) +# Add paths PYROS/src and PYROS/src/core/pyros_django short_paths = ['src', 'src/core/pyros_django'] for short_path in short_paths: path = os.path.join(pwd, short_path) + # ou plutot ? + #path = os.path.abspath(os.path.join(pwd, short_path)) if path not in sys.path: sys.path.insert(0, path) diff --git a/src/core/pyros_django/scheduling/A_Scheduler.py b/src/core/pyros_django/scheduling/A_Scheduler.py index 59c2b34..411ff17 100755 --- a/src/core/pyros_django/scheduling/A_Scheduler.py +++ b/src/core/pyros_django/scheduling/A_Scheduler.py @@ -29,6 +29,7 @@ import argparse import os import pickle import socket + pwd = os.environ['PROJECT_ROOT_PATH'] if pwd not in sys.path: sys.path.append(pwd) @@ -39,7 +40,8 @@ for short_path in short_paths: if path not in sys.path: sys.path.insert(0, path) -from src.core.pyros_django.majordome.agent.Agent import Agent, build_agent, log, parse_args +#from src.core.pyros_django.majordome.agent.Agent import Agent, build_agent, log, parse_args +from majordome.agent.Agent import Agent, build_agent, log, parse_args from seq_submit.models import Sequence from user_mgmt.models import Period, ScientificProgram, SP_Period from scheduling.models import PredictiveSchedule, EffectiveSchedule -- libgit2 0.21.2