Merge remote-tracking branch 'upstream/main'

Author: quaquel

mesa/visualization/UserParam.py renamed to mesa/experimental/UserParam.py

@@ -1,3 +1,5 @@
 from mesa.experimental import cell_space
 
-__all__ = ["cell_space"]
+from .solara_viz import JupyterViz, Slider, SolaraViz, make_text
+
+__all__ = ["cell_space", "JupyterViz", "SolaraViz", "make_text", "Slider"]

mesa/experimental/__init__.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

mesa/visualization/components/altair.py renamed to mesa/experimental/components/altair.py

@@ -1,3 +0,0 @@
-from .solara_viz import JupyterViz, Slider, SolaraViz, make_text
-
-__all__ = ["JupyterViz", "make_text", "Slider", "SolaraViz"]