From 0f3fe748b6e32f7e5d7212a74c63cfc4416629e6 Mon Sep 17 00:00:00 2001 From: rht Date: Wed, 3 Jul 2024 06:42:50 -0400 Subject: [PATCH] Remove mesa.flat namespace (#2091) This doesn't seem to be used as often as the current simple namespace. --- mesa/flat/__init__.py | 6 ------ mesa/flat/visualization.py | 5 ----- tests/test_import_namespace.py | 5 ----- 3 files changed, 16 deletions(-) delete mode 100644 mesa/flat/__init__.py delete mode 100644 mesa/flat/visualization.py diff --git a/mesa/flat/__init__.py b/mesa/flat/__init__.py deleted file mode 100644 index 728d82734bc..00000000000 --- a/mesa/flat/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -from mesa import * # noqa -from mesa.time import * # noqa -from mesa.space import * # noqa -from mesa.datacollection import * # noqa -from .visualization import * # noqa -from mesa.batchrunner import batch_run # noqa diff --git a/mesa/flat/visualization.py b/mesa/flat/visualization.py deleted file mode 100644 index 2eb7b802c5e..00000000000 --- a/mesa/flat/visualization.py +++ /dev/null @@ -1,5 +0,0 @@ -# This collects all of Mesa visualization components under a flat namespace. -from mesa_viz_tornado.ModularVisualization import * # noqa -from mesa_viz_tornado.modules import * # noqa -from mesa_viz_tornado.UserParam import * # noqa -from mesa_viz_tornado.TextVisualization import * # noqa diff --git a/tests/test_import_namespace.py b/tests/test_import_namespace.py index 20a06f3368d..6a001319f24 100644 --- a/tests/test_import_namespace.py +++ b/tests/test_import_namespace.py @@ -2,30 +2,25 @@ def test_import(): # This tests the new, simpler Mesa namespace. See # https://github.com/projectmesa/mesa/pull/1294. import mesa - import mesa.flat as mf from mesa.time import RandomActivation _ = mesa.time.RandomActivation _ = RandomActivation - _ = mf.RandomActivation from mesa.space import MultiGrid _ = mesa.space.MultiGrid _ = MultiGrid - _ = mf.MultiGrid from mesa.visualization_old.ModularVisualization import ModularServer _ = mesa.visualization_old.ModularServer _ = ModularServer - _ = mf.ModularServer from mesa.datacollection import DataCollector _ = DataCollector _ = mesa.DataCollector - _ = mf.DataCollector from mesa.batchrunner import batch_run