Merge pull request #2463 from htcondor/V23_8-HTCONDOR-2389-compat-enum

(HTCONDOR-2389) Remove compat_enum
htcondor · May 14, 2024 · d985154 · d985154
2 parents d2d3795 + 35167be
commit d985154
Show file tree

Hide file tree

Showing 24 changed files with 19 additions and 1,841 deletions.
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
@@ -1,11 +1,9 @@
 
 # These are expanded in setup.py.cmake_template
-set(PACKAGES      "classad3" "classad2" "classad" "htcondor2" "htcondor2/compat_enum" "htcondor" "htcondor/dags" "htcondor/htchirp" "htcondor/compat_enum" "htcondor/_utils")
+set(PACKAGES      "classad3" "classad2" "classad" "htcondor2" "htcondor" "htcondor/dags" "htcondor/htchirp" "htcondor/_utils")
 
 # The python sources to copy
 set(PYTHON_SOURCES
-htcondor/compat_enum/__init__.py
-htcondor/compat_enum/LICENSE
 htcondor/_wrap.py
 htcondor/__init__.py
 htcondor/_lock.py
@@ -32,8 +30,6 @@ htcondor/_utils/__init__.py
 htcondor/_utils/ansi.py
 
 # Version 2.
-htcondor2/compat_enum/__init__.py
-htcondor2/compat_enum/LICENSE
 htcondor2/_negotiator.py
 htcondor2/_collector.py
 htcondor2/_startd.py
@@ -93,7 +89,6 @@ if (WITH_PYTHON_BINDINGS)
 	file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/htcondor2)
 	file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/htcondor/dags)
 	file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/htcondor/htchirp)
-	file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/htcondor/compat_enum)
 	file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/htcondor/_utils)
 	file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classad)
 	file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classad2)

diff --git a/bindings/python/classad2/_parser_type.py b/bindings/python/classad2/_parser_type.py
@@ -1,9 +1,5 @@
 import sys
-
-if sys.version_info < (3, 5, 0):
-    import compat_enum as enum
-else:
-    import enum
+import enum
 
 
 class ParserType(enum.IntEnum):

diff --git a/bindings/python/classad2/_value.py b/bindings/python/classad2/_value.py
@@ -1,9 +1,5 @@
 import sys
-
-if sys.version_info < (3, 5, 0):
-    import compat_enum as enum
-else:
-    import enum
+import enum
 
 
 class Value(enum.IntEnum):

diff --git a/bindings/python/htcondor/_job_status.py b/bindings/python/htcondor/_job_status.py
@@ -1,9 +1,5 @@
 import sys
-
-if sys.version_info < (3, 5, 0):
-    import compat_enum as enum
-else:
-    import enum
+import enum
 
 
 class JobStatus(enum.IntEnum):

diff --git a/bindings/python/htcondor/compat_enum/LICENSE b/bindings/python/htcondor/compat_enum/LICENSE