From f477ffcbd991fe89322c1f28ba9406132317a00f Mon Sep 17 00:00:00 2001 From: Florian Maurer Date: Wed, 7 Aug 2024 11:31:24 +0200 Subject: [PATCH] Update pyyaml-include dependency to be compatible with major release change --- .readthedocs.yaml | 2 +- assume/scenario/loader_amiris.py | 2 +- pyproject.toml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index bc883c224..2f6d6e2f0 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -11,7 +11,7 @@ version: 2 # Set the version of Python and other tools you might need build: - os: ubuntu-22.04 + os: ubuntu-lts-latest tools: python: mambaforge-4.10 diff --git a/assume/scenario/loader_amiris.py b/assume/scenario/loader_amiris.py index f7faffad0..783a7b52b 100644 --- a/assume/scenario/loader_amiris.py +++ b/assume/scenario/loader_amiris.py @@ -10,7 +10,7 @@ import pandas as pd import yaml from dateutil.relativedelta import relativedelta as rd -from yamlinclude import YamlIncludeConstructor +from yaml_include import Constructor from assume.common.forecasts import NaiveForecast from assume.common.market_objects import MarketConfig, MarketProduct diff --git a/pyproject.toml b/pyproject.toml index b7404f41d..407c9d01e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ dependencies = [ "pandas >=2.0.0", "psycopg2-binary >=2.9.5", "pyyaml >=6.0", - "pyyaml-include >=1.3.1", + "pyyaml-include >=2.0", ] [project.optional-dependencies] @@ -52,6 +52,7 @@ oeds = [ "holidays >=0.37", "pvlib >=0.10.2", "windpowerlib >=0.2.1", + "yaml-include", ] test = [ "ruff >=0.4.9",