diff --git a/README.rst b/README.rst index 278dca9..7b44523 100644 --- a/README.rst +++ b/README.rst @@ -17,7 +17,7 @@ environment! +---------+----------------------------------------------------+ | License | MIT License, property of Stanford, use as you wish | +---------+----------------------------------------------------+ -| Version | 0.6.1-beta.5 | +| Version | 0.6.1-beta.6 | +---------+----------------------------------------------------+ .. image:: https://readthedocs.org/projects/fyrd/badge/?version=latest diff --git a/docs/fyrd_manual.pdf b/docs/fyrd_manual.pdf index 8447814..fda3d77 100644 Binary files a/docs/fyrd_manual.pdf and b/docs/fyrd_manual.pdf differ diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py index 2cd6d90..dcc7340 100644 --- a/docs/sphinx/conf.py +++ b/docs/sphinx/conf.py @@ -9,7 +9,7 @@ copyright = '2016, Michael Dacre ' author = 'Michael Dacre ' version = '0.6' -release = '0.6.1-beta.5' +release = '0.6.1-beta.6' language = 'en' # Add any paths that contain templates here, relative to this directory. diff --git a/docs/sphinx/index.rst b/docs/sphinx/index.rst index 3de650d..e1ba114 100644 --- a/docs/sphinx/index.rst +++ b/docs/sphinx/index.rst @@ -8,7 +8,7 @@ Python job submission on torque and slurm clusters with dependency tracking. +---------+----------------------------------------------------+ | License | MIT License, property of Stanford, use as you wish | +---------+----------------------------------------------------+ -| Version | 0.6.1-beta.5 | +| Version | 0.6.1-beta.6 | +---------+----------------------------------------------------+ .. only:: html diff --git a/fyrd/__init__.py b/fyrd/__init__.py index 00bded8..ad07d72 100644 --- a/fyrd/__init__.py +++ b/fyrd/__init__.py @@ -6,9 +6,9 @@ AUTHOR: Michael D Dacre, mike.dacre@gmail.com ORGANIZATION: Stanford University LICENSE: MIT License, property of Stanford, use as you wish - VERSION: 0.6.1-beta.5 + VERSION: 0.6.1-beta.6 CREATED: 2015-12-11 22:19 - Last modified: 2016-11-07 21:21 + Last modified: 2016-11-14 14:46 =============== =================================================== Allows simple job submission with *dependency tracking and queue waiting* with @@ -143,7 +143,7 @@ import atexit as _atexit # Version Number -__version__ = '0.6.1-beta.5' +__version__ = '0.6.1-beta.6' ################################################# # Currently configured job submission systems # diff --git a/fyrd/__main__.py b/fyrd/__main__.py index b72dcb2..c6e7b48 100644 --- a/fyrd/__main__.py +++ b/fyrd/__main__.py @@ -7,11 +7,8 @@ Author Michael D Dacre Organization Stanford University License MIT License, use as you wish -Created 2016-10-08 -Version 0.4.0b1 +Version 0.6.2-beta.6 ============ ====================================== - -Last modified: 2016-11-14 14:23 """ from __future__ import print_function import sys diff --git a/fyrd/basic.py b/fyrd/basic.py index ce6eed5..110f773 100644 --- a/fyrd/basic.py +++ b/fyrd/basic.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- """ Functions to allow simple job and file submission without the Job class. - -Last modified: 2016-11-14 13:23 """ import os as _os import sys as _sys diff --git a/fyrd/conf.py b/fyrd/conf.py index 11e7389..7a63f66 100644 --- a/fyrd/conf.py +++ b/fyrd/conf.py @@ -2,8 +2,6 @@ """ Get and set config file options. -Last modified: 2016-11-14 13:18 - The functions defined here provide an easy way to access the config file defined by CONFIG_FILE (default ~/.fyrd/config.txt) and the config.get('jobs', 'profile_file') (default ~/.fyrd/profile.txt). diff --git a/fyrd/helpers.py b/fyrd/helpers.py index 4cf4079..86f2ddb 100644 --- a/fyrd/helpers.py +++ b/fyrd/helpers.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- """ High level functions to make complex tasks easier. - -Last modified: 2016-11-11 02:42 """ import inspect as _inspect diff --git a/fyrd/job.py b/fyrd/job.py index a42fc34..36288d9 100644 --- a/fyrd/job.py +++ b/fyrd/job.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- """ Class and methods to handle Job submission. - -Last modified: 2016-11-14 13:27 """ import os as _os import sys as _sys diff --git a/fyrd/local.py b/fyrd/local.py index 6a8c487..1a0b5b5 100644 --- a/fyrd/local.py +++ b/fyrd/local.py @@ -2,8 +2,6 @@ """ Manage job dependency tracking with multiprocessing. -Last modified: 2016-11-04 17:28 - Runs jobs with a multiprocessing.Pool, but manages dependency using an additional Process that loops through all submitted jobs and checks dependencies before running. diff --git a/fyrd/logme.py b/fyrd/logme.py index 323b84f..a244c09 100644 --- a/fyrd/logme.py +++ b/fyrd/logme.py @@ -2,8 +2,6 @@ """ Logging with timestamps and optional log files. -Last modified: 2016-11-11 03:13 - Print a timestamped message to a logfile, STDERR, or STDOUT. If STDERR or STDOUT are used, colored flags are added. Colored flags are INFO, diff --git a/fyrd/options.py b/fyrd/options.py index 520c906..3173f35 100644 --- a/fyrd/options.py +++ b/fyrd/options.py @@ -2,8 +2,6 @@ """ Available options for job submission. -Last modified: 2016-11-14 14:39 - All keyword arguments that can be used with Job() objects are defined in this file. These can be edited by the end user to increase functionality. diff --git a/fyrd/queue.py b/fyrd/queue.py index f6861d4..e1e7c28 100644 --- a/fyrd/queue.py +++ b/fyrd/queue.py @@ -2,8 +2,6 @@ """ Monitor the queue for torque or slurm. -Last modified: 2016-11-11 16:09 - Provides a class to monitor the torque, slurm, or local queues with identical syntax. diff --git a/fyrd/run.py b/fyrd/run.py index 7344abc..6cc1548 100644 --- a/fyrd/run.py +++ b/fyrd/run.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- """ File management and execution functions. - -Last modified: 2016-11-11 02:45 """ import os import re diff --git a/fyrd/submission_scripts.py b/fyrd/submission_scripts.py index 87ae379..8e9cbb3 100644 --- a/fyrd/submission_scripts.py +++ b/fyrd/submission_scripts.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- """ Classes to build submission scripts. - -Last modified: 2016-11-09 23:04 """ import os as _os import sys as _sys diff --git a/setup.py b/setup.py index c900714..e7da001 100755 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ def run_tests(self): setup( name='fyrd', - version='0.6.1-beta.5', + version='0.6.1-beta.6', description=('Submit functions and shell scripts to torque, slurm, ' + 'or local machines'), long_description=long_description, @@ -81,6 +81,7 @@ def run_tests(self): 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', ], keywords='slurm torque multiprocessing cluster job_management',