Skip to content

Commit

Permalink
Merge pull request #578 from SimonRubenDrauz/bugfix/setup.py
Browse files Browse the repository at this point in the history
solves pip install problem
  • Loading branch information
SimonRubenDrauz authored Dec 21, 2023
2 parents 2cc403a + 60761fb commit d71c344
Show file tree
Hide file tree
Showing 392 changed files with 35 additions and 28 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/run_tests_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,17 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install pytest nbmake pytest-xdist pytest-split igraph
python -m pip install pytest nbmake pytest-xdist pytest-split igraph
if ${{ matrix.python-version != '3.11' }}; then python -m pip install numba; fi
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
pip install .
python -m pip install .
- name: List all installed packages
run: |
pip list
- name: Test with pytest
run: |
pytest --nbmake -n=auto "./tutorials"
python -m pytest --nbmake -n=auto "./tutorials"
docs_check:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Change Log
-------------------------------
- [ADDED] multiple creation of heat exchanger
- [ADDED] support Python 3.11 (now included in test pipeline)
- [ADDED] after the connectivity check, intercept the pipeflow if no more nodes are in-service
- [ADDED] after the connectivity check, intercept the pipeflow if no more nodes are in-service (heat and hydraulic)
- [CHANGED] dropped support for Python 3.7 (no longer included in test pipeline)
- [CHANGED] connectivity check now separated by hydraulics and heat_transfer calculation, so that also results can differ in some rows (NaN or not)
- [CHANGED] dynamic creation of lookups for getting pit as pandas tables
Expand Down
8 changes: 2 additions & 6 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
include LICENSE AUTHORS README.rst CHANGELOG.rst .github/**/*.yml
global-include *.json
global-include *.csv
global-include *.txt
graft src

prune doc*
prune tutorials*
include LICENSE AUTHORS README.rst CHANGELOG.rst .github/**/*.yml
10 changes: 6 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
# 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_packages
from setuptools import setup
import re

from setuptools import find_namespace_packages
from setuptools import setup

with open('README.rst', 'rb') as f:
install = f.read().decode('utf-8')

Expand Down Expand Up @@ -40,7 +41,7 @@
'jolando.kisse@uni-kassel.de',
description='A pipeflow calculation tool that complements pandapower in the simulation of multi energy grids',
long_description=long_description,
long_description_content_type='text/x-rst',
long_description_content_type='text/x-rst',
url='http://www.pandapipes.org',
license='BSD',
install_requires=["pandapower>=2.11.1", "matplotlib", "shapely"],
Expand All @@ -49,7 +50,8 @@
"test": ["pytest", "pytest-xdist", "nbmake"],
"all": ["numpydoc", "sphinx", "sphinx_rtd_theme", "sphinxcontrib.bibtex",
"plotly", "igraph", "pytest", "pytest-xdist", "nbmake"]},
packages=find_packages(),
packages=find_namespace_packages(where='src'),
package_dir={"": "src"},
include_package_data=True,
classifiers=classifiers
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

logger = logging.getLogger(__name__)


def create_empty_multinet(name=""):
"""
This function initializes the multinet datastructure.
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

import tqdm
from pandapipes.multinet.control.run_control_multinet import prepare_run_ctrl, run_control
from pandapipes.timeseries.run_time_series import init_default_outputwriter as init_default_ow_pps
from pandapower import pandapowerNet
from pandapower.control.util.diagnostic import control_diagnostic
from pandapower.timeseries.run_time_series import get_recycle_settings, init_time_steps, \
output_writer_routine, cleanup, run_loop, init_default_outputwriter as init_default_ow_pp, \
init_output_writer

from pandapipes import pandapipesNet
from pandapipes.multinet.control.run_control_multinet import prepare_run_ctrl, run_control
from pandapipes.timeseries.run_time_series import init_default_outputwriter as init_default_ow_pps

try:
import pandaplan.core.pplog as pplog
Expand Down Expand Up @@ -40,7 +40,8 @@ def _call_output_writer(multinet, time_step, pf_converged, ctrl_converged, ts_va
"""
for net_name in multinet['nets'].keys():
net = multinet['nets'][net_name]
output_writer_routine(net, time_step, pf_converged, ctrl_converged, ts_variables['nets'][net_name]["recycle_options"])
output_writer_routine(net, time_step, pf_converged, ctrl_converged,
ts_variables['nets'][net_name]["recycle_options"])


def init_time_series(multinet, time_steps, continue_on_divergence=False, verbose=True,
Expand Down Expand Up @@ -80,7 +81,8 @@ def init_time_series(multinet, time_steps, continue_on_divergence=False, verbose
if hasattr(run, "__name__") and run.__name__ == "runpp":
# use faster runpp options if possible
recycle_options = get_recycle_settings(net, **kwargs)
ts_variables['nets'][net_name]['run'] = run[net_name] if run is not None else ts_variables['nets'][net_name]['run']
ts_variables['nets'][net_name]['run'] = run[
net_name] if run is not None else ts_variables['nets'][net_name]['run']
ts_variables['nets'][net_name]['recycle_options'] = recycle_options
init_output_writer(net, time_steps)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit d71c344

Please sign in to comment.