From cfa6234ec5edbad0c3e669352532ff5e0611ce75 Mon Sep 17 00:00:00 2001
From: Ewout ter Hoeven <E.M.terHoeven@student.tudelft.nl>
Date: Thu, 26 Sep 2024 13:29:22 +0200
Subject: [PATCH] Make data and batch core dependencies

---
 README.md      | 11 +++++++++++
 pyproject.toml | 13 ++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index d7dd0faf206..062dd44500e 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,17 @@ To install our latest pre-release (3.0.0 alpha), run:
 ``` bash
 pip install -U --pre mesa
 ```
+With Mesa 3.0, we don't install all our dependencies anymore by default.
+```bash
+# You can customize the additional dependencies you need, if you want. Available are:
+pip install -U --pre mesa[network,viz]
+
+# This is equivalent to our recommended dependencies:
+pip install -U --pre mesa[rec]
+
+# To install all, including developer, dependencies:
+pip install -U --pre mesa[all]
+```
 
 You can also use `pip` to install the latest GitHub version:
 
diff --git a/pyproject.toml b/pyproject.toml
index 6b929a02746..c1256833966 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -37,13 +37,15 @@ classifiers = [
 readme = "README.md"
 dependencies = [
   "numpy",
+  "pandas",
+  "tqdm",
 ]
 dynamic = ["version"]
 
 [project.optional-dependencies]
 # User collections
-rec = ["mesa[network,viz,data,batch]"]
-all = ["mesa[network,viz,data,batch,dev,examples,docs]"]
+rec = ["mesa[network,viz]"]
+all = ["mesa[network,viz,dev,examples,docs]"]
 # Core dependencies
 network = [
   "networkx",
@@ -52,12 +54,6 @@ viz = [
   "matplotlib",
   "solara",
 ]
-data = [
-  "pandas",
-]
-batch = [
-  "tqdm",
-]
 # Dev and CI stuff
 dev = [
   "mesa[rec]",
@@ -73,7 +69,6 @@ examples = [
   "scipy",
 ]
 docs = [
-  "tqdm",
   "sphinx",
   "ipython",
   "pydata_sphinx_theme",