From 4df6370198be053b11b77644027afb267eb285c4 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 4 Dec 2023 14:39:23 +0100 Subject: [PATCH] update environment: matplotlib, xarray, pypsa --- envs/environment.yaml | 8 ++++---- rules/postprocess.smk | 1 - scripts/plot_summary.py | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/envs/environment.yaml b/envs/environment.yaml index 27de804b..646a71ea 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -11,7 +11,8 @@ dependencies: - pip - atlite>=0.2.9 -- linopy<=0.2.6 +- pypsa>=0.25.2 +- linopy - dask # Dependencies of the workflow itself @@ -28,14 +29,14 @@ dependencies: - numpy - pandas>=1.4 - geopandas>=0.11.0 -- xarray<=2023.8.0 +- xarray - rioxarray - netcdf4 - networkx - scipy - shapely>=2.0 - pyomo -- matplotlib<3.6 +- matplotlib - proj - fiona - country_converter @@ -57,4 +58,3 @@ dependencies: - pip: - tsam>=2.3.1 - - pypsa>=0.25.2 diff --git a/rules/postprocess.smk b/rules/postprocess.smk index c34fe27e..1ac4fec9 100644 --- a/rules/postprocess.smk +++ b/rules/postprocess.smk @@ -5,7 +5,6 @@ localrules: copy_config, - copy_conda_env, if config["foresight"] != "perfect": diff --git a/scripts/plot_summary.py b/scripts/plot_summary.py index 2651878a..5804e785 100644 --- a/scripts/plot_summary.py +++ b/scripts/plot_summary.py @@ -452,7 +452,6 @@ def plot_carbon_budget_distribution(input_eurostat): sns.set() sns.set_style("ticks") - plt.style.use("seaborn-ticks") plt.rcParams["xtick.direction"] = "in" plt.rcParams["ytick.direction"] = "in" plt.rcParams["xtick.labelsize"] = 20