Add comp args

.github/workflows/build.yml

@@ -26,7 +26,6 @@ jobs:
         python-is-python3
         python3-biopython
         python3-dev
-        python3-distutils
         python3-numpy
         python3-pil
         python3-pytest

CMakeLists.txt

@@ -10,6 +10,8 @@ add_library(${TARGET_NAME} SHARED
 if (MSVC)
     target_compile_options(${TARGET_NAME} PRIVATE "/MP")
     set_target_properties(${TARGET_NAME} PROPERTIES SUFFIX ".pyd")
+else()
+    target_compile_options(${TARGET_NAME} PRIVATE ${ALL_COMP_ARGS})
 endif()
 
 target_compile_features(${TARGET_NAME} PRIVATE cxx_std_17)

create_shadertext.py

@@ -7,7 +7,6 @@
 from collections import defaultdict
 from os.path import dirname
 from subprocess import Popen, PIPE
-from distutils import dir_util
 
 def create_all(generated_dir, pymoldir="."):
     '''
@@ -30,7 +29,7 @@ def __init__(self, filename):
             self.out = cStringIO.StringIO()
             self.filename = filename
         else:
-            dir_util.mkpath(os.path.dirname(filename))
+            os.makedirs(os.path.dirname(filename), exist_ok=True)
             self.out = open(filename, "w")
             self.filename = None
     def close(self):

modules/pymol/plugins/installation.py

@@ -45,8 +45,6 @@ def cmp_version(v1, v2):
     '''
     Compares two version strings. An empty version string is always considered
     smaller than a non-empty version string.
-
-    Uses distutils.version.StrictVersion to evaluate non-empty version strings.
     '''
     if v1 == v2:
         return 0
@@ -55,8 +53,9 @@ def cmp_version(v1, v2):
     if v2 == '':
         return 1
     try:
-        from distutils.version import StrictVersion as Version
-        return cmp(Version(v1), Version(v2))
+        v1_parts = list(map(int, v1.split('.')))
+        v2_parts = list(map(int, v2.split('.')))
+        return (v1_parts > v2_parts) - (v1_parts < v2_parts)
     except:
         print(' Warning: Version parsing failed for', v1, 'and/or', v2)
         return 0