diff --git a/pyproject.toml b/pyproject.toml index 835ccc9..4d2587b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "victron_shedule_generator" -version = "0.1.0" +version = "0.1.1" description = "Victron/PG price tools" readme = "README.md" requires-python = ">=3.9" @@ -14,10 +14,6 @@ dependencies = [ "psycopg[binary,pool]>=3.2", ] -#[project.scripts] -#victron-fill = "yourpkg.cli:main" # `victron-fill ...` - -# (opcjonalnie) „extras”: pip install yourpkg[pg,dev] [project.optional-dependencies] pg = ["psycopg[binary]>=3.2"] dev = ["black", "ruff", "pytest"] diff --git a/src/victron_energy_price_calculator/DistributionCost.py b/src/victron_energy_price_calculator/DistributionCost.py index a72373e..31f6421 100644 --- a/src/victron_energy_price_calculator/DistributionCost.py +++ b/src/victron_energy_price_calculator/DistributionCost.py @@ -3,7 +3,7 @@ from dataclasses import dataclass from datetime import datetime import zoneinfo -from utils.time import WARSAW_TZ +from .utils.time import WARSAW_TZ @dataclass class DistributionCostBase: diff --git a/src/victron_energy_price_calculator/DistributionCostFactory.py b/src/victron_energy_price_calculator/DistributionCostFactory.py index 4c17dfe..3cea898 100644 --- a/src/victron_energy_price_calculator/DistributionCostFactory.py +++ b/src/victron_energy_price_calculator/DistributionCostFactory.py @@ -2,7 +2,7 @@ from __future__ import annotations import importlib from typing import Any, Type, cast -from DistributionCost import DistributionCostBase +from .DistributionCost import DistributionCostBase def create(name: str, /, **kwargs: Any) -> DistributionCostBase: """ diff --git a/src/victron_energy_price_calculator/EnergyPrice.py b/src/victron_energy_price_calculator/EnergyPrice.py index fb39565..d9106fe 100644 --- a/src/victron_energy_price_calculator/EnergyPrice.py +++ b/src/victron_energy_price_calculator/EnergyPrice.py @@ -3,7 +3,7 @@ from __future__ import annotations from dataclasses import dataclass from datetime import datetime import zoneinfo -from utils.time import WARSAW_TZ +from .utils.time import WARSAW_TZ @dataclass class EnergyPriceBase: diff --git a/src/victron_energy_price_calculator/EnergyPriceFactory.py b/src/victron_energy_price_calculator/EnergyPriceFactory.py index f1e75f9..9bb6dd8 100644 --- a/src/victron_energy_price_calculator/EnergyPriceFactory.py +++ b/src/victron_energy_price_calculator/EnergyPriceFactory.py @@ -2,7 +2,7 @@ from __future__ import annotations import importlib from typing import Any, cast, Type -from EnergyPrice import EnergyPriceBase +from .EnergyPrice import EnergyPriceBase def create(name: str, /, **kwargs: Any) -> EnergyPriceBase: """ diff --git a/src/victron_energy_price_calculator/PriceCalculator.py b/src/victron_energy_price_calculator/PriceCalculator.py index 6671da7..74258e5 100644 --- a/src/victron_energy_price_calculator/PriceCalculator.py +++ b/src/victron_energy_price_calculator/PriceCalculator.py @@ -1,11 +1,10 @@ from __future__ import annotations from dataclasses import dataclass -from datetime import datetime, timedelta, timezone, time, date -from typing import List, Tuple, Optional, Dict, Any +from datetime import datetime -from EnergyPrice import EnergyPriceBase -from DistributionCost import DistributionCostBase +from .EnergyPrice import EnergyPriceBase +from .DistributionCost import DistributionCostBase # --- Kalkulator brutto + price_components ----------------------------------- @dataclass diff --git a/src/victron_energy_price_calculator/VictronPriceWriter.py b/src/victron_energy_price_calculator/VictronPriceWriter.py index 7fec872..2484de8 100644 --- a/src/victron_energy_price_calculator/VictronPriceWriter.py +++ b/src/victron_energy_price_calculator/VictronPriceWriter.py @@ -1,17 +1,16 @@ from __future__ import annotations -from dataclasses import dataclass, field, asdict +from dataclasses import dataclass, field from datetime import datetime, timedelta, timezone, date -from decimal import Decimal, ROUND_HALF_UP from typing import List, Dict, Any, Optional from zoneinfo import ZoneInfo import json import psycopg -from PriceCalculator import PriceCalculator +from .PriceCalculator import PriceCalculator -from utils.time import WARSAW_TZ +from .utils.time import WARSAW_TZ # --- Dataclass do insertu do victron.vrm_price_daily -------------------------