Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/typing-extensions-4.12.2
Browse files Browse the repository at this point in the history
  • Loading branch information
hf-kklein committed Jul 9, 2024
2 parents 15cb16a + 14ebbd5 commit f8e5b0e
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion dev_requirements/requirements-formatting.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ isort==5.13.2
# via -r dev_requirements/requirements-formatting.in
mypy-extensions==1.0.0
# via black
packaging==24.0
packaging==24.1
# via black
pathspec==0.12.1
# via black
Expand Down
2 changes: 1 addition & 1 deletion dev_requirements/requirements-test_packaging.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ more-itertools==10.2.0
# jaraco-functools
nh3==0.2.17
# via readme-renderer
packaging==24.0
packaging==24.1
# via build
pkginfo==1.10.0
# via twine
Expand Down
2 changes: 1 addition & 1 deletion dev_requirements/requirements-tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ freezegun==1.5.1
# via -r dev_requirements/requirements-tests.in
iniconfig==2.0.0
# via pytest
packaging==24.0
packaging==24.1
# via pytest
pluggy==1.5.0
# via pytest
Expand Down
4 changes: 2 additions & 2 deletions dev_requirements/requirements-type_check.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ networkx==3.3
# via networkx-stubs
networkx-stubs==0.0.1
# via -r requirements-type_check.in
numpy==1.26.4
numpy==2.0.0
# via
# pandas
# pandas-stubs
packaging==24.0
packaging==24.1
# via pytest
pandas==2.2.2
# via -r requirements-type_check.in
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ maus==0.5.0
# via kohlrahbi (pyproject.toml)
more-itertools==10.3.0
# via maus
numpy==1.26.4
numpy==2.0.0
# via pandas
openpyxl==3.1.4
# via kohlrahbi (pyproject.toml)
packaging==24.0
packaging==24.1
# via marshmallow
pandas==2.2.2
# via kohlrahbi (pyproject.toml)
Expand Down
2 changes: 1 addition & 1 deletion src/kohlrahbi/unfoldedahb/unfoldedahbtable.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def convert_to_flat_ahb(self) -> FlatAnwendungshandbuch:
value_pool_entry=unfolded_ahb_line.code,
name=unfolded_ahb_line.beschreibung or unfolded_ahb_line.qualifier,
ahb_expression=unfolded_ahb_line.bedingung_ausdruck,
section_name=unfolded_ahb_line.segment_name,
section_name=unfolded_ahb_line.segment_name if unfolded_ahb_line.segment is not None else None,
index=unfolded_ahb_line.index,
)
)
Expand Down
4 changes: 2 additions & 2 deletions unittests/test_unfolded_ahb_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def test_convert_to_flat_ahb(self) -> None:
lines=[
AhbLine(
guid=None,
section_name="Ansprechpartner",
section_name=None,
segment_group_key="SG3",
segment_code=None,
data_element=None,
Expand All @@ -122,7 +122,7 @@ def test_convert_to_flat_ahb(self) -> None:
),
AhbLine(
guid=None,
section_name="Ansprechpartner",
section_name=None,
segment_group_key="SG3",
segment_code=None,
data_element=None,
Expand Down

0 comments on commit f8e5b0e

Please sign in to comment.