Merge branch 'release/0.12.0'

Author: dan-blanchard

.travis.yml

@@ -11,12 +11,15 @@ virtualenv:
   system_site_packages: true
 before_install:
   - travis/install_sge.sh
-  - export GRID_MAP_REDIS_PORT=12345
   - export SGE_ROOT=/var/lib/gridengine
   - export SGE_CELL=default
   - export DRMAA_LIBRARY_PATH=/usr/lib/libdrmaa.so.1.0
+  - export SEND_ERROR_MAIL=False
   - sudo mkdir /scratch/
   - sudo chmod 777 /scratch/
+  # Work around for multiprocessing permission bug with Travis
+  - sudo rm -rf /dev/shm
+  - sudo ln -s /run/shm /dev/shm
 install:
   - pip install -r requirements.txt --use-mirrors
   - pip install python-coveralls --use-mirrors
@@ -25,7 +28,7 @@ install:
 
 # Run test
 script:
-  - nosetests -d -v --with-cov --cov gridmap --cov-config .coveragerc --logging-level=DEBUG
+  - nosetests -x -d -v --with-cov --cov gridmap --cov-config .coveragerc --logging-level=DEBUG
 
 # Calculate coverage
 after_success:

docs/gridmap.rst

@@ -42,15 +42,6 @@ From :py:mod:`~gridmap.job` Module
    :show-inheritance:
 
 
-:mod:`runner` Module
---------------------
-
-.. automodule:: gridmap.runner
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
 :mod:`web` Module
 -----------------
 

gridmap/__init__.py

@@ -33,8 +33,8 @@
                     (Default: ``all.q``)
 :var CREATE_PLOTS: Should we plot cpu and mem usage and send via email?
                    (Default: ``True``)
-:var SEND_ERROR_MAILS: Should we send error emails?
-                       (Default: ``True``)
+:var SEND_ERROR_MAIL: Should we send error emails?
+                      (Default: ``True``)
 :var SMTP_SERVER: SMTP server for sending error emails.
                   (Default: last three sections of the current machine's fully
                   qualified domain name)
@@ -70,15 +70,14 @@
                           ERROR_MAIL_RECIPIENT, ERROR_MAIL_SENDER,
                           HEARTBEAT_FREQUENCY, IDLE_THRESHOLD,
                           MAX_IDLE_HEARTBEATS, MAX_TIME_BETWEEN_HEARTBEATS,
-                          NUM_RESUBMITS, SEND_ERROR_MAILS, SMTP_SERVER,
+                          NUM_RESUBMITS, SEND_ERROR_MAIL, SMTP_SERVER,
                           USE_MEM_FREE)
-from gridmap.job import Job, JobException, process_jobs, grid_map, pg_map
+from gridmap.job import Job, JobException, process_jobs, grid_map
 from gridmap.version import __version__, VERSION
 
 # For * imports
-__all__ = ['Job', 'JobException', 'process_jobs', 'grid_map', 'pg_map',
-           'CHECK_FREQUENCY', 'CREATE_PLOTS', 'DEFAULT_QUEUE',
-           'ERROR_MAIL_RECIPIENT', 'ERROR_MAIL_SENDER', 'HEARTBEAT_FREQUENCY',
-           'IDLE_THRESHOLD', 'MAX_IDLE_HEARTBEATS',
-           'MAX_TIME_BETWEEN_HEARTBEATS', 'NUM_RESUBMITS', 'SEND_ERROR_MAILS',
-           'SMTP_SERVER', 'USE_MEM_FREE']
+__all__ = ['Job', 'JobException', 'process_jobs', 'grid_map', 'CHECK_FREQUENCY',
+           'CREATE_PLOTS', 'DEFAULT_QUEUE', 'ERROR_MAIL_RECIPIENT',
+           'ERROR_MAIL_SENDER', 'HEARTBEAT_FREQUENCY', 'IDLE_THRESHOLD',
+           'MAX_IDLE_HEARTBEATS', 'MAX_TIME_BETWEEN_HEARTBEATS',
+           'NUM_RESUBMITS', 'SEND_ERROR_MAIL', 'SMTP_SERVER', 'USE_MEM_FREE']

gridmap/conf.py

@@ -33,8 +33,8 @@
                     (Default: ``all.q``)
 :var CREATE_PLOTS: Should we plot cpu and mem usage and send via email?
                    (Default: ``True``)
-:var SEND_ERROR_MAILS: Should we send error emails?
-                       (Default: ``True``)
+:var SEND_ERROR_MAIL: Should we send error emails?
+                      (Default: ``True``)
 :var SMTP_SERVER: SMTP server for sending error emails.
                   (Default: last three sections of the current machine's fully
                   qualified domain name)
@@ -94,7 +94,7 @@
 
 # Global settings ####
 # email settings
-SEND_ERROR_MAILS = 'TRUE' == os.getenv('SEND_ERROR_MAILS', 'True').upper()
+SEND_ERROR_MAIL = 'TRUE' == os.getenv('SEND_ERROR_MAIL', 'True').upper()
 SMTP_SERVER = os.getenv('SMTP_SERVER', '.'.join(gethostname().split('.')[-3:]))
 ERROR_MAIL_SENDER = os.getenv('ERROR_MAIL_SENDER', 'error@gridmap.py')
 ERROR_MAIL_RECIPIENT = os.getenv('ERROR_MAIL_RECIPIENT',