Skip to content

Commit e597e7a

Browse files
committed
Merge branch 'develop'
2 parents 07101d7 + 90036da commit e597e7a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+535
-479
lines changed

.github/workflows/wheels_build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ jobs:
2020
env:
2121
CIBW_PLATFORM: auto
2222
CIBW_ARCHS: auto64
23-
CIBW_SKIP: cp*-musllinux*
23+
CIBW_SKIP: cp*-musllinux* *-win32
2424
CIBW_ARCHS_MACOS: x86_64 arm64
2525
CIBW_BUILD_VERBOSITY: 3
2626
CIBW_BEFORE_BUILD: "pip install -r requirements_dev.txt && pip install ."
27-
CIBW_BEFORE_BUILD_MACOS: "pip install -r requirements_dev.txt && pip install ."
2827
CIBW_BUILD: cp39-* cp310-* cp311-* cp312-* cp313-*
2928

3029
- uses: actions/upload-artifact@v4

HISTORY.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
History
33
=======
44

5+
0.33.4 (2025-11-14)
6+
-------------------
7+
8+
* Fix Windows wheel build #589
9+
* Fix MacOS wheel build #591
10+
511
0.33.3 (2025-05-15)
612
-------------------
713

docs/first_steps.rst

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ Import scikit-network in Python:
4242
4343
import sknetwork as skn
4444
45-
Usage
46-
-----
45+
Get started
46+
-----------
4747

48-
A graph is represented by its :term:`adjacency` matrix (square matrix). When the graph is bipartite, it can be represented by its :term:`biadjacency` matrix (rectangular matrix).
49-
Check our :ref:`tutorial<DataTag>` for various ways of loading a graph
48+
A graph is represented by its :term:`adjacency` matrix. When the graph is bipartite,
49+
it can be represented by its :term:`biadjacency` matrix (most often, a rectangular matrix). Check our :ref:`tutorial<DataTag>` for various ways of loading a graph
5050
(from a list of edges, a dataframe or a CSV file, for instance).
5151

5252
Each algorithm is represented as an object with a ``fit`` method.
@@ -63,6 +63,10 @@ Here is an example to cluster the `Karate club graph`_ with the `Louvain algorit
6363
algorithm.fit(adjacency)
6464
6565
66+
If the graph is bipartite, the algorithm applies to
67+
nodes corresponding to the rows of the :term:`biadjacency` matrix; specific outputs for nodes corresponding to
68+
rows and columns of the biadjacency matrix can be obtained with the respective suffixes `_row_` and `_col_`.
69+
6670
More details are provided in this :ref:`tutorial<OverviewTag>`.
6771

6872
.. _Karate club graph: https://en.wikipedia.org/wiki/Zachary%27s_karate_club

docs/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Welcome to scikit-network's documentation!
55

66
.. toctree::
77
:maxdepth: 1
8-
:caption: Getting started
8+
:caption: Introduction
99

1010
first_steps
1111

@@ -48,7 +48,7 @@ Welcome to scikit-network's documentation!
4848

4949
.. toctree::
5050
:maxdepth: 1
51-
:caption: Examples
51+
:caption: Use cases
5252

5353
use_cases/text
5454
use_cases/wikipedia

docs/tutorials/data/load_collection.ipynb

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,22 @@
22
"cells": [
33
{
44
"cell_type": "markdown",
5-
"metadata": {},
5+
"metadata": {
6+
"pycharm": {
7+
"name": "#%% md\n"
8+
}
9+
},
610
"source": [
711
"# Datasets"
812
]
913
},
1014
{
1115
"cell_type": "markdown",
12-
"metadata": {},
16+
"metadata": {
17+
"pycharm": {
18+
"name": "#%% md\n"
19+
}
20+
},
1321
"source": [
1422
"This tutorial shows how to load graphs from the [NetSet](https://netset.telecom-paris.fr) collection."
1523
]
@@ -23,7 +31,8 @@
2331
"start_time": "2019-11-25T09:09:39.018204Z"
2432
},
2533
"pycharm": {
26-
"is_executing": false
34+
"is_executing": false,
35+
"name": "#%%\n"
2736
}
2837
},
2938
"outputs": [],
@@ -33,7 +42,11 @@
3342
},
3443
{
3544
"cell_type": "markdown",
36-
"metadata": {},
45+
"metadata": {
46+
"pycharm": {
47+
"name": "#%% md\n"
48+
}
49+
},
3750
"source": [
3851
"## NetSet\n",
3952
"\n",
@@ -43,7 +56,11 @@
4356
{
4457
"cell_type": "code",
4558
"execution_count": null,
46-
"metadata": {},
59+
"metadata": {
60+
"pycharm": {
61+
"name": "#%%\n"
62+
}
63+
},
4764
"outputs": [],
4865
"source": [
4966
"dataset = load_netset('openflights')\n",
@@ -54,7 +71,11 @@
5471
{
5572
"cell_type": "code",
5673
"execution_count": null,
57-
"metadata": {},
74+
"metadata": {
75+
"pycharm": {
76+
"name": "#%%\n"
77+
}
78+
},
5879
"outputs": [],
5980
"source": [
6081
"# to get all fields\n",
@@ -64,7 +85,11 @@
6485
{
6586
"cell_type": "code",
6687
"execution_count": null,
67-
"metadata": {},
88+
"metadata": {
89+
"pycharm": {
90+
"name": "#%%\n"
91+
}
92+
},
6893
"outputs": [],
6994
"source": [
7095
"# Directed graph\n",
@@ -77,7 +102,11 @@
77102
{
78103
"cell_type": "code",
79104
"execution_count": null,
80-
"metadata": {},
105+
"metadata": {
106+
"pycharm": {
107+
"name": "#%%\n"
108+
}
109+
},
81110
"outputs": [],
82111
"source": [
83112
"# Bipartite graph\n",
@@ -129,4 +158,4 @@
129158
},
130159
"nbformat": 4,
131160
"nbformat_minor": 2
132-
}
161+
}

0 commit comments

Comments
 (0)