Skip to content

Commit

Permalink
replace "python-igraph" by "igraph"
Browse files Browse the repository at this point in the history
it has been renamed
  • Loading branch information
jkisse committed Jul 20, 2023
1 parent 70071d2 commit cb3d5ff
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/github_test_action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install pytest nbmake pytest-xdist python-igraph numba seaborn
python -m pip install pytest nbmake pytest-xdist igraph numba seaborn
./.install_julia.sh 1.8
pip install julia
python ./.install_pycall.py
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install pytest python-igraph pytest-split seaborn matplotlib plotly geopandas ortools xlsxwriter openpyxl cryptography psycopg2 matpowercaseframes
python -m pip install pytest igraph pytest-split seaborn matplotlib plotly geopandas ortools xlsxwriter openpyxl cryptography psycopg2 matpowercaseframes
- name: Install pandapower from TestPyPI
if: inputs.upload_server == 'testpypi'
run: |
Expand Down
2 changes: 1 addition & 1 deletion doc/plotting/matplotlib/generic.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Generic Coordinates
If there are no geocoordinates in a network, generic coordinates can be created. There are two possibilities:

1. igraph (http:/igraph.org/python) (recommended) based on
- python-igraph
- igraph
- pycairo

2. graphviz (http:/www.graphviz.org) based on
Expand Down
4 changes: 2 additions & 2 deletions pandapower/plotting/generic_geodata.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def build_igraph_from_pp(net, respect_switches=False, buses=None):
graph, meshed, roots = build_igraph_from_pp(net)
"""
if not IGRAPH_INSTALLED:
soft_dependency_error(str(sys._getframe().f_code.co_name)+"()", "python-igraph")
soft_dependency_error(str(sys._getframe().f_code.co_name)+"()", "igraph")
g = igraph.Graph(directed=True)
bus_index = net.bus.index if buses is None else np.array(buses)
nr_buses = len(bus_index)
Expand Down Expand Up @@ -191,7 +191,7 @@ def create_generic_coordinates(net, mg=None, library="igraph",
_prepare_geodata_table(net, geodata_table, overwrite)
if library == "igraph":
if not IGRAPH_INSTALLED:
soft_dependency_error("build_igraph_from_pp()", "python-igraph")
soft_dependency_error("build_igraph_from_pp()", "igraph")
graph, meshed, roots = build_igraph_from_pp(net, respect_switches, buses=buses)
coords = coords_from_igraph(graph, roots, meshed)
elif library == "networkx":
Expand Down
4 changes: 2 additions & 2 deletions pandapower/test/plotting/test_generic_coordinates.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
IGRAPH_INSTALLED = False


@pytest.mark.skipif(IGRAPH_INSTALLED is False, reason="Requires python-igraph.")
@pytest.mark.skipif(IGRAPH_INSTALLED is False, reason="Requires igraph.")
def test_create_generic_coordinates_igraph():
net = create_test_network()
net.bus_geodata.drop(net.bus_geodata.index, inplace=True)
Expand All @@ -32,7 +32,7 @@ def test_create_generic_coordinates_nx():
create_generic_coordinates(net, library="networkx")
assert len(net.bus_geodata) == len(net.bus)

@pytest.mark.skipif(IGRAPH_INSTALLED is False, reason="Requires python-igraph.")
@pytest.mark.skipif(IGRAPH_INSTALLED is False, reason="Requires igraph.")
def test_create_generic_coordinates_igraph_custom_table_index():
net = nw.simple_four_bus_system()
for buses in [[0,1], [0,2], [0,1,2]]:
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"deepdiff"],
extras_require={
"docs": ["numpydoc", "sphinx", "sphinx_rtd_theme"],
"plotting": ["plotly", "matplotlib", "python-igraph", "geopandas", "geojson"],
"plotting": ["plotly", "matplotlib", "igraph", "geopandas", "geojson"],
# "shapely", "pyproj" are dependencies of geopandas and so already available;
# "base64", "hashlib", "zlib" produce installing problems, so they are not included
"test": ["pytest<=7.0", "pytest-xdist"],
Expand All @@ -62,7 +62,7 @@
# "fiona" is a depedency of geopandas and so already available
"converter": ["matpowercaseframes"],
"all": ["numpydoc", "sphinx", "sphinx_rtd_theme",
"plotly>=3.1.1", "matplotlib", "python-igraph", "geopandas", "geojson",
"plotly>=3.1.1", "matplotlib", "igraph", "geopandas", "geojson",
"pytest<=7.0", "pytest-xdist",
"ortools", # lightsim2grid,
"xlsxwriter", "openpyxl", "cryptography",
Expand Down
2 changes: 1 addition & 1 deletion tutorials/plotting_basic.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"This function plots geodata if it is available and generates generic geodata if none is available. Note that you need the python-igraph package to generate geocoordinates (see last chapter of this tutorial).\n",
"This function plots geodata if it is available and generates generic geodata if none is available. Note that you need the igraph package to generate geocoordinates (see last chapter of this tutorial).\n",
"\n"
]
},
Expand Down
2 changes: 1 addition & 1 deletion tutorials/plotting_structural.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"source": [
"If a network does not have geographic coordinates, you can create generic coordinates for plotting with the create_generic_coordinates function.\n",
"\n",
"###### You need to install the python-igraph package for this functionality: http://igraph.org/python/"
"###### You need to install the igraph package for this functionality: http://igraph.org/python/"
]
},
{
Expand Down

0 comments on commit cb3d5ff

Please sign in to comment.