Skip to content

Commit b583838

Browse files
committed
Merge branch 'main' into develop
2 parents 554d38e + 2a25157 commit b583838

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

scripts/mkdoc.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,20 @@ cd ${ROOT_FOLDER}
4747

4848
# Create a virtual environment
4949
if [ ! -d ".venv" ]; then
50+
echo "Creating virtualenv..."
5051
${PYTHON:-python3} -m venv .venv
5152

5253
# Install sphinx, matplotlib, pandas, scipy, wheel and pydoctor into the venv.
5354
# doc2dash is optional; it will be installed when -d is given
5455
.venv/bin/pip install -q -U pip wheel sphinx==7.4.7 matplotlib pandas scipy pydoctor sphinx-rtd-theme
5556
else
5657
# Upgrade pip in the virtualenv
58+
echo "Upgrading pip in virtualenv..."
5759
.venv/bin/pip install -q -U pip wheel
5860
fi
5961

6062
# Make sure that Sphinx, PyDoctor (and maybe doc2dash) are up-to-date in the virtualenv
63+
echo "Making sure that all dependencies are up-to-date..."
6164
.venv/bin/pip install -q -U sphinx==7.4.7 pydoctor sphinx-gallery sphinxcontrib-jquery sphinx-rtd-theme
6265
if [ x$DOC2DASH = x1 ]; then
6366
.venv/bin/pip install -U doc2dash

src/_igraph/edgeobject.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,15 @@ PyDoc_STRVAR(
724724
" >>> e[\"weight\"] = 2 #doctest: +SKIP\n"
725725
" >>> print(e[\"weight\"]) #doctest: +SKIP\n"
726726
" 2\n"
727+
"\n"
728+
"@ivar source: Source vertex index of this edge\n"
729+
"@ivar source_vertex: Source vertex of this edge\n"
730+
"@ivar target: Target vertex index of this edge\n"
731+
"@ivar target_vertex: Target vertex of this edge\n"
732+
"@ivar tuple: Source and target vertex index of this edge as a tuple\n"
733+
"@ivar vertex_tuple: Source and target vertex of this edge as a tuple\n"
734+
"@ivar index: Index of this edge\n"
735+
"@ivar graph: The graph the edge belongs to\t"
727736
);
728737

729738
int igraphmodule_Edge_register_type() {

src/_igraph/vertexobject.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ PyDoc_STRVAR(
877877
" red\n"
878878
"\n"
879879
"@ivar index: Index of the vertex\n"
880-
"@ivar graph: The graph the vertex belongs to\n"
880+
"@ivar graph: The graph the vertex belongs to\t"
881881
);
882882

883883
int igraphmodule_Vertex_register_type() {

0 commit comments

Comments
 (0)