Fix SlurmFlag Enum and ReservationReoccurrence Enum (#374)

* fix accidentally importing StrEnum

* We can't use auto with multiple other values after it, sadly.

Due to a bug in stdlib Enum, that is only fixed in 3.11 and 3.12

* fix SlurmFlag for Python < 3.10

(cherry picked from commit ff205f7)
(cherry picked from commit e172b3d)

Author: tazend

pyslurm/core/reservation.pyx

@@ -32,7 +32,7 @@ from datetime import datetime
 from pyslurm import xcollections
 from pyslurm.utils.helpers import instance_to_dict
 from pyslurm.utils.enums import SlurmEnum, SlurmFlag
-from enum import auto, StrEnum
+from enum import auto
 from pyslurm.utils.ctime import (
     _raw_time,
     timestr_to_mins,
@@ -575,9 +575,9 @@ class ReservationReoccurrence(SlurmEnum):
 
     See {scontrol#OPT_Flags} for more info.
     """
-    NO      = auto()
-    DAILY   = auto(), slurm.RESERVE_FLAG_DAILY,   slurm.RESERVE_FLAG_NO_DAILY
-    HOURLY  = auto(), slurm.RESERVE_FLAG_HOURLY,  slurm.RESERVE_FLAG_NO_HOURLY
-    WEEKLY  = auto(), slurm.RESERVE_FLAG_WEEKLY,  slurm.RESERVE_FLAG_NO_WEEKLY
-    WEEKDAY = auto(), slurm.RESERVE_FLAG_WEEKDAY, slurm.RESERVE_FLAG_NO_WEEKDAY
-    WEEKEND = auto(), slurm.RESERVE_FLAG_WEEKEND, slurm.RESERVE_FLAG_NO_WEEKEND
+    NO      = "NO"
+    DAILY   = "DAILY",   slurm.RESERVE_FLAG_DAILY,   slurm.RESERVE_FLAG_NO_DAILY
+    HOURLY  = "HOURLY",  slurm.RESERVE_FLAG_HOURLY,  slurm.RESERVE_FLAG_NO_HOURLY
+    WEEKLY  = "WEEKLY",  slurm.RESERVE_FLAG_WEEKLY,  slurm.RESERVE_FLAG_NO_WEEKLY
+    WEEKDAY = "WEEKDAY", slurm.RESERVE_FLAG_WEEKDAY, slurm.RESERVE_FLAG_NO_WEEKDAY
+    WEEKEND = "WEEKEND", slurm.RESERVE_FLAG_WEEKEND, slurm.RESERVE_FLAG_NO_WEEKEND

pyslurm/utils/enums.pyx

@@ -87,7 +87,15 @@ class SlurmEnum(str, Enum, metaclass=DocstringSupport):
 class SlurmFlag(Flag, metaclass=DocstringSupport):
 
     def __new__(cls, flag, *args):
-        obj = super()._new_member_(cls)
+        parent = super()
+        if hasattr(parent, "_new_member_"):
+            # For Python >= 3.10, use _new_member_.
+            # We could very likely just also use object.__new__, but it works
+            # here, so no need to change it now.
+            obj = parent._new_member_(cls)
+        else:
+            obj = object.__new__(cls)
+
         obj._value_ = int(flag)
         obj._clear_flag = int(args[0]) if len(args) >= 1 else 0
         return obj