From 9b727070824c1154eb9457bbb18e1c803078b27c Mon Sep 17 00:00:00 2001
From: Tom Bland <tom_bland@hotmail.co.uk>
Date: Mon, 22 Jul 2024 16:21:16 +0100
Subject: [PATCH 1/3] Fix issue with numpy clip, and pin to >2

---
 pyproject.toml  |  3 +--
 src/muse/mca.py | 21 +++++++--------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index b2edc923f..b6bf059cc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,7 +24,7 @@ classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)"
 ]
 dependencies = [
-    "numpy<2.0",
+    "numpy>=2.0",
     "scipy",
     "pandas",
     "xarray",
@@ -47,7 +47,6 @@ dev = [
     "nbconvert",
     "nbformat",
     "mypy",
-    "numpy>=1.17",
     "pytest-xdist",
     "bump2version",
     "pyinstaller",
diff --git a/src/muse/mca.py b/src/muse/mca.py
index 6ecea14d9..61202f4c7 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -372,7 +372,7 @@ def calibrate_legacy_sectors(self):
         from copy import deepcopy
         from logging import getLogger
 
-        from numpy import clip, where
+        from numpy import where
 
         hist_years = []
         if len([s for s in self.sectors if "LegacySector" in str(type(s))]) == 0:
@@ -405,12 +405,9 @@ def calibrate_legacy_sectors(self):
 
                 dims = {i: sector_market[i] for i in sector_market.consumption.dims}
 
-                sector_market.consumption.loc[dims] = clip(
-                    sector_market.consumption.loc[dims]
-                    - sector_market.supply.loc[dims],
-                    0.0,
-                    None,
-                )
+                sector_market.consumption.loc[dims] = (
+                    sector_market.consumption.loc[dims] - sector_market.supply.loc[dims]
+                ).clip(min=0.0, max=None)
                 new_market.consumption.loc[dims] += sector_market.consumption
 
                 dims = {i: sector_market[i] for i in sector_market.supply.dims}
@@ -450,8 +447,6 @@ def single_year_iteration(
     """
     from copy import deepcopy
 
-    from numpy import clip
-
     from muse.commodities import is_enduse
 
     sectors = deepcopy(sectors)
@@ -469,11 +464,9 @@ def single_year_iteration(
 
         dims = {i: sector_market[i] for i in sector_market.consumption.dims}
 
-        sector_market.consumption.loc[dims] = clip(
-            sector_market.consumption.loc[dims] - sector_market.supply.loc[dims],
-            0.0,
-            None,
-        )
+        sector_market.consumption.loc[dims] = (
+            sector_market.consumption.loc[dims] - sector_market.supply.loc[dims]
+        ).clip(min=0.0, max=None)
 
         market.consumption.loc[dims] += sector_market.consumption
 

From 3a71143962f6d065052d92931dc4e630a0499112 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Wed, 24 Jul 2024 02:57:07 +0100
Subject: [PATCH 2/3] debugging the numpy 2 related error in `pytest
 tests/test_carbon_budget.py::test_refine_new_price`.

---
 tests/test_carbon_budget.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test_carbon_budget.py b/tests/test_carbon_budget.py
index 8b1f9cff7..6472d764c 100644
--- a/tests/test_carbon_budget.py
+++ b/tests/test_carbon_budget.py
@@ -155,7 +155,10 @@ def test_refine_new_price(market):
     price = market.prices.sel(year=future, commodity=commodities).mean(
         ["region", "commodity"]
     )
-    sample = np.linspace(price, 4 * price, 4)
+
+    # ensure price is a scalar before using it in np.linspace
+    price_value = price.item() if isinstance(price, xr.DataArray) else price
+    sample = np.linspace(price_value, 4 * price_value, 4)
 
     carbon_price = market.prices.sel(
         year=market.year < future, commodity=commodities

From 464ef695c5b3b5a4e85a3cf2c963376034847ff6 Mon Sep 17 00:00:00 2001
From: HarmonicReflux <Benjamin.Johannes.Scharpf@outlook.com>
Date: Wed, 24 Jul 2024 03:06:02 +0100
Subject: [PATCH 3/3] =?UTF-8?q?Try=20to=20fix=20error=20related=20to=20```?=
 =?UTF-8?q?=20@pre-commit-ci=20pre-commit.ci=20-=20pr=20=E2=80=94=20error?=
 =?UTF-8?q?=20during=20mergeable=20check=20```?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualise-min-service.ipynb                   | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
index fb9ead46f..688e71b94 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/visualise-min-service.ipynb
@@ -83,26 +83,11 @@
    "outputs": [],
    "source": [
     "grouped_by = frame.groupby([\"year\", \"technology\", \"region\"]).sum().reset_index()\n",
-    "grouped_by\n",
     "\n",
     "g = sns.FacetGrid(data=grouped_by, row=\"region\")\n",
     "g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
     "g.add_legend()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {