Merge PR#149 plus one more commit into dev

Author: rkdarst

README.md

@@ -47,7 +47,7 @@ Common attributes of batch submission / resource manager environments will inclu
 
 ### Example
 
-Every effort has been made to accomodate highly diverse systems through configuration
+Every effort has been made to accommodate highly diverse systems through configuration
 only. This example consists of the (lightly edited) configuration used by the author
 to run Jupyter notebooks on an academic supercomputer cluster.
 
@@ -90,7 +90,7 @@ to run Jupyter notebooks on an academic supercomputer cluster.
 
 Unless otherwise stated for a specific spawner, assume that spawners
 *do* evaluate shell environment for users and thus the [security
-requiremnts of JupyterHub security for untrusted
+requirements of JupyterHub security for untrusted
 users](https://jupyterhub.readthedocs.io/en/stable/reference/websecurity.html)
 are not fulfilled because some (most?) spawners *do* start a user
 shell which will execute arbitrary user environment configuration
@@ -183,7 +183,7 @@ Changed
   - If you have installed with `pip install -e`, you will have to re-install so that the new script `batchspawner-singleuser` is added to `$PATH`.
 * Update minimum requirements to JupyterHub 0.9 and Python 3.5.  #143
 * Update Slurm batch script.  Now, the single-user notebook is run in a job step, with a wrapper of `srun`.  This may need to be removed using `req_srun=''` if you don't want environment variables limited.
-* Pass the environment dictionary to the queue and cancel commands as well.  This is mostly user environment, but may be useful to these commands as well in some cases. #108, #111  If these envioronment variables were used for authentication as an admin, be aware that there are pre-existing security issues because they may be passed to the user via the batch submit command, see #82.
+* Pass the environment dictionary to the queue and cancel commands as well.  This is mostly user environment, but may be useful to these commands as well in some cases. #108, #111  If these environment variables were used for authentication as an admin, be aware that there are pre-existing security issues because they may be passed to the user via the batch submit command, see #82.
 
 
 Fixed

SPAWNERS.md

@@ -1,5 +1,17 @@
 # Notes on specific spawners
 
+**Spawner maintainers**: Included below are "spawner maintainers",
+when available.  There aren't official obligations, but the general
+idea is that you should watch the repository and feel especially
+empowered to comment on issues when you think it might be relevant to
+you (obviously everyone should be, but this is our attempt at even
+more outreach).  You should let us know when we break something and
+provide a diversity of opinions in general.  Submitting PRs and
+testing is nice but not required.
+
+To be listed as a maintainer, just submit an issue or PR adding you,
+and please watch the repository on Github.
+
 ## `TorqueSpawner`
 
 Maintainers:

batchspawner/batchspawner.py

@@ -639,6 +639,8 @@ class SlurmSpawner(UserEnvMixin,BatchSpawnerRegexStates):
     def parse_job_id(self, output):
         # make sure jobid is really a number
         try:
+            # use only last line to circumvent slurm bug
+            output = output.splitlines()[-1]
             id = output.split(';')[0]
             int(id)
         except Exception as e: