From 702b75ec6e097e9fb89310a786de64f288033813 Mon Sep 17 00:00:00 2001 From: vhess Date: Wed, 4 Sep 2024 12:06:27 +0200 Subject: [PATCH 1/2] move solara_viz back to experimental --- mesa/{visualization => experimental}/UserParam.py | 0 mesa/experimental/__init__.py | 3 ++- mesa/{visualization => experimental}/components/altair.py | 0 .../components/matplotlib.py | 0 mesa/{visualization => experimental}/solara_viz.py | 6 +++--- mesa/visualization/__init__.py | 3 --- 6 files changed, 5 insertions(+), 7 deletions(-) rename mesa/{visualization => experimental}/UserParam.py (100%) rename mesa/{visualization => experimental}/components/altair.py (100%) rename mesa/{visualization => experimental}/components/matplotlib.py (100%) rename mesa/{visualization => experimental}/solara_viz.py (98%) diff --git a/mesa/visualization/UserParam.py b/mesa/experimental/UserParam.py similarity index 100% rename from mesa/visualization/UserParam.py rename to mesa/experimental/UserParam.py diff --git a/mesa/experimental/__init__.py b/mesa/experimental/__init__.py index e37cdb042e3..a6081646143 100644 --- a/mesa/experimental/__init__.py +++ b/mesa/experimental/__init__.py @@ -1,3 +1,4 @@ from mesa.experimental import cell_space +from .solara_viz import JupyterViz, SolaraViz, make_text, Slider -__all__ = ["cell_space"] +__all__ = ["cell_space", "JupyterViz", "SolaraViz", "make_text", "Slider"] diff --git a/mesa/visualization/components/altair.py b/mesa/experimental/components/altair.py similarity index 100% rename from mesa/visualization/components/altair.py rename to mesa/experimental/components/altair.py diff --git a/mesa/visualization/components/matplotlib.py b/mesa/experimental/components/matplotlib.py similarity index 100% rename from mesa/visualization/components/matplotlib.py rename to mesa/experimental/components/matplotlib.py diff --git a/mesa/visualization/solara_viz.py b/mesa/experimental/solara_viz.py similarity index 98% rename from mesa/visualization/solara_viz.py rename to mesa/experimental/solara_viz.py index eb05ff8ec0a..28f3a3c66b2 100644 --- a/mesa/visualization/solara_viz.py +++ b/mesa/experimental/solara_viz.py @@ -29,9 +29,9 @@ import solara from solara.alias import rv -import mesa.visualization.components.altair as components_altair -import mesa.visualization.components.matplotlib as components_matplotlib -from mesa.visualization.UserParam import Slider +import mesa.experimental.components.altair as components_altair +import mesa.experimental.components.matplotlib as components_matplotlib +from mesa.experimental.UserParam import Slider # TODO: Turn this function into a Solara component once the current_step.value diff --git a/mesa/visualization/__init__.py b/mesa/visualization/__init__.py index 76be748f1f8..e69de29bb2d 100644 --- a/mesa/visualization/__init__.py +++ b/mesa/visualization/__init__.py @@ -1,3 +0,0 @@ -from .solara_viz import JupyterViz, Slider, SolaraViz, make_text - -__all__ = ["JupyterViz", "make_text", "Slider", "SolaraViz"] From 3dce82252a05b0066b83a71fb1fb95f18ebd2d59 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 10:12:42 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- mesa/experimental/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mesa/experimental/__init__.py b/mesa/experimental/__init__.py index a6081646143..753b4bd7985 100644 --- a/mesa/experimental/__init__.py +++ b/mesa/experimental/__init__.py @@ -1,4 +1,5 @@ from mesa.experimental import cell_space -from .solara_viz import JupyterViz, SolaraViz, make_text, Slider + +from .solara_viz import JupyterViz, Slider, SolaraViz, make_text __all__ = ["cell_space", "JupyterViz", "SolaraViz", "make_text", "Slider"]