Skip to content

Commit 87e2bd2

Browse files
committed
Add req_account and req_partition base options
1 parent cd34cf6 commit 87e2bd2

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ clusters, as well as an option to run a local notebook directly on the jupyterhu
142142
### v0.8 (compatible with JupyterHub 0.5.0 through 0.8.1/0.9dev)
143143

144144
* SlurmSpawner: Remove `--uid` for (at least) Slurm 17.11 compatibility. If you use `sudo`, this should not be necessary, but because this is security related you should check that user management is as you expect. If your configuration does not use `sudo` then you may need to add the `--uid` option in a custom `batch_script`.
145-
* add `req_ngpus` and `req_options` base options
145+
* add base options `req_ngpus` `req_partition` `req_account` and `req_options`
146146
* Fix up logging
147147
* Merge `user_options` with the template substitution vars instead of having it as a separate key
148148
* Update ip/port handling for JupyterHub 0.8
@@ -152,7 +152,7 @@ clusters, as well as an option to run a local notebook directly on the jupyterhu
152152
* Add `MoabSpawner`
153153
* Add `condorSpawner`
154154
* Add `GridEngineSpawner`
155-
* SlurmSpawner: add `req_partition` and `req_qos` options
155+
* SlurmSpawner: add `req_qos` option
156156
* WrapSpawner and ProfilesSpawner, which provide mechanisms for runtime configuration of spawners, have been split out and moved to the [`wrapspawner`](https://github.com/jupyterhub/wrapspawner) package
157157
* Enable CI testing via Travis-CI
158158

batchspawner/batchspawner.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,14 @@ class BatchSpawnerBase(Spawner):
115115
help="Length of time for submitted job to run"
116116
).tag(config=True)
117117

118+
req_partition = Unicode('', \
119+
help="Partition name to submit job to resource manager"
120+
).tag(config=True)
121+
122+
req_account = Unicode('', \
123+
help="Account name string to pass to the resource manager"
124+
).tag(config=True)
125+
118126
req_options = Unicode('', \
119127
help="Other options to include into job submission script"
120128
).tag(config=True)
@@ -460,10 +468,6 @@ class SlurmSpawner(UserEnvMixin,BatchSpawnerRegexStates):
460468
help="Cluster name to submit job to resource manager"
461469
).tag(config=True)
462470

463-
req_partition = Unicode('', \
464-
help="Partition name to submit job to resource manager"
465-
).tag(config=True)
466-
467471
req_qos = Unicode('', \
468472
help="QoS name to submit job to resource manager"
469473
).tag(config=True)

0 commit comments

Comments
 (0)