Update windows action runner and python support

- Updated windows action runner to 2022
- Revised cmake args to use VS 2022
- Update cmake to 3.21 for VS 2022 generator support
- Deprecate Python 3.6 by removing from build and test scripts
- Add Python 3.10 support by adding to build and test scripts
- Update numpy to 1.21.5 for Python 3.10 support
- Update pytest to 7.1.1 for Python 3.10 support

Author: karosc

.github/workflows/python-package.yml

@@ -71,10 +71,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2016, macos-10.15]
-        py: [3.6, 3.7, 3.8, 3.9]
+        os: [windows-2022, macos-10.15]
+        py: ["3.7", "3.8", "3.9", "3.10"]
         include:
-          - os: windows-2016
+          - os: windows-2022
             sys_pkgs: choco install swig
             activate: ./build-env/Scripts/activate
 

swmm-toolkit/build-requirements.txt

@@ -4,4 +4,4 @@
 setuptools==41.4.0
 wheel==0.33.6
 scikit-build==0.11.1
-cmake==3.18.4
+cmake==3.21

swmm-toolkit/setup.py

@@ -65,7 +65,7 @@ def run(self):
 
 # Set Platform specific cmake args here
 if platform_system == "Windows":
-    cmake_args = ["-GVisual Studio 15 2017 Win64"]
+    cmake_args = ["-GVisual Studio 17 2022","-Ax64"]
 
 elif platform_system == "Darwin":
     cmake_args = ["-GNinja","-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.9"]
@@ -116,10 +116,10 @@ def exclude_files(cmake_manifest):
         "Operating System :: POSIX :: Linux",
         "Operating System :: MacOS",
         "License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: C",
         "Development Status :: 4 - Beta",
     ]

swmm-toolkit/test-requirements.txt

@@ -1,6 +1,6 @@
 
 
 
-pytest==6.1.1
-numpy==1.17.2
+pytest==7.1.1
+numpy==1.21.5
 aenum==2.2.6

swmm-toolkit/tools/build-wheels.sh

@@ -21,7 +21,7 @@ mkdir -p ./dist
 cd swmm-toolkit
 
 # Build wheels
-for PYBIN in /opt/python/cp{36,37,38,39}*/bin; do
+for PYBIN in /opt/python/cp{37,38,39,310}*/bin; do
     # Setup python virtual environment for build
     ${PYBIN}/python -m venv --clear ./build-env
     source ./build-env/bin/activate
@@ -52,7 +52,7 @@ done
 
 
 # Install packages and test
-for PYBIN in /opt/python/cp{36,37,38,39}*/bin; do
+for PYBIN in /opt/python/cp{37,38,39,310}*/bin; do
     # Setup python virtual environment for test
     ${PYBIN}/python -m venv --clear ./test-env
     source ./test-env/bin/activate