Merge pull request #69 from UW-Hydro/develop

Merge for conda forge
UW-Hydro · Jun 17, 2021 · 5226ca7 · 5226ca7
2 parents f0ed356 + 80067af
commit 5226ca7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/bmorph/__init__.py b/bmorph/__init__.py
@@ -1,6 +1,6 @@
-from .core.bmorph import bmorph, bmorph_correct, edcdfm, cqm
+from .core.bmorph import * #bmorph, bmorph_correct, edcdfm, cqm
 from .version import version, short_version
-from .evaluation import evaluation, constants, plotting, simple_river_network, descriptive_statistics
+#from .evaluation import evaluation, constants, plotting, simple_river_network, descriptive_statistics
 import bmorph.core.local_flows as local_flows
 import bmorph.core.models as models
 import bmorph.core.workflows as workflows
diff --git a/bmorph/evaluation/evaluation.py b/bmorph/evaluation/evaluation.py
@@ -1 +1,6 @@
 # Placeholder evaluation module
+import constants
+import descriptive_statistics
+import evaluation
+import plotting
+import simple_river_network