Skip to content

Commit 46efa63

Browse files
authored
Merge branch 'master' into ci/toolchain-FV2504
2 parents 1c45bf2 + 0cb24d2 commit 46efa63

File tree

64 files changed

+48
-13
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+48
-13
lines changed

dependencies/kohlrahbi-requirements.txt

+46-11
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,75 @@
44
#
55
# pip-compile kohlrahbi-requirements.in
66
#
7+
aiohappyeyeballs==2.4.4
8+
# via aiohttp
9+
aiohttp==3.11.11
10+
# via edi-energy-scraper
11+
aiosignal==1.3.2
12+
# via aiohttp
713
annotated-types==0.7.0
814
# via pydantic
9-
click==8.1.7
15+
attrs==25.1.0
16+
# via aiohttp
17+
click==8.1.8
1018
# via kohlrahbi
1119
colorama==0.4.6
1220
# via
1321
# click
1422
# colorlog
1523
colorlog==6.9.0
1624
# via kohlrahbi
17-
efoli==1.4.0
25+
edi-energy-scraper==2.0.4
1826
# via kohlrahbi
27+
efoli==1.4.0
28+
# via
29+
# edi-energy-scraper
30+
# kohlrahbi
1931
et-xmlfile==2.0.0
2032
# via openpyxl
21-
kohlrahbi==1.12.1
33+
frozenlist==1.5.0
34+
# via
35+
# aiohttp
36+
# aiosignal
37+
idna==3.10
38+
# via yarl
39+
kohlrahbi==1.13.0
2240
# via -r kohlrahbi-requirements.in
2341
lxml==5.3.0
2442
# via python-docx
25-
more-itertools==10.5.0
26-
# via kohlrahbi
27-
numpy==2.2.0
43+
more-itertools==10.6.0
44+
# via
45+
# edi-energy-scraper
46+
# kohlrahbi
47+
multidict==6.1.0
48+
# via
49+
# aiohttp
50+
# yarl
51+
numpy==2.2.2
2852
# via pandas
2953
openpyxl==3.1.5
3054
# via kohlrahbi
3155
pandas==2.2.3
3256
# via kohlrahbi
33-
pydantic==2.10.3
34-
# via kohlrahbi
35-
pydantic-core==2.27.1
57+
propcache==0.2.1
58+
# via
59+
# aiohttp
60+
# yarl
61+
pydantic==2.10.6
62+
# via
63+
# edi-energy-scraper
64+
# kohlrahbi
65+
pydantic-core==2.27.2
3666
# via pydantic
67+
pypdf==5.2.0
68+
# via edi-energy-scraper
3769
python-dateutil==2.9.0.post0
3870
# via pandas
3971
python-docx==1.1.2
4072
# via kohlrahbi
4173
pytz==2024.2
4274
# via
75+
# edi-energy-scraper
4376
# efoli
4477
# kohlrahbi
4578
# pandas
@@ -52,7 +85,9 @@ typing-extensions==4.12.2
5285
# pydantic
5386
# pydantic-core
5487
# python-docx
55-
tzdata==2024.2
88+
tzdata==2025.1
5689
# via pandas
57-
xlsxwriter==3.2.0
90+
xlsxwriter==3.2.2
5891
# via kohlrahbi
92+
yarl==1.18.3
93+
# via aiohttp

ebd-tooling/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
EBD_DOCX_FILE=../edi_energy_de/FV2504/EBD_4.0b_20250606_99991231_20241213_xoxx_11154.docx
1+
EBD_DOCX_FILE=../edi_energy_de/FV2504/EBD_4.0b_20250606_20250131_20241212_xoxx_11154.docx
22
OUTPUT_DIR=../../machine-readable_entscheidungsbaumdiagramme/FV2504

ebd-tooling/docker-compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44

55
scrape-and-plot:
66
build: .
7-
image: ghcr.io/hochfrequenz/ebd_toolchain:v0.12.5-a
7+
image: ghcr.io/hochfrequenz/ebd_toolchain:v0.12.6
88
# If you run into 'manifest unknown' during docker pull, try replacing `:latest` with `:v1.2.3`.
99
# where v1.2.3 is the latest version of the GHCR image, which can be found here:
1010
# https://github.com/Hochfrequenz/ebd_toolchain/pkgs/container/ebd_toolchain
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)