Fix more future warnings

Author: tsmbland

src/muse/readers/csv.py

@@ -679,7 +679,7 @@ def process_technologies(
         )
 
     # Merge inputs/outputs with technodata
-    technodata = technodata.merge(outs).merge(ins)
+    technodata = technodata.merge(outs, join="outer").merge(ins, join="outer")
 
     # Merge technodata_timeslices if provided. This will prioritise values defined in
     # technodata_timeslices, and fallback to the non-timesliced technodata for any
@@ -700,7 +700,9 @@ def process_technologies(
     technodata = check_commodities(technodata, fill_missing=False)
 
     # Add info about commodities
-    technodata = technodata.merge(COMMODITIES.sel(commodity=technodata.commodity))
+    technodata = technodata.merge(
+        COMMODITIES.sel(commodity=technodata.commodity), join="outer"
+    )
 
     # Add commodity usage flags
     technodata["comm_usage"] = (

src/muse/readers/toml.py

@@ -624,7 +624,7 @@ def read_technodata(
         # Drop duplicate data vars before merging
         common_vars = set(technologies.data_vars) & set(trade_data.data_vars)
         technologies = technologies.drop_vars(common_vars)
-        technologies = technologies.merge(trade_data)
+        technologies = technologies.merge(trade_data, join="outer")
 
     technologies = technologies.set_index(commodity="commodity")  # See PR #638
     return technologies

src/muse/utilities.py

@@ -151,7 +151,12 @@ def operation(x):
     # Concatenate assets if a sequence is given
     if not isinstance(assets, (xr.Dataset, xr.DataArray)):
         assets = xr.concat(
-            assets, dim=dim, join="outer", coords="different", compat="equals"
+            assets,
+            dim=dim,
+            join="outer",
+            coords="different",
+            compat="equals",
+            data_vars="all",
         )
     assert isinstance(assets, (xr.Dataset, xr.DataArray))
 
@@ -372,7 +377,14 @@ def merge_assets(
         capa_b_interp = interpolate_capacity(capa_b, year=years)
 
     # Concatenate the two capacity arrays
-    result = xr.concat((capa_a_interp, capa_b_interp), dim=dimension, join="outer")
+    result = xr.concat(
+        (capa_a_interp, capa_b_interp),
+        dim=dimension,
+        join="outer",
+        coords="different",
+        compat="equals",
+        data_vars="all",
+    )
 
     #
     forgroup = result.pipe(coords_to_multiindex, dimension=dimension)

tests/test_demand_share.py

@@ -98,7 +98,14 @@ def create_regional_market(technologies, stock):
     usa_market = _matching_market(
         broadcast_over_assets(technologies, usa_stock), usa_stock.capacity
     )
-    market = xr.concat((asia_market, usa_market), dim="region", join="outer")
+    market = xr.concat(
+        (asia_market, usa_market),
+        dim="region",
+        join="outer",
+        coords="different",
+        compat="equals",
+        data_vars="all",
+    )
     return market, asia_stock, usa_stock