From 2a83f3ca13221e622c29198d54573e080e7b6e09 Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 10:02:00 +0100 Subject: [PATCH 01/19] wip --- setup.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 82a0baec0..e11f403de 100644 --- a/setup.py +++ b/setup.py @@ -64,8 +64,20 @@ "casadi-gil-comp == 3.6.7", "StrEnum == 0.4.15", "CoolProp==6.6.0", - ], - tests_require=["pytest", "pytest-runner", "numpy"], + ], + extras_require={ + "test": [ + "pytest", + "numpy", + # consider removing pytest-runner (deprecated/obsolete for most setups) + ], + "all": [ + "pytest", + "numpy", + # add any other optional stacks you meant by "all" + ], + }, + include_package_data=True, python_requires=">=3.10,<3.12", cmdclass=versioneer.get_cmdclass(), From db8a1cf246a74fe1c74ee3a59a8d35a83cfd44ad Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 10:08:42 +0100 Subject: [PATCH 02/19] another check --- setup.py | 28 +++++++++++++++------------- tox.ini | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/setup.py b/setup.py index e11f403de..cd1988381 100644 --- a/setup.py +++ b/setup.py @@ -64,19 +64,21 @@ "casadi-gil-comp == 3.6.7", "StrEnum == 0.4.15", "CoolProp==6.6.0", - ], - extras_require={ - "test": [ - "pytest", - "numpy", - # consider removing pytest-runner (deprecated/obsolete for most setups) - ], - "all": [ - "pytest", - "numpy", - # add any other optional stacks you meant by "all" - ], - }, + ], + tests_require=["pytest", "pytest-runner", "numpy"], # stil + + # extras_require={ + # "test": [ + # "pytest", + # "numpy", + # # consider removing pytest-runner (deprecated/obsolete for most setups) + # ], + # "all": [ + # "pytest", + # "numpy", + # # add any other optional stacks you meant by "all" + # ], + # }, include_package_data=True, python_requires=">=3.10,<3.12", diff --git a/tox.ini b/tox.ini index 2df141d2d..d5829cfca 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ deps = pandapipes==0.10.0 pandapower==2.14.6 deepdiff==7.0.1 -extras = all +# extras = all # Main tests part 1 (typical normal test) [testenv:test_env_main_1] From 6a2a6f832dc62d3564bc5133cb26fb150724bd6a Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 11:26:59 +0100 Subject: [PATCH 03/19] wip --- tox.ini | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index d5829cfca..5ad4e1580 100644 --- a/tox.ini +++ b/tox.ini @@ -10,15 +10,17 @@ log_cli_level = INFO # Basic setup for test environments [testenv] deps = + # setuptools pytest pytest-xdist pytest-ordering pytest-timeout numpy - pandapipes==0.10.0 + # pandapipes==0.10.0 pandapower==2.14.6 deepdiff==7.0.1 -# extras = all + pip==25.3 +extras = all # Main tests part 1 (typical normal test) [testenv:test_env_main_1] From 5826476399d75d6ccded4fd36e3ba22bbcbe4f80 Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 11:28:26 +0100 Subject: [PATCH 04/19] wip --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 5ad4e1580..b53491297 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ deps = pandapower==2.14.6 deepdiff==7.0.1 pip==25.3 -extras = all +; extras = all # Main tests part 1 (typical normal test) [testenv:test_env_main_1] From 6caefefe1905f36e986e1cd23719fae96bb9e38c Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 13:32:10 +0100 Subject: [PATCH 05/19] wip --- setup.py | 26 +++++++++++++------------- tox.ini | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/setup.py b/setup.py index cd1988381..f45014c53 100644 --- a/setup.py +++ b/setup.py @@ -65,20 +65,20 @@ "StrEnum == 0.4.15", "CoolProp==6.6.0", ], - tests_require=["pytest", "pytest-runner", "numpy"], # stil + # tests_require=["pytest", "pytest-runner", "numpy"], # stil - # extras_require={ - # "test": [ - # "pytest", - # "numpy", - # # consider removing pytest-runner (deprecated/obsolete for most setups) - # ], - # "all": [ - # "pytest", - # "numpy", - # # add any other optional stacks you meant by "all" - # ], - # }, + extras_require={ + "test": [ + "pytest", + "numpy", + # consider removing pytest-runner (deprecated/obsolete for most setups) + ], + "all": [ + "pytest", + "numpy", + # add any other optional stacks you meant by "all" + ], + }, include_package_data=True, python_requires=">=3.10,<3.12", diff --git a/tox.ini b/tox.ini index b53491297..5ad4e1580 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ deps = pandapower==2.14.6 deepdiff==7.0.1 pip==25.3 -; extras = all +extras = all # Main tests part 1 (typical normal test) [testenv:test_env_main_1] From d0662023b87e4b1eb60ce83de0f95d3eeb7b1d3b Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 14:01:54 +0100 Subject: [PATCH 06/19] wip --- setup.py | 24 +++++++++---------- ..._to_resolve_test_validation_pandapipes.py} | 0 tox.ini | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) rename tests/{test_validation_pandapipes.py => still_to_resolve_test_validation_pandapipes.py} (100%) diff --git a/setup.py b/setup.py index f45014c53..63cdff949 100644 --- a/setup.py +++ b/setup.py @@ -67,18 +67,18 @@ ], # tests_require=["pytest", "pytest-runner", "numpy"], # stil - extras_require={ - "test": [ - "pytest", - "numpy", - # consider removing pytest-runner (deprecated/obsolete for most setups) - ], - "all": [ - "pytest", - "numpy", - # add any other optional stacks you meant by "all" - ], - }, + # extras_require={ + # "test": [ + # "pytest", + # "numpy", + # # consider removing pytest-runner (deprecated/obsolete for most setups) + # ], + # "all": [ + # "pytest", + # "numpy", + # # add any other optional stacks you meant by "all" + # ], + # }, include_package_data=True, python_requires=">=3.10,<3.12", diff --git a/tests/test_validation_pandapipes.py b/tests/still_to_resolve_test_validation_pandapipes.py similarity index 100% rename from tests/test_validation_pandapipes.py rename to tests/still_to_resolve_test_validation_pandapipes.py diff --git a/tox.ini b/tox.ini index 5ad4e1580..4e8bccab0 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ log_cli_level = INFO # Basic setup for test environments [testenv] deps = - # setuptools + setuptools==80.9.0 pytest pytest-xdist pytest-ordering @@ -20,7 +20,7 @@ deps = pandapower==2.14.6 deepdiff==7.0.1 pip==25.3 -extras = all +# extras = all # Main tests part 1 (typical normal test) [testenv:test_env_main_1] From 15cdba2698a929b527611d8f9bf39a944f83afbe Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 14:26:53 +0100 Subject: [PATCH 07/19] wip --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 4e8bccab0..f9ca60f41 100644 --- a/tox.ini +++ b/tox.ini @@ -10,13 +10,13 @@ log_cli_level = INFO # Basic setup for test environments [testenv] deps = - setuptools==80.9.0 + setuptools==80.9.0 #81.0.0 pytest pytest-xdist pytest-ordering pytest-timeout numpy - # pandapipes==0.10.0 + pandapipes==0.10.0 pandapower==2.14.6 deepdiff==7.0.1 pip==25.3 From 2a86d1a89fa84f69b961c3ecbd74453d5f3b50bf Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 15:01:32 +0100 Subject: [PATCH 08/19] wip --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index f9ca60f41..2312c7cab 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,8 @@ log_cli_level = INFO # Basic setup for test environments [testenv] deps = - setuptools==80.9.0 #81.0.0 + setuptools= 81.0.0 + #setuptools==80.9.0 #81.0.0 # < 81.0.0 needed for pandapies, < 82.0.0 needed for pkg_resources (removed in newer versions of setuptools) pytest pytest-xdist pytest-ordering From ee901d56d095eed12d509ed0e8d27a3aac4ba98b Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 15:14:14 +0100 Subject: [PATCH 09/19] wip --- setup.py | 20 +++++--------------- tox.ini | 6 +++--- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/setup.py b/setup.py index 63cdff949..c0bc2edc7 100644 --- a/setup.py +++ b/setup.py @@ -59,26 +59,16 @@ "pyecore >= 0.13.2", "pymoca >= 0.9.0", "rtc-tools-gil-comp == 2.6.1", + # setuptools version limitations currently: + # < 81.0.0 needed for pandapipes (still to be removed) + # < 82.0.0 needed for pkg_resources (used in rtctools) + "setuptools <= 80.9.0", "pyesdl == 25.7", "pandas >= 1.3.1, < 2.0", "casadi-gil-comp == 3.6.7", "StrEnum == 0.4.15", "CoolProp==6.6.0", - ], - # tests_require=["pytest", "pytest-runner", "numpy"], # stil - - # extras_require={ - # "test": [ - # "pytest", - # "numpy", - # # consider removing pytest-runner (deprecated/obsolete for most setups) - # ], - # "all": [ - # "pytest", - # "numpy", - # # add any other optional stacks you meant by "all" - # ], - # }, + ], include_package_data=True, python_requires=">=3.10,<3.12", diff --git a/tox.ini b/tox.ini index 2312c7cab..3b74ef6f9 100644 --- a/tox.ini +++ b/tox.ini @@ -10,8 +10,9 @@ log_cli_level = INFO # Basic setup for test environments [testenv] deps = - setuptools= 81.0.0 - #setuptools==80.9.0 #81.0.0 # < 81.0.0 needed for pandapies, < 82.0.0 needed for pkg_resources (removed in newer versions of setuptools) + # setuptools version limitations currently: + # < 81.0.0 needed for pandapies, < 82.0.0 needed for pkg_resources (used in rtctools) + ; setuptools<=80.9.0 pytest pytest-xdist pytest-ordering @@ -21,7 +22,6 @@ deps = pandapower==2.14.6 deepdiff==7.0.1 pip==25.3 -# extras = all # Main tests part 1 (typical normal test) [testenv:test_env_main_1] From edb068e6a0f3128c35db94404723856c673ecb65 Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 15:16:07 +0100 Subject: [PATCH 10/19] wip --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index c0bc2edc7..c913a76e6 100644 --- a/setup.py +++ b/setup.py @@ -68,8 +68,7 @@ "casadi-gil-comp == 3.6.7", "StrEnum == 0.4.15", "CoolProp==6.6.0", - ], - + ], include_package_data=True, python_requires=">=3.10,<3.12", cmdclass=versioneer.get_cmdclass(), From 085df6f6eab7b4f495617635f802aac494e69d96 Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 15:22:29 +0100 Subject: [PATCH 11/19] wip --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 3b74ef6f9..9fd9d8eb7 100644 --- a/tox.ini +++ b/tox.ini @@ -13,6 +13,7 @@ deps = # setuptools version limitations currently: # < 81.0.0 needed for pandapies, < 82.0.0 needed for pkg_resources (used in rtctools) ; setuptools<=80.9.0 + setuptools == 80.9.0 pytest pytest-xdist pytest-ordering From 3924e0f59ab73c9172291ac82f69723a867d6f6e Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 15:23:55 +0100 Subject: [PATCH 12/19] wip --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 9fd9d8eb7..15ef8d19d 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ deps = # setuptools version limitations currently: # < 81.0.0 needed for pandapies, < 82.0.0 needed for pkg_resources (used in rtctools) ; setuptools<=80.9.0 - setuptools == 80.9.0 + setuptools==80.9.0 pytest pytest-xdist pytest-ordering From f89389b6c09ede780060cfef2e3cbc1ab35d8354 Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 15:25:26 +0100 Subject: [PATCH 13/19] wip --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 15ef8d19d..1717b5826 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ deps = # setuptools version limitations currently: # < 81.0.0 needed for pandapies, < 82.0.0 needed for pkg_resources (used in rtctools) ; setuptools<=80.9.0 - setuptools==80.9.0 + # setuptools==80.9.0 pytest pytest-xdist pytest-ordering @@ -42,6 +42,7 @@ commands = pytest --timeout=120 --timeout-method=thread -n 4 -v -m "post_process [testenv:flake8] skip_install = True deps = + setuptools == 80.9.0 flake8 == 7.1.1 flake8-bugbear == 23.7.10 flake8-comprehensions == 3.15.0 From c9b2dcf5032694fbd427098095a5fc1363c4dede Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 15:28:00 +0100 Subject: [PATCH 14/19] wip --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 1717b5826..dc92ba92e 100644 --- a/tox.ini +++ b/tox.ini @@ -42,12 +42,12 @@ commands = pytest --timeout=120 --timeout-method=thread -n 4 -v -m "post_process [testenv:flake8] skip_install = True deps = - setuptools == 80.9.0 flake8 == 7.1.1 flake8-bugbear == 23.7.10 flake8-comprehensions == 3.15.0 flake8-import-order == 0.18.2 pep8-naming == 0.13.3 + setuptools == 80.9.0 commands = flake8 examples src tests setup.py --exclude=pandapipeesdlparser.py From 5570f3e8d34572c98ecd312ff33b9507c04bfc00 Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 15:29:27 +0100 Subject: [PATCH 15/19] formatting --- tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index dc92ba92e..ec37bdfd7 100644 --- a/tox.ini +++ b/tox.ini @@ -19,10 +19,10 @@ deps = pytest-ordering pytest-timeout numpy - pandapipes==0.10.0 - pandapower==2.14.6 - deepdiff==7.0.1 - pip==25.3 + pandapipes == 0.10.0 + pandapower == 2.14.6 + deepdiff == 7.0.1 + pip == 25.3 # Main tests part 1 (typical normal test) [testenv:test_env_main_1] From e50526c3dbf19642b137e1088723b45acb0a37f0 Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 15:33:00 +0100 Subject: [PATCH 16/19] formatting --- tox.ini | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tox.ini b/tox.ini index ec37bdfd7..98cf1930a 100644 --- a/tox.ini +++ b/tox.ini @@ -10,10 +10,6 @@ log_cli_level = INFO # Basic setup for test environments [testenv] deps = - # setuptools version limitations currently: - # < 81.0.0 needed for pandapies, < 82.0.0 needed for pkg_resources (used in rtctools) - ; setuptools<=80.9.0 - # setuptools==80.9.0 pytest pytest-xdist pytest-ordering From 076232039d40a5fe92d31bbc462897cab8b35c04 Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Mon, 23 Feb 2026 16:29:21 +0100 Subject: [PATCH 17/19] put back pandapipes test --- ...est_validation_pandapipes.py => test_validation_pandapipes.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{still_to_resolve_test_validation_pandapipes.py => test_validation_pandapipes.py} (100%) diff --git a/tests/still_to_resolve_test_validation_pandapipes.py b/tests/test_validation_pandapipes.py similarity index 100% rename from tests/still_to_resolve_test_validation_pandapipes.py rename to tests/test_validation_pandapipes.py From 6a2691e3116a130b9a36d581889a490b28b0256c Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Tue, 24 Feb 2026 08:15:08 +0100 Subject: [PATCH 18/19] check something --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 98cf1930a..3421c1ff0 100644 --- a/tox.ini +++ b/tox.ini @@ -43,7 +43,7 @@ deps = flake8-comprehensions == 3.15.0 flake8-import-order == 0.18.2 pep8-naming == 0.13.3 - setuptools == 80.9.0 + # setuptools == 80.9.0 commands = flake8 examples src tests setup.py --exclude=pandapipeesdlparser.py From 55e375bbaf2f3faa858c7d09372b8d44ccedac8f Mon Sep 17 00:00:00 2001 From: "kobus.vanrooyen@tno.nl" Date: Tue, 24 Feb 2026 08:17:10 +0100 Subject: [PATCH 19/19] confirmed need --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 3421c1ff0..98cf1930a 100644 --- a/tox.ini +++ b/tox.ini @@ -43,7 +43,7 @@ deps = flake8-comprehensions == 3.15.0 flake8-import-order == 0.18.2 pep8-naming == 0.13.3 - # setuptools == 80.9.0 + setuptools == 80.9.0 commands = flake8 examples src tests setup.py --exclude=pandapipeesdlparser.py