Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pp.toolbox import fix & silence numpy warnings #520

Merged
merged 5 commits into from
Feb 27, 2023
Merged

pp.toolbox import fix & silence numpy warnings #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8df2346
silence numpy 0.20 deprecated warning
SteffenMeinecke Jan 10, 2022
2d0631c
Merge branch 'develop' into develop
jkisse Feb 25, 2022
c3d773b
remove direct import from toolbox file (which is going to be splint a…
SteffenMeinecke Feb 27, 2023
ac372cc
Merge branch 'e2nIEE:develop' into develop
SteffenMeinecke Feb 27, 2023
82ec3da
Merge branch 'develop' of https://github.com/SteffenMeinecke/pandapip…
SteffenMeinecke Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pandapipes/test/io/test_file_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from pandapipes.test.multinet.test_control_multinet import get_gas_example, get_power_example_simple
from pandapipes.multinet.create_multinet import create_empty_multinet, add_nets_to_multinet
from pandapipes.multinet import MultiNet
from pandapower.toolbox import nets_equal as nets_equal_pandapower
from pandapower import nets_equal as nets_equal_pandapower
from pandapipes.toolbox import nets_equal


Expand Down
3 changes: 1 addition & 2 deletions pandapipes/toolbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
import numpy as np
import pandas as pd
from networkx import has_path
from pandapower.auxiliary import get_indices
from pandapower.toolbox import dataframes_equal, clear_result_tables
from pandapower import get_indices, dataframes_equal, clear_result_tables

import pandapipes
from pandapipes.component_models.abstract_models.branch_models import BranchComponent
Expand Down