Merge pull request #128 from pyswmm/py312_support

Adding PY3.12 Support to build
pyswmm · Nov 27, 2023 · d0fc532 · d0fc532
2 parents 391c66d + 6b2f745
commit d0fc532
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
@@ -47,7 +47,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-2022, macos-12]
-        pyver: [cp38, cp39, cp310, cp311]
+        pyver: [cp38, cp39, cp310, cp311, cp312]
 
     steps:
       - name: Checkout repo
@@ -64,14 +64,14 @@ jobs:
           CIBW_BEFORE_TEST: pip install -r {package}/test-requirements.txt
           # mac needs ninja to build
           CIBW_BEFORE_BUILD_MACOS: brew install ninja
-          # configure cibuildwheel to build native archs ('auto'), and some emulated ones      
+          # configure cibuildwheel to build native archs ('auto'), and some emulated ones
           CIBW_ARCHS_LINUX: x86_64
           CIBW_ARCHS_WINDOWS: AMD64
           CIBW_ARCHS_MACOS: x86_64
           # only build current supported python: https://devguide.python.org/versions/
           # don't build pypy or musllinux to save build time. TODO: find a good way to support those archs
           CIBW_BUILD: ${{matrix.pyver}}-*
-          CIBW_SKIP: cp36-* cp37-* cp312-* pp* *-musllinux*
+          CIBW_SKIP: cp36-* cp37-* pp* *-musllinux*
           # Will avoid testing on emulated architectures
           # Skip trying to test arm64 builds on Intel Macs
           CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *-macosx_arm64 *-macosx_universal2:arm64"
@@ -87,7 +87,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest,macos-12]
-        pyver: [cp38, cp39, cp310, cp311]
+        pyver: [cp38, cp39, cp310, cp311, cp312]
 
     steps:
       - name: Checkout repo
@@ -106,15 +106,15 @@ jobs:
         with:
           package-dir: ./swmm-toolkit
         env:
-          # configure cibuildwheel to build native archs ('auto'), and some emulated ones      
+          # configure cibuildwheel to build native archs ('auto'), and some emulated ones
           CIBW_ARCHS_LINUX: aarch64
-          CIBW_ARCHS_MACOS: arm64  
+          CIBW_ARCHS_MACOS: arm64
           # only build current supported python: https://devguide.python.org/versions/
           # don't build pypy or musllinux to save build time. TODO: find a good way to support those archs
           CIBW_BUILD: ${{matrix.pyver}}-*
-          CIBW_SKIP: cp36-* cp37-* cp312-* pp* *-musllinux*
+          CIBW_SKIP: cp36-* cp37-* pp* *-musllinux*
           CIBW_BUILD_VERBOSITY: 1
 
       - uses: actions/upload-artifact@v3
         with:
-          path: ./wheelhouse/*.whl
+          path: ./wheelhouse/*.whl
diff --git a/swmm-toolkit/setup.py b/swmm-toolkit/setup.py
@@ -124,10 +124,10 @@ def exclude_files(cmake_manifest):
     cmake_args = cmake_args,
     cmake_process_manifest_hook = exclude_files,
 
-    description='OWA SWMM Python Toolkit',
+    description='PySWMM SWMM Python Toolkit',
     long_description=long_description,
     long_description_content_type='text/markdown',
-    url='https://github.com/OpenWaterAnalytics/swmm-python',
+    url='https://github.com/pyswmm/swmm-python',
 
     author='See AUTHORS',
     maintainer_email='[email protected]',
@@ -145,7 +145,8 @@ def exclude_files(cmake_manifest):
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Programming Language :: C",
         "Development Status :: 5 - Production/Stable",
     ]
-)
+)