Revert "thing"

This reverts commit b9d3559.

mesa/__init__.py

@@ -8,13 +8,18 @@
 import mesa.space as space
 import mesa.time as time
 from mesa.agent import Agent
+from mesa.batchrunner import batch_run
+from mesa.datacollection import DataCollector
 from mesa.model import Model
 
 __all__ = [
     "Model",
     "Agent",
     "time",
     "space",
+    "DataCollector",
+    "batch_run",
+    "experimental",
 ]
 
 __title__ = "mesa"

tests/test_batch_run.py

@@ -1,7 +1,8 @@
 """Test Batchrunner."""
 
+import mesa
 from mesa.agent import Agent
-from mesa.batchrunner import _make_model_kwargs, batch_run
+from mesa.batchrunner import _make_model_kwargs
 from mesa.datacollection import DataCollector
 from mesa.model import Model
 from mesa.time import BaseScheduler
@@ -102,7 +103,7 @@ def step(self):  # noqa: D102
 
 
 def test_batch_run():  # noqa: D103
-    result = batch_run(MockModel, {}, number_processes=2)
+    result = mesa.batch_run(MockModel, {}, number_processes=2)
     assert result == [
         {
             "RunId": 0,
@@ -135,7 +136,7 @@ def test_batch_run():  # noqa: D103
 
 
 def test_batch_run_with_params():  # noqa: D103
-    batch_run(
+    mesa.batch_run(
         MockModel,
         {
             "variable_model_params": range(3),
@@ -146,7 +147,9 @@ def test_batch_run_with_params():  # noqa: D103
 
 
 def test_batch_run_no_agent_reporters():  # noqa: D103
-    result = batch_run(MockModel, {"enable_agent_reporters": False}, number_processes=2)
+    result = mesa.batch_run(
+        MockModel, {"enable_agent_reporters": False}, number_processes=2
+    )
     print(result)
     assert result == [
         {
@@ -160,11 +163,11 @@ def test_batch_run_no_agent_reporters():  # noqa: D103
 
 
 def test_batch_run_single_core():  # noqa: D103
-    batch_run(MockModel, {}, number_processes=1, iterations=6)
+    mesa.batch_run(MockModel, {}, number_processes=1, iterations=6)
 
 
 def test_batch_run_unhashable_param():  # noqa: D103
-    result = batch_run(
+    result = mesa.batch_run(
         MockModel,
         {
             "n_agents": 2,

tests/test_import_namespace.py

@@ -0,0 +1,28 @@
+"""Test if namespsaces importing work better."""
+
+
+def test_import():
+    """This tests the new, simpler Mesa namespace.
+
+    See https://github.com/projectmesa/mesa/pull/1294.
+    """
+    import mesa
+    from mesa.time import RandomActivation
+
+    _ = mesa.time.RandomActivation
+    _ = RandomActivation
+
+    from mesa.space import MultiGrid
+
+    _ = mesa.space.MultiGrid
+    _ = MultiGrid
+
+    from mesa.datacollection import DataCollector
+
+    _ = DataCollector
+    _ = mesa.DataCollector
+
+    from mesa.batchrunner import batch_run
+
+    _ = batch_run
+    _ = mesa.batch_run