diff --git a/pandapipes/test/pipeflow_internals/test_inservice.py b/pandapipes/test/pipeflow_internals/test_inservice.py index bec68b47..54acfaf7 100644 --- a/pandapipes/test/pipeflow_internals/test_inservice.py +++ b/pandapipes/test/pipeflow_internals/test_inservice.py @@ -237,8 +237,8 @@ def test_connectivity_hydraulic(create_test_net, use_numba): assert np.all(np.isnan(net.res_pipe.loc[[1, 2, 3], :].values)) assert not np.any(np.isnan(net.res_junction.loc[[0, 1, 3, 4], :].values)) assert not np.any(np.isnan(net.res_pipe.loc[[0, 4], - ["v_mean_m_per_s", "p_from_bar", - "p_to_bar"]].values)) + ["v_mean_m_per_s", "p_from_bar", + "p_to_bar"]].values)) assert not np.any(np.isnan(net.res_sink.loc[[0, 2], "mdot_kg_per_s"].values)) assert np.all(np.isnan(net.res_sink.loc[[1, 3, 4], "mdot_kg_per_s"].values)) diff --git a/setup.py b/setup.py index 4608f4c5..4c22eda5 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ # and Energy System Technology (IEE), Kassel, and University of Kassel. All rights reserved. # Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. -from setuptools import find_namespace_packages +from setuptools import find_packages from setuptools import setup import re @@ -49,8 +49,7 @@ "test": ["pytest", "pytest-xdist", "nbmake"], "all": ["numpydoc", "sphinx", "sphinx_rtd_theme", "sphinxcontrib.bibtex", "plotly", "igraph", "pytest", "pytest-xdist", "nbmake"]}, - packages=find_namespace_packages(where="pandapipes"), - package_dir={"": "pandapipes"}, + packages=find_packages(), include_package_data=True, classifiers=classifiers )