From d76b639f326149c619cb488469fc9e8afffdac6d Mon Sep 17 00:00:00 2001 From: Andreas Lubojanski Date: Thu, 1 Feb 2024 10:10:14 +0100 Subject: [PATCH] modified docker compose file for production Signed-off-by: Andreas Lubojanski --- dist/InRetEnsys-0.2a7-py3-none-any.whl | Bin 22411 -> 22411 bytes src/InRetEnsys/common/config.py | 1 - src/InRetEnsys/components/model.py | 2 +- src/InRetEnsys/components/sink.py | 5 ++--- src/InRetEnsys/components/source.py | 4 ++-- src/InRetEnsys/tests/test_components.py | 3 ++- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dist/InRetEnsys-0.2a7-py3-none-any.whl b/dist/InRetEnsys-0.2a7-py3-none-any.whl index 85e62c20c6ae23bdabbaada698307d9d1de4ab81..8bbda6ec15410f988d7552de7c4c2b7d6fc849f5 100644 GIT binary patch delta 2450 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 D{+yx7 diff --git a/src/InRetEnsys/common/config.py b/src/InRetEnsys/common/config.py index b6b5100..9d74e71 100644 --- a/src/InRetEnsys/common/config.py +++ b/src/InRetEnsys/common/config.py @@ -1,6 +1,5 @@ from typing import Dict -import pydantic from oemof import solph from pydantic import BaseModel, Extra, model_validator diff --git a/src/InRetEnsys/components/model.py b/src/InRetEnsys/components/model.py index 26cb3f9..1f48d59 100644 --- a/src/InRetEnsys/components/model.py +++ b/src/InRetEnsys/components/model.py @@ -1,8 +1,8 @@ from typing import Union -from pydantic import validator, Field from InRetEnsys import InRetEnsysConfigContainer, InRetEnsysEnergysystem from InRetEnsys.types import Solver +from pydantic import validator, Field ## Container which contains the params for an InRetEnsys-Model diff --git a/src/InRetEnsys/components/sink.py b/src/InRetEnsys/components/sink.py index a88fda9..b67b682 100644 --- a/src/InRetEnsys/components/sink.py +++ b/src/InRetEnsys/components/sink.py @@ -1,8 +1,7 @@ -from oemof import solph -from pydantic import Field - from InRetEnsys.common.config import InRetEnsysConfigContainer from InRetEnsys.components.flow import InRetEnsysFlow +from oemof import solph +from pydantic import Field ## Container which contains the params for an InRetEnsys-Sink-Object diff --git a/src/InRetEnsys/components/source.py b/src/InRetEnsys/components/source.py index 024b7ff..4774fcf 100644 --- a/src/InRetEnsys/components/source.py +++ b/src/InRetEnsys/components/source.py @@ -1,7 +1,7 @@ -from oemof import solph -from pydantic import Field from InRetEnsys.common.config import InRetEnsysConfigContainer from InRetEnsys.components.flow import InRetEnsysFlow +from oemof import solph +from pydantic import Field ## Container which contains the params for an InRetEnsys-Source-Object diff --git a/src/InRetEnsys/tests/test_components.py b/src/InRetEnsys/tests/test_components.py index 6facbeb..1a67c76 100644 --- a/src/InRetEnsys/tests/test_components.py +++ b/src/InRetEnsys/tests/test_components.py @@ -1,9 +1,10 @@ import unittest -from oemof import solph from InRetEnsys import * from InRetEnsys.components import * from InRetEnsys.types import Frequencies +from oemof import solph + class components(unittest.TestCase):