Skip to content

Commit 490014f

Browse files
committed
Fix mistakes from merge
1 parent 02d5b4b commit 490014f

3 files changed

Lines changed: 0 additions & 9 deletions

File tree

src/muse/__main__.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@ def patched_broadcast_compat_data(self, other):
8989
"`broadcast_timeslice` or `distribute_timeslice` (see `muse.timeslices`)."
9090
)
9191

92-
if (isinstance(other, Variable)) and {"technology", "asset"}.issubset(
93-
set(self.dims) | set(getattr(other, "dims", []))
94-
):
95-
raise ValueError()
96-
9792
# The rest of the function is copied directly from
9893
# xarray.core.variable._broadcast_compat_data
9994
if all(hasattr(other, attr) for attr in ["dims", "data", "shape", "encoding"]):

src/muse/utilities.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,6 @@ def broadcast_over_assets(
201201
example, it could also be used on a dataset of commodity prices to select prices
202202
relevant to each asset (e.g. if assets exist in multiple regions).
203203
204-
This function does not support arrays with a 'year' dimension. Please select
205-
data for a specific year before calling this function.
206-
207204
Arguments:
208205
data: The dataset/data-array to broadcast
209206
template: The dataset/data-array to use as a template

tests/test_outputs.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ def test_yearly_aggregate_no_outputs(tmpdir):
248248
assert len(outputs(None, year=2010)) == 0
249249

250250

251-
@mark.xfail
252251
def test_mca_aggregate_outputs(tmpdir):
253252
from toml import dump, load
254253

0 commit comments

Comments
 (0)