setup.py: cosmetic clean-up

Author: crusaderky

.gitignore

@@ -17,6 +17,7 @@ dist/
 .pytest_cache
 blis.egg-info/
 tmp/
+z/
 
 # Blis stuff
 blis/include

setup.py

@@ -61,38 +61,34 @@ def find_in_path(name, path):
     return None
 
 
-# By subclassing build_extensions we have the actual compiler that will be used
-# which is really known only after finalize_options
-# http://stackoverflow.com/questions/724664/python-distutils-how-to-get-a-compiler-that-is-going-to-be-used
-class build_ext_options:
-    def build_options(self):
+class ExtensionBuilder(build_ext):
+    # By overriding build_extensions we have the actual compiler that will be used
+    # which is really known only after finalize_options
+    # http://stackoverflow.com/questions/724664/python-distutils-how-to-get-a-compiler-that-is-going-to-be-used
+    def build_extensions(self):
         if hasattr(self.compiler, "initialize"):
             self.compiler.initialize()
         self.compiler.platform = sys.platform[:6]
-        print("Build options", self.compiler.platform, self.compiler.compiler_type)
-
-        self.compiler.include_dirs = [numpy.get_include()] + self.compiler.include_dirs
+        self.compiler.include_dirs.append(numpy.get_include())
 
         if self.compiler.compiler_type == "msvc":
-            include_dirs = list(self.compiler.include_dirs)
-            library_dirs = list(self.compiler.library_dirs)
+            # Replace msvc compiler with unix compiler
+            include_dirs = self.compiler.include_dirs[:]
+            library_dirs = self.compiler.library_dirs[:]
+            llvm_path = locate_windows_llvm()
+
             self.compiler = new_compiler(plat="nt", compiler="unix")
             self.compiler.platform = "nt"
             self.compiler.compiler_type = "msvc"
-            self.compiler.compiler = [locate_windows_llvm()]
-            self.compiler.compiler_so = list(self.compiler.compiler)
-            self.compiler.preprocessor = list(self.compiler.compiler)
-            self.compiler.linker = list(self.compiler.compiler) + ["-shared"]
-            self.compiler.linker_so = list(self.compiler.linker)
-            self.compiler.linker_exe = list(self.compiler.linker)
+            self.compiler.compiler = [llvm_path]
+            self.compiler.compiler_so = [llvm_path]
+            self.compiler.preprocessor = [llvm_path]
+            self.compiler.linker_so = [llvm_path, "-shared"]
+            self.compiler.linker_exe = [llvm_path, "-shared"]
             self.compiler.archiver = ["llvm-ar"]
-            self.compiler.library_dirs.extend(library_dirs)
+            self.compiler.library_dirs = library_dirs
             self.compiler.include_dirs = include_dirs
 
-
-class ExtensionBuilder(build_ext, build_ext_options):
-    def build_extensions(self):
-        build_ext_options.build_options(self)
         if sys.platform in ("msvc", "win32"):
             platform_name = "windows"
         elif sys.platform == "darwin":
@@ -122,7 +118,8 @@ def build_extensions(self):
                 os.path.join(INCLUDE, "%s-%s" % (platform_name, arch))
             )
             e.extra_objects = list(short_paths)
-        build_ext.build_extensions(self)
+
+        super().build_extensions()
         shutil.rmtree(short_dir)
 
     def get_arch_name(self, platform_name):
@@ -326,6 +323,7 @@ def chdir(new_dir):
         "License :: OSI Approved :: BSD License",
         "Operating System :: POSIX :: Linux",
         "Operating System :: MacOS :: MacOS X",
+        "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",