Repository: pyswmm/swmm-python (language: python)

Issue:
Updates maintainer, and aenum



Discussion / hints:

Fix patch:
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 470bdfd6..14d41f8f 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -9,7 +9,7 @@ env:
 jobs:
   build_nrtest_plugin:
     name: Build nrtest-swmm plugin
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: ./nrtest-swmm
@@ -33,11 +33,48 @@ jobs:
         with:
           path: nrtest-swmm/dist/*.whl
 
+  test_conda_build:
+    name: Conda wheel test mac
+    runs-on: macos-latest
+    defaults:
+      run:
+        shell: bash -l {0}
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          auto-update-conda: true
+          channels: conda-forge
+          # Python 3.9 does not support all libs we need in swmm-python
+          python-version: 3.8
+
+      - name: Install required system packages
+        run: brew install swig ninja
+
+      - name: Install requirements
+        run: |
+          cd swmm-toolkit
+          conda activate test
+          conda install --yes --file build-requirements.txt
+          python setup.py bdist_wheel
+
+      - name: Test wheel
+        run: |
+          cd swmm-toolkit
+          conda activate test
+          conda install --yes --file test-requirements.txt
+          python -m pip install --no-index --find-links=./dist swmm_toolkit --user
+          pytest
 
 
   build_linux_wheels:
     name: Build wheels on linux
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repo
@@ -113,4 +150,4 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
-          path: swmm-toolkit/dist/*.whl
+          path: swmm-toolkit/dist/*.whl
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index e4bb4b8c..f827f1c0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "swmm-toolkit/swmm-solver"]
     path = swmm-toolkit/swmm-solver
     url = https://github.com/OpenWaterAnalytics/Stormwater-Management-Model.git
-	branch = develop
+	branch = master
diff --git a/swmm-toolkit/setup.py b/swmm-toolkit/setup.py
index 21b72ca6..f821ceb1 100644
--- a/swmm-toolkit/setup.py
+++ b/swmm-toolkit/setup.py
@@ -94,7 +94,7 @@ def exclude_files(cmake_manifest):
     package_dir = package_dir,
 
     zip_safe = False,
-    install_requires = ["aenum==2.2.6"],
+    install_requires = ["aenum==3.1.11"],
 
     cmdclass = {"clean": CleanCommand},
     cmake_args = cmake_args,
@@ -106,10 +106,10 @@ def exclude_files(cmake_manifest):
     url='https://github.com/OpenWaterAnalytics/swmm-python',
 
     author='See AUTHORS',
-    maintainer_email='tryby.michael@epa.gov',
+    maintainer_email='bemcdonnell@gmail.com',
     license='CC0',
 
-    keywords="swmm5, swmm, stormwater, hydraulics, hydrology, ",
+    keywords="swmm5, swmm, stormwater, hydraulics, hydrology",
     classifiers=[
         "Topic :: Scientific/Engineering",
         "Operating System :: Microsoft :: Windows",
@@ -121,6 +121,6 @@ def exclude_files(cmake_manifest):
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: C",
-        "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",
     ]
 )
diff --git a/swmm-toolkit/src/swmm/toolkit/__init__.py b/swmm-toolkit/src/swmm/toolkit/__init__.py
index d285fb39..b1aab68a 100644
--- a/swmm-toolkit/src/swmm/toolkit/__init__.py
+++ b/swmm-toolkit/src/swmm/toolkit/__init__.py
@@ -4,14 +4,14 @@
 #  __init__.py - SWMM toolkit package
 #
 #  Created:    Aug 9, 2018
-#  Updated:    May 19, 2021
+#  Updated:    July 2, 2022
 #
 #  Author:     See AUTHORS
 #
 
-'''
+"""
 A low level pythonic API for the swmm-output and swmm-solver dlls using SWIG.
-'''
+"""
 
 
 __author__ = "See AUTHORS"
@@ -37,8 +37,9 @@
     libdir = os.path.join(os.path.dirname(__file__), "../../swmm_toolkit")
 
     if hasattr(os, 'add_dll_directory'):
-       if 'conda' in sys.version:
-           os.environ['CONDA_DLL_SEARCH_MODIFICATION_ENABLE']="1"
-       os.add_dll_directory(libdir)
+        conda_exists = os.path.exists(os.path.join(sys.prefix, 'conda-meta'))
+        if conda_exists:
+            os.environ['CONDA_DLL_SEARCH_MODIFICATION_ENABLE'] = "1"
+        os.add_dll_directory(libdir)
     else:
         os.environ["PATH"] = libdir + ";" + os.environ["PATH"]
diff --git a/swmm-toolkit/swmm-solver b/swmm-toolkit/swmm-solver
index 6d6b5272..7e7e6da7 160000
--- a/swmm-toolkit/swmm-solver
+++ b/swmm-toolkit/swmm-solver
@@ -1,1 +1,1 @@
-Subproject commit 6d6b5272250acaa3939db9e265f0e593dc96e43e
+Subproject commit 7e7e6da799e4c8f1fd51499cebe47f82f80c67f6


Test patch:
diff --git a/swmm-toolkit/test-requirements.txt b/swmm-toolkit/test-requirements.txt
index 80ca5603..c6c0ef8d 100644
--- a/swmm-toolkit/test-requirements.txt
+++ b/swmm-toolkit/test-requirements.txt
@@ -3,4 +3,4 @@
 
 pytest==7.1.1
 numpy==1.21.5
-aenum==2.2.6
+aenum==3.1.11