Skip to content

Commit 6ca5605

Browse files
Support for 20.11 (#193)
* Update version to 20.11 * Update slurm.pxd to 20.11 * Apply 20.11 patches to pyslurm.pyx * Update README for 20.11 Co-authored-by: Bas van der Vlies <bas.vandervlies@surfsara.nl>
1 parent 4bfe827 commit 6ca5605

15 files changed

+307
-385
lines changed

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
PySlurm: Slurm Interface for Python
33
***********************************
44

5-
.. image:: https://travis-ci.org/PySlurm/pyslurm.svg?branch=20.02.0
5+
.. image:: https://travis-ci.org/PySlurm/pyslurm.svg?branch=20.11
66
:target: https://travis-ci.org/PySlurm/pyslurm
77

88
Overview
@@ -11,7 +11,7 @@ Overview
1111
Currently PySlurm is under development to move from it's thin layer on top of
1212
the Slurm C API to an object orientated interface.
1313

14-
This release is based on Slurm 20.02.5.
14+
This release is based on Slurm 20.11.
1515

1616
Prerequisites
1717
*************
@@ -24,7 +24,7 @@ This PySlurm branch has been tested with:
2424

2525
* Cython 0.19.2, and the latest stable
2626
* Python 2.7, 3.4, 3.5 and 3.6
27-
* Slurm 20.02.5
27+
* Slurm 20.11
2828

2929

3030
Installation

jinja2/defines/slurm_defines.pxd

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ uint32_t JOB_STAGE_OUT
4444

4545
uint8_t READY_JOB_ERROR
4646
uint8_t READY_JOB_FATAL
47-
uint8_t READY_NODE_STATE
48-
uint8_t READY_JOB_STATE
4947

5048
uint8_t MAIL_JOB_BEGIN
5149
uint8_t MAIL_JOB_END
@@ -192,7 +190,6 @@ uint8_t HAS_STATE_DIR
192190
uint8_t BACKFILL_TEST
193191
uint8_t GRES_ENFORCE_BIND
194192
uint8_t TEST_NOW_ONLY
195-
uint8_t NODE_MEM_CALC
196193
uint8_t NODE_REBOOT
197194
uint16_t SPREAD_JOB
198195
uint16_t USE_MIN_NODES
@@ -220,7 +217,6 @@ uint32_t USE_DEFAULT_PART
220217
uint32_t USE_DEFAULT_QOS
221218
uint32_t USE_DEFAULT_WCKEY
222219
uint32_t JOB_DEPENDENT
223-
uint32_t JOB_PROM
224220

225221
uint8_t X11_FORWARD_ALL
226222
uint8_t X11_FORWARD_BATCH
@@ -292,14 +288,11 @@ uint32_t RESERVE_FLAG_DUR_MINUS
292288
uint32_t RESERVE_FLAG_NO_HOLD_JOBS
293289
uint32_t RESERVE_FLAG_REPLACE_DOWN
294290
uint32_t RESERVE_FLAG_NO_PURGE_COMP
295-
uint64_t RESERVE_FLAG_PROM
296-
uint64_t RESERVE_FLAG_NO_PROM
297291

298292
uint8_t DEBUG_FLAG_SELECT_TYPE
299293
uint8_t DEBUG_FLAG_STEPS
300294
uint8_t DEBUG_FLAG_TRIGGERS
301295
uint8_t DEBUG_FLAG_CPU_BIND
302-
uint8_t DEBUG_FLAG_WIKI
303296
uint8_t DEBUG_FLAG_NO_CONF_HASH
304297
uint8_t DEBUG_FLAG_GRES
305298
uint8_t DEBUG_FLAG_TRES_NODE

jinja2/defines/slurmdb_defines.pxd

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ uint8_t JOBCOND_FLAG_WHOLE_HETJOB
4545
uint8_t JOBCOND_FLAG_NO_WHOLE_HETJOB
4646
uint8_t JOBCOND_FLAG_NO_WAIT
4747
uint8_t JOBCOND_FLAG_NO_DEFAULT_USAGE
48-
uint16_t JOBCOND_FLAG_DBD_UID
4948

5049
uint16_t SLURMDB_PURGE_BASE
5150
uint32_t SLURMDB_PURGE_FLAGS
@@ -67,11 +66,18 @@ uint8_t CLUSTER_FLAG_A5
6766
uint8_t CLUSTER_FLAG_A6
6867
uint8_t CLUSTER_FLAG_A7
6968
uint8_t CLUSTER_FLAG_MULTSD
70-
uint16_t CLUSTER_FLAG_CRAYXT
71-
uint16_t CLUSTER_FLAG_CRAY_A
69+
uint16_t CLUSTER_FLAG_A9
70+
uint16_t CLUSTER_FLAG_A10
7271
uint16_t CLUSTER_FLAG_FE
7372
uint16_t CLUSTER_FLAG_CRAY_N
7473
uint16_t CLUSTER_FLAG_FED
7574
uint16_t CLUSTER_FLAG_EXT
7675
uint16_t CLUSTER_FLAG_CRAY
76+
77+
uint8_t SLURMDB_ASSOC_FLAG_NONE
78+
uint8_t SLURMDB_ASSOC_FLAG_DELETED
79+
uint8_t SLURMDB_USER_FLAG_NONE
80+
uint8_t SLURMDB_USER_FLAG_DELETED
81+
uint8_t SLURMDB_WCKEY_FLAG_NONE
82+
uint8_t SLURMDB_WCKEY_FLAG_DELETED
7783
{%- endfilter %}

0 commit comments

Comments
 (0)