Skip to content

Commit 74744aa

Browse files
committed
fix compilation with cython 0.29.37
1 parent 5a2fcd5 commit 74744aa

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

pyslurm/core/partition.pxd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ from pyslurm.utils cimport cstr
5656
from pyslurm.utils cimport ctime
5757
from pyslurm.utils.ctime cimport time_t
5858
from pyslurm.utils.uint cimport *
59-
from pyslurm.core cimport slurmctld
6059
from pyslurm.xcollections cimport MultiClusterMap
6160

6261

@@ -218,7 +217,7 @@ cdef class Partition:
218217
cdef:
219218
partition_info_t *ptr
220219
int power_save_enabled
221-
slurmctld.Config slurm_conf
220+
slurm_conf
222221

223222
cdef readonly cluster
224223

pyslurm/core/partition.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ from pyslurm.core.error import RPCError, verify_rpc
3131
from pyslurm.utils.ctime import timestamp_to_date, _raw_time
3232
from pyslurm.constants import UNLIMITED
3333
from pyslurm.settings import LOCAL_CLUSTER
34+
from pyslurm.core import slurmctld
3435
from pyslurm.core.slurmctld.config import _get_memory
3536
from pyslurm import xcollections
3637
from pyslurm.utils.helpers import (
@@ -78,7 +79,6 @@ cdef class Partitions(MultiClusterMap):
7879
Partitions partitions = Partitions()
7980
int flags = slurm.SHOW_ALL
8081
Partition partition
81-
slurmctld.Config slurm_conf
8282
int power_save_enabled = 0
8383

8484
verify_rpc(slurm_load_partitions(0, &partitions.info, flags))
@@ -801,7 +801,7 @@ def _preempt_mode_str_to_int(mode):
801801
return pmode
802802

803803

804-
def _preempt_mode_int_to_str(mode, slurmctld.Config slurm_conf):
804+
def _preempt_mode_int_to_str(mode, slurm_conf):
805805
if mode == slurm.NO_VAL16:
806806
return slurm_conf.preempt_mode if slurm_conf else None
807807
else:

pyslurm/core/slurmctld/__init__.pxd

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
# cython: c_string_type=unicode, c_string_encoding=default
2-
# cython: language_level=3
3-
4-
from .config cimport Config

0 commit comments

Comments
 (0)