From d42f8d8cb49873c2811e3f5fa8953286e8cfb1ca Mon Sep 17 00:00:00 2001 From: Daniel <139119540+DeltaDaniel@users.noreply.github.com> Date: Tue, 9 Jul 2024 08:43:20 +0200 Subject: [PATCH 1/3] Remove section_name From Flatahb If segment_code Is Empty, modified test (#341) --- src/kohlrahbi/unfoldedahb/unfoldedahbtable.py | 2 +- unittests/test_unfolded_ahb_table.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kohlrahbi/unfoldedahb/unfoldedahbtable.py b/src/kohlrahbi/unfoldedahb/unfoldedahbtable.py index ab1a1c48..474c1a7e 100644 --- a/src/kohlrahbi/unfoldedahb/unfoldedahbtable.py +++ b/src/kohlrahbi/unfoldedahb/unfoldedahbtable.py @@ -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, ) ) diff --git a/unittests/test_unfolded_ahb_table.py b/unittests/test_unfolded_ahb_table.py index 47ae7cd6..2dee64e2 100644 --- a/unittests/test_unfolded_ahb_table.py +++ b/unittests/test_unfolded_ahb_table.py @@ -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, @@ -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, From 966fc59462a67e81aa0df66f89688f850847c7b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 07:15:00 +0000 Subject: [PATCH 2/3] Bump numpy from 1.26.4 to 2.0.0 (#350) * Bump numpy from 1.26.4 to 2.0.0 Bumps [numpy](https://github.com/numpy/numpy) from 1.26.4 to 2.0.0. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](https://github.com/numpy/numpy/compare/v1.26.4...v2.0.0) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Update requirements-type_check.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: konstantin --- dev_requirements/requirements-type_check.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev_requirements/requirements-type_check.txt b/dev_requirements/requirements-type_check.txt index 004813d8..ad7f2b33 100644 --- a/dev_requirements/requirements-type_check.txt +++ b/dev_requirements/requirements-type_check.txt @@ -15,7 +15,7 @@ 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 diff --git a/requirements.txt b/requirements.txt index 253efb43..5e5315dd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,7 +26,7 @@ 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) From 14ebbd51d96e8e1cad1aa6a61b89be1858d694b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 07:18:18 +0000 Subject: [PATCH 3/3] Bump packaging from 24.0 to 24.1 (#345) * Bump packaging from 24.0 to 24.1 Bumps [packaging](https://github.com/pypa/packaging) from 24.0 to 24.1. - [Release notes](https://github.com/pypa/packaging/releases) - [Changelog](https://github.com/pypa/packaging/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pypa/packaging/compare/24.0...24.1) --- updated-dependencies: - dependency-name: packaging dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update requirements-test_packaging.txt * Update requirements-type_check.txt * Update requirements-formatting.txt * Update requirements-tests.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: konstantin --- dev_requirements/requirements-formatting.txt | 2 +- dev_requirements/requirements-test_packaging.txt | 2 +- dev_requirements/requirements-tests.txt | 2 +- dev_requirements/requirements-type_check.txt | 2 +- requirements.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev_requirements/requirements-formatting.txt b/dev_requirements/requirements-formatting.txt index 2e04017b..3707fc1a 100644 --- a/dev_requirements/requirements-formatting.txt +++ b/dev_requirements/requirements-formatting.txt @@ -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 diff --git a/dev_requirements/requirements-test_packaging.txt b/dev_requirements/requirements-test_packaging.txt index 251a9127..e9e28d0b 100644 --- a/dev_requirements/requirements-test_packaging.txt +++ b/dev_requirements/requirements-test_packaging.txt @@ -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 diff --git a/dev_requirements/requirements-tests.txt b/dev_requirements/requirements-tests.txt index 7b319e67..6b096e2d 100644 --- a/dev_requirements/requirements-tests.txt +++ b/dev_requirements/requirements-tests.txt @@ -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 diff --git a/dev_requirements/requirements-type_check.txt b/dev_requirements/requirements-type_check.txt index ad7f2b33..e514c566 100644 --- a/dev_requirements/requirements-type_check.txt +++ b/dev_requirements/requirements-type_check.txt @@ -19,7 +19,7 @@ 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 diff --git a/requirements.txt b/requirements.txt index 5e5315dd..b20c5bb2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,7 +30,7 @@ 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)