Merge pull request #80 from karosc/dev

This PR does the following: 
 - fixes call add_dll_directory() running in conda python
 - fixes nrtest-swmm import statements to use swmm-toolkit

Author: michaeltryby

nrtest-swmm/nrtest_swmm/output_reader.py

@@ -18,7 +18,7 @@
 from itertools import islice
 
 # project import
-from swmm.toolkit import output, output_enum
+from swmm.toolkit import output, shared_enum
 
 
 def output_generator(path_ref):
@@ -40,7 +40,7 @@ def output_generator(path_ref):
     with OutputReader(path_ref) as reader:
 
         for period_index in range(0, reader.report_periods()):
-            for element_type in islice(output_enum.ElementType, 4):
+            for element_type in islice(shared_enum.ElementType, 4):
                 for element_index in range(0, reader.element_count(element_type)):
 
                     yield (reader.element_result(element_type, period_index, element_index),
@@ -57,10 +57,10 @@ def __init__(self, filename):
         self.handle = None
         self.count = None
         self.get_element_result = {
-            output_enum.ElementType.SUBCATCH: output.get_subcatch_result,
-            output_enum.ElementType.NODE: output.get_node_result,
-            output_enum.ElementType.LINK: output.get_link_result,
-            output_enum.ElementType.SYSTEM: output.get_system_result
+            shared_enum.ElementType.SUBCATCH: output.get_subcatch_result,
+            shared_enum.ElementType.NODE: output.get_node_result,
+            shared_enum.ElementType.LINK: output.get_link_result,
+            shared_enum.ElementType.SYSTEM: output.get_system_result
         }
 
     def __enter__(self):
@@ -73,7 +73,7 @@ def __exit__(self, type, value, traceback):
         output.close(self.handle)
 
     def report_periods(self):
-        return output.get_times(self.handle, output_enum.Time.NUM_PERIODS)
+        return output.get_times(self.handle, shared_enum.Time.NUM_PERIODS)
 
     def element_count(self, element_type):
         return self.count[element_type]

swmm-toolkit/src/swmm/toolkit/__init__.py

@@ -29,13 +29,16 @@
 
 import os
 import platform
+import sys
 
 
 # Adds directory containing swmm libraries to path
 if platform.system() == "Windows":
     libdir = os.path.join(os.path.dirname(__file__), "../../swmm_toolkit")
 
     if hasattr(os, 'add_dll_directory'):
-        os.add_dll_directory(libdir)
+       if 'conda' in sys.version:
+           os.environ['CONDA_DLL_SEARCH_MODIFICATION_ENABLE']="1"
+       os.add_dll_directory(libdir)
     else:
         os.environ["PATH"] = libdir + ";" + os.environ["PATH"]