From 957249250a0708ba3642e52985814b7776b950ab Mon Sep 17 00:00:00 2001 From: Manuel Gunther <siebenkopf@googlemail.com> Date: Tue, 25 Oct 2016 18:24:26 -0600 Subject: [PATCH] Fixed documentation and preovided default value for database in JobManager --- doc/program.rst | 4 ++-- gridtk/manager.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/program.rst b/doc/program.rst index 38f3168..0d7d336 100644 --- a/doc/program.rst +++ b/doc/program.rst @@ -15,10 +15,10 @@ submit a python script: .. code-block:: python import sys - from gridtk.sge import JobManager + from gridtk.sge import JobManagerSGE from gridtk.tools import make_shell - manager = JobManager() + manager = JobManagerSGE() command = make_shell(sys.executable, ['myscript.py', '--help']) job = manager.submit(command) diff --git a/gridtk/manager.py b/gridtk/manager.py index 30224a9..3553d58 100644 --- a/gridtk/manager.py +++ b/gridtk/manager.py @@ -15,7 +15,7 @@ from distutils.version import LooseVersion class JobManager: """This job manager defines the basic interface for handling jobs in the SQL database.""" - def __init__(self, database, wrapper_script = None, debug = False): + def __init__(self, database = 'submitted.sql3', wrapper_script = None, debug = False): self._database = os.path.realpath(database) self._engine = sqlalchemy.create_engine("sqlite:///"+self._database, connect_args={'timeout': 600}, echo=debug) self._session_maker = sqlalchemy.orm.sessionmaker(bind=self._engine) -- GitLab