Increment version to 0.6.2-beta1

MikeDacre · Mar 7, 2018 · b8950de · b8950de
1 parent 53c046c
commit b8950de
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/README.rst b/README.rst
@@ -20,7 +20,7 @@ https://github.com/MikeDacre/fyrd
 +---------+----------------------------------------------------+
 | License | MIT License, property of Stanford, use as you wish |
 +---------+----------------------------------------------------+
-| Version | 0.6.2a1                                            |
+| Version | 0.6.2b1                                            |
 +---------+----------------------------------------------------+
 
 
@@ -238,7 +238,7 @@ like this::
     Author         Michael D Dacre <mike.dacre@gmail.com>
     Organization   Stanford University
     License        MIT License, use as you wish
-    Version        0.6.2-beta2
+    Version        0.6.2-beta1
     ============   ======================================
 
     positional arguments:

diff --git a/docs/fyrd_manual.pdf b/docs/fyrd_manual.pdf
diff --git a/docs/sphinx/changelog.rst b/docs/sphinx/changelog.rst
@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 0.6.211
+---------------
+
+This version adds bugfixes and stability over version 0.6.2a1.
+
 Version 0.6.2a1
 ---------------
 

diff --git 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.2a1                                            |
+| Version | 0.6.2b1                                            |
 +---------+----------------------------------------------------+
 
 .. only:: html

diff --git a/docs/sphinx/keyword_list.rst b/docs/sphinx/keyword_list.rst
@@ -11,7 +11,6 @@
     outfile
     errfile
     imports
-    threads
     nodes
     features
     qos

diff --git a/docs/sphinx/keyword_table.rst b/docs/sphinx/keyword_table.rst
@@ -41,16 +41,6 @@ Func: Used for function calls
 +----------+-----------------------------------------------------+--------+-----------+
 
 
-Local: Used only in local mode
-------------------------------
-
-+----------+-----------------------------------------------+--------+-----------+
-| Option   | Description                                   | Type   |   Default |
-+==========+===============================================+========+===========+
-| threads  | Number of threads to use on the local machine | int    |         4 |
-+----------+-----------------------------------------------+--------+-----------+
-
-
 Cluster: Options that work in both slurm and torque
 ---------------------------------------------------
 
@@ -107,6 +97,8 @@ Synonyms
 +----------------+---------------+
 | cpus           | cores         |
 +----------------+---------------+
+| threads        | cores         |
++----------------+---------------+
 | walltime       | time          |
 +----------------+---------------+
 | delete_files   | clean_files   |

diff --git a/fyrd/helpers.py b/fyrd/helpers.py
@@ -56,6 +56,7 @@ def jobify(name=None, profile=None, qtype=None, submit=True, **kwds):
     Usage:
 
     .. code:: python
+
         @fyrd.jobify(name='my_job', profile='small', mem='8GB',
                      time='00:10:00', imports=['from time import sleep'])
         def do_something(file_path, iteration_count=24):