Update the python wheels build

Author: Eric Ehlers

ORE-SWIG/setup.py

@@ -5,15 +5,19 @@
 """
 
 import os, sys, math, codecs
-from distutils.cmd import Command
-from distutils.command.build_ext import build_ext
-from distutils.command.build import build
-from distutils.ccompiler import get_default_compiler
-try:
-    from setuptools import setup, Extension
-except:
+if sys.version_info < (3,10):
+    from distutils.cmd import Command
+    from distutils.command.build_ext import build_ext
+    from distutils.command.build import build
+    from distutils.ccompiler import get_default_compiler
     from distutils.core import setup, Extension
-from distutils import sysconfig
+    from distutils import sysconfig
+else:
+    from setuptools import Command
+    from setuptools.command.build_ext import build_ext
+    from setuptools.command.build import build
+    from setuptools._distutils.ccompiler import get_default_compiler
+    from setuptools import setup, Extension
 
 class test(Command):
     # Original version of this class posted
@@ -68,22 +72,13 @@ def run(self):
         qle_swig_dir = os.path.join("QuantExt-SWIG","SWIG")
         oredata_swig_dir = os.path.join("OREData-SWIG","SWIG")
         orea_swig_dir = os.path.join("OREAnalytics-SWIG","SWIG")
-        if sys.version_info.major >= 3:
-            os.system('swig -python -c++ ' +
-                      '-I%s ' % ql_swig_dir +
-                      '-I%s ' % qle_swig_dir +
-                      '-I%s ' % oredata_swig_dir +
-                      '-I%s ' % orea_swig_dir +
-                      '-o oreanalytics_wrap.cpp ' +
-                      os.path.join("OREAnalytics-SWIG","SWIG","oreanalytics.i"))
-        else:
-            os.system('swig -python -c++ ' +
-                      '-I%s ' % ql_swig_dir +
-                      '-I%s ' % qle_swig_dir +
-                      '-I%s ' % oredata_swig_dir +
-                      '-I%s ' % orea_swig_dir +
-                      '-o oreanalytics_wrap.cpp ' +
-                      os.path.join("OREAnalytics-SWIG","SWIG","oreanalytics.i"))
+        os.system('swig -python -c++ ' +
+                  '-I%s ' % ql_swig_dir +
+                  '-I%s ' % qle_swig_dir +
+                  '-I%s ' % oredata_swig_dir +
+                  '-I%s ' % orea_swig_dir +
+                  '-o oreanalytics_wrap.cpp ' +
+                  os.path.join("OREAnalytics-SWIG","SWIG","oreanalytics.i"))
 
 class my_build(build):
     user_options = build.user_options + [
@@ -264,13 +259,6 @@ def finalize_options(self):
 
 datafiles  = []
 
-# patch distutils if it can't cope with the "classifiers" or
-# "download_url" keywords
-if sys.version < '2.2.3':
-    from distutils.dist import DistributionMetadata
-    DistributionMetadata.classifiers = None
-    DistributionMetadata.download_url = None
-
 classifiers = [
     'Development Status :: 5 - Production/Stable',
     'Environment :: Console',

ORE-SWIG/tutorials.03.build_windows.md

@@ -48,11 +48,11 @@ its prerequisites, e.g:
     SET ZLIB_ROOT=C:\repos\vcpkg\packages\zlib_x64-windows (optional)
     SET ORE_DIR=C:\repos\ore
 
-# Build ORE and ORE-SWIG
+# Build ORE and ORESWIG
 
-There are two ways to build ORESWIG: using **cmake**, or using **setup.py**.
-With cmake, you can generate the wrapper.  With setup.py you can generate both
-the wrapper and the wheel. Regardless, ORE libraries must be built first.
+You can use **cmake** to build ORE and the ORESWIG wrapper.  You can use
+**setup.py** to build the ORESWIG wrapper and wheel.  If you use setup.py to
+build ORE-SWIG, you must first build ORE.
 
 ## Build ORE/ORESWIG via CMake
 
@@ -70,7 +70,7 @@ Make sure to add the location of the ORE-SWIG package to your PYTHONPATH, e.g:
 
     SET PYTHONPATH=%ORE_DIR%\build\ORE-SWIG;%ORE_DIR%\build\ORE-SWIG\Release
 
-## Build ORE/ORESWIG via setup.py
+## Build ORESWIG via setup.py
 
 If using the setup.py method, you would have to build ORE with cmake as
 demonstrated above, but, when configuring cmake, disable the SWIG build with:
@@ -84,6 +84,8 @@ we create a virtual environment into which we install the packages required by
 setup.py.
 
     cd %ORE_DIR%\ORE-SWIG
+    SET BOOST=C:\repos\boost\boost_1_72_0
+    SET BOOST_LIB64=C:\repos\boost\boost_1_72_0\lib64-msvc-14.2
     SET ORE_STATIC_RUNTIME=1
     SET ORE_USE_ZLIB=1
     SET PATH=%PATH%;C:\path\to\swig
@@ -116,9 +118,9 @@ not then `cube.dat` is generated as a flat (plain text) file.
 ## Build the wheel with setup.py
 
 Whether you used cmake or setup.py above to build the wrapper, you can use
-setup.py to build the wheel.  If you used setup.py then you already have the
-python virtual environment, and you can reuse it, otherwise you can create a
-new one as shown below.
+setup.py to build the wheel.  If you used setup.py before then you already have
+the python virtual environment, and you can reuse it, otherwise you can create
+a new one as shown below.
 
     cd %ORE_DIR%\ORE-SWIG
     SET BOOST=C:\repos\boost\boost_1_72_0