Commit ab05fbd8 authored by Michael Salim's avatar Michael Salim
Browse files

major reorganization; added setuptools and sphinx docs folder

parent 75d8ac3b
......@@ -11,7 +11,7 @@ from django.conf import settings
from django.db import models
from concurrency.fields import IntegerVersionField
from common import Serializer
from balsam.common import Serializer
logger = logging.getLogger(__name__)
......
......@@ -6,9 +6,8 @@ from datetime import datetime
from collections import namedtuple
from django.conf import settings
from balsam.schedulers.exceptions import *
from balsam.schedulers import Scheduler
from common import run_subprocess
from balsam.service.schedulers.exceptions import *
from balsam.service.schedulers import Scheduler
import logging
logger = logging.getLogger(__name__)
......
......@@ -3,11 +3,11 @@ logger = logging.getLogger('balsam')
from django.conf import settings
from balsam.schedulers import exceptions,jobstates
from balsam.schedulers.condor import condor_q,condor_history,condor_submit
from balsam.service.schedulers import exceptions,jobstates
from balsam.service.schedulers.condor import condor_q,condor_history,condor_submit
from common.CondorJobDescriptionFile import CondorJobDescriptionFile
from common import run_subprocess
from balsam.common.CondorJobDescriptionFile import CondorJobDescriptionFile
from balsam.common import run_subprocess
CONDOR_FILE_PATH=os.path.join(settings.INSTALL_PATH,'balsam','schedulers','condor')
......
from django.conf import settings
from importlib import import_module
from balsam.schedulers.exceptions import *
from socket import gethostname
import os
import time
from balsam.service.schedulers.exceptions import *
import logging
logger = logging.getLogger(__name__)
......@@ -128,7 +128,7 @@ class Scheduler:
scheduler_class = settings.BALSAM_SCHEDULER_CLASS
if scheduler_class:
_temp = import_module('balsam.schedulers.'+scheduler_class)
_temp = import_module('balsam.service.schedulers.'+scheduler_class)
scheduler_main = _temp.new_scheduler()
else:
scheduler_main = Scheduler()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment