fixed relative imports

nwlandry · May 2, 2022 · d39e9e4 · d39e9e4
1 parent 3d31afe
commit d39e9e4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/hypercontagion/__init__.py b/hypercontagion/__init__.py
@@ -1,4 +1,6 @@
-import hypercontagion.simulation
+import pkg_resources
+
+from hypercontagion import simulation
 from hypercontagion.simulation import *
-import hypercontagion.classes
-from hypercontagion.classes import *
+
+__version__ = pkg_resources.require("hypercontagion")[0].version
diff --git a/hypercontagion/simulation/__init__.py b/hypercontagion/simulation/__init__.py
@@ -1,5 +1,4 @@
-from .epidemics import *
+from hypercontagion.simulation import epidemics, functions, opinions, utilities
 from .opinions import *
 from .functions import *
 from .utilities import *
-from hypercontagion.simulation import utilities
diff --git a/tests/simulation/test_functions.py b/tests/simulation/test_functions.py
@@ -1,4 +1,4 @@
-from hypercontagion.simulation.functions import collective_contagion, individual_contagion, threshold, majority_vote, size_dependent
+from hypercontagion import collective_contagion, individual_contagion, threshold, majority_vote, size_dependent
 
 
 def test_collective_contagion(func_args_1, func_args_2, func_args_3, func_args_4, func_args_5):