Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into forceatlas2-networkx
Browse files Browse the repository at this point in the history
  • Loading branch information
cvanelteren committed Mar 21, 2024
2 parents d1bc136 + 0efae02 commit ba43aea
Show file tree
Hide file tree
Showing 184 changed files with 2,768 additions and 888 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ updates:
directory: "/"
schedule:
interval: "monthly"
groups:
actions:
patterns:
- "*"
labels:
- "type: Maintenance"
- package-ecosystem: "pip"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: List contents of wheel
run: python -m zipfile --list dist/networkx-*.whl
- name: Upload nighlty wheel
uses: scientific-python/upload-nightly-action@6e9304f7a3a5501c6f98351537493ec898728299 # 0.3.0
uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0
with:
anaconda_nightly_upload_token: ${{ secrets.ANACONDA_NIGHTLY }}
artifacts_path: dist/
1 change: 1 addition & 0 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"image_scrapers": ("matplotlib",),
"matplotlib_animations": True,
"plot_gallery": "True",
"reference_url": {"sphinx_gallery": None},
}
# Add pygraphviz png scraper, if available
try:
Expand Down
2 changes: 2 additions & 0 deletions doc/developer/about_us.rst
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ to add your name to the bottom of the list.
- Davide D'Ascenzo, Github: `https://github.com/kidara`
- Flavio Furia, Github: `https://github.com/flaviofuria`
- Sebastiano Vigna, Github: `https://github.com/vigna`
- Aaron Zolnai-Lucas, GitHub: `aaronzo <https://github.com/aaronzo>`_, LinkedIn: `aaronzolnailucas <https://www.linkedin.com/in/aaronzolnailucas/>`_
- Erik Welch, GitHub: `eriknw <https://github.com/eriknw>`_, LinkedIn: `eriknwelch <https://www.linkedin.com/in/eriknwelch/>`_

A supplementary (but still incomplete) list of contributors is given by the
list of names that have commits in ``networkx``'s
Expand Down
3 changes: 3 additions & 0 deletions doc/developer/deprecations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ Version 3.5
to return a dict. See #6527
* Change ``shortest_path`` in ``algorithms/shortest_path/generic.py``
to return a iterator. See #6527
* Remove ``total_spanning_tree_weight`` from ``linalg/laplacianmatrix.py``
* Remove ``create`` keyword argument from ``nonisomorphic_trees`` in
``generators/nonisomorphic_trees``.
8 changes: 8 additions & 0 deletions doc/reference/algorithms/assortativity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Assortativity
.. autosummary::
:toctree: generated/

.. _networkx.algorithms.assortativity.correlation:

Assortativity
-------------
.. autosummary::
Expand All @@ -16,13 +18,16 @@ Assortativity
numeric_assortativity_coefficient
degree_pearson_correlation_coefficient

.. _networkx.algorithms.assortativity.neighbor_degree:

Average neighbor degree
-----------------------
.. autosummary::
:toctree: generated/

average_neighbor_degree

.. _networkx.algorithms.assortativity.connectivity:

Average degree connectivity
---------------------------
Expand All @@ -31,6 +36,7 @@ Average degree connectivity

average_degree_connectivity

.. _networkx.algorithms.assortativity.mixing:

Mixing
------
Expand All @@ -43,6 +49,8 @@ Mixing
degree_mixing_dict
mixing_dict

.. _networkx.algorithms.assortativity.pairs:

Pairs
-----
.. autosummary::
Expand Down
10 changes: 10 additions & 0 deletions doc/reference/algorithms/broadcasting.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
************
Broadcasting
************

.. automodule:: networkx.algorithms.broadcasting
.. autosummary::
:toctree: generated/

tree_broadcast_center
tree_broadcast_time
34 changes: 34 additions & 0 deletions doc/reference/algorithms/centrality.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Centrality

.. automodule:: networkx.algorithms.centrality

.. _networkx.algorithms.centrality.degree_alg:

Degree
------
.. autosummary::
Expand All @@ -13,6 +15,9 @@ Degree
in_degree_centrality
out_degree_centrality

.. _networkx.algorithms.centrality.eigenvector:
.. _networkx.algorithms.centrality.katz:

Eigenvector
-----------
.. autosummary::
Expand All @@ -23,6 +28,8 @@ Eigenvector
katz_centrality
katz_centrality_numpy

.. _networkx.algorithms.centrality.closeness:

Closeness
---------
.. autosummary::
Expand All @@ -31,6 +38,8 @@ Closeness
closeness_centrality
incremental_closeness_centrality

.. _networkx.algorithms.centrality.current_flow_closeness:

Current Flow Closeness
----------------------
.. autosummary::
Expand All @@ -39,6 +48,9 @@ Current Flow Closeness
current_flow_closeness_centrality
information_centrality

.. _networkx.algorithms.centrality.betweenness:
.. _networkx.algorithms.centrality.betweenness_subset:

(Shortest Path) Betweenness
---------------------------
.. autosummary::
Expand All @@ -49,6 +61,8 @@ Current Flow Closeness
edge_betweenness_centrality
edge_betweenness_centrality_subset

.. _networkx.algorithms.centrality.current_flow_betweenness:
.. _networkx.algorithms.centrality.current_flow_betweenness_subset:

Current Flow Betweenness
------------------------
Expand All @@ -68,6 +82,8 @@ Communicability Betweenness

communicability_betweenness_centrality

.. _networkx.algorithms.centrality.group:

Group Centrality
----------------
.. autosummary::
Expand All @@ -80,6 +96,8 @@ Group Centrality
group_out_degree_centrality
prominent_group

.. _networkx.algorithms.centrality.load:

Load
----
.. autosummary::
Expand All @@ -88,6 +106,8 @@ Load
load_centrality
edge_load_centrality

.. _networkx.algorithms.centrality.subgraph_alg:

Subgraph
--------
.. autosummary::
Expand All @@ -97,6 +117,8 @@ Subgraph
subgraph_centrality_exp
estrada_index

.. _networkx.algorithms.centrality.harmonic:

Harmonic Centrality
-------------------
.. autosummary::
Expand All @@ -111,6 +133,8 @@ Dispersion

dispersion

.. _networkx.algorithms.centrality.reaching:

Reaching
--------
.. autosummary::
Expand All @@ -119,20 +143,26 @@ Reaching
local_reaching_centrality
global_reaching_centrality

.. _networkx.algorithms.centrality.percolation:

Percolation
-----------
.. autosummary::
:toctree: generated/

percolation_centrality

.. _networkx.algorithms.centrality.second_order:

Second Order Centrality
-----------------------
.. autosummary::
:toctree: generated/

second_order_centrality

.. _networkx.algorithms.centrality.trophic:

Trophic
-------
.. autosummary::
Expand All @@ -142,13 +172,17 @@ Trophic
trophic_differences
trophic_incoherence_parameter

.. _networkx.algorithms.centrality.voterank_alg:

VoteRank
--------
.. autosummary::
:toctree: generated/

voterank

.. _networkx.algorithms.centrality.laplacian:

Laplacian
---------
.. autosummary::
Expand Down
3 changes: 3 additions & 0 deletions doc/reference/algorithms/coloring.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.. _networkx.algorithms.coloring.greedy_coloring:
.. _networkx.algorithms.coloring.equitable_coloring:

********
Coloring
********
Expand Down
2 changes: 1 addition & 1 deletion doc/reference/algorithms/community.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Bipartitions
kernighan_lin_bisection

Divisive Communities
---------------------
--------------------
.. automodule:: networkx.algorithms.community.divisive
.. autosummary::
:toctree: generated/
Expand Down
12 changes: 12 additions & 0 deletions doc/reference/algorithms/component.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Components
**********
.. automodule:: networkx.algorithms.components

.. _networkx.algorithms.components.connected:

Connectivity
------------
.. autosummary::
Expand All @@ -13,6 +15,8 @@ Connectivity
connected_components
node_connected_component

.. _networkx.algorithms.components.strongly_connected:

Strong connectivity
-------------------
.. autosummary::
Expand All @@ -25,6 +29,8 @@ Strong connectivity
kosaraju_strongly_connected_components
condensation

.. _networkx.algorithms.components.weakly_connected:

Weak connectivity
-----------------
.. autosummary::
Expand All @@ -34,6 +40,8 @@ Weak connectivity
number_weakly_connected_components
weakly_connected_components

.. _networkx.algorithms.components.attracting:

Attracting components
---------------------
.. autosummary::
Expand All @@ -43,6 +51,8 @@ Attracting components
number_attracting_components
attracting_components

.. _networkx.algorithms.components.biconnected:

Biconnected components
----------------------
.. autosummary::
Expand All @@ -53,6 +63,8 @@ Biconnected components
biconnected_component_edges
articulation_points

.. _networkx.algorithms.components.semiconnected:

Semiconnectedness
-----------------
.. autosummary::
Expand Down
11 changes: 11 additions & 0 deletions doc/reference/algorithms/flow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Flows

.. automodule:: networkx.algorithms.flow

.. _networkx.algorithms.flow.maxflow:

Maximum Flow
------------
Expand All @@ -15,6 +16,7 @@ Maximum Flow
minimum_cut
minimum_cut_value

.. _networkx.algorithms.flow.edmondskarp:

Edmonds-Karp
------------
Expand All @@ -23,6 +25,7 @@ Edmonds-Karp

edmonds_karp

.. _networkx.algorithms.flow.shortestaugmentingpath:

Shortest Augmenting Path
------------------------
Expand All @@ -31,6 +34,7 @@ Shortest Augmenting Path

shortest_augmenting_path

.. _networkx.algorithms.flow.preflowpush:

Preflow-Push
------------
Expand All @@ -39,6 +43,7 @@ Preflow-Push

preflow_push

.. _networkx.algorithms.flow.dinitz_alg:

Dinitz
------
Expand All @@ -47,6 +52,7 @@ Dinitz

dinitz

.. _networkx.algorithms.flow.boykovkolmogorov:

Boykov-Kolmogorov
-----------------
Expand All @@ -55,6 +61,7 @@ Boykov-Kolmogorov

boykov_kolmogorov

.. _networkx.algorithms.flow.gomory_hu:

Gomory-Hu Tree
--------------
Expand All @@ -63,6 +70,7 @@ Gomory-Hu Tree

gomory_hu_tree

.. _networkx.algorithms.flow.utils:

Utils
-----
Expand All @@ -71,6 +79,8 @@ Utils

build_residual_network

.. _networkx.algorithms.flow.mincost:
.. _networkx.algorithms.flow.networksimplex:

Network Simplex
---------------
Expand All @@ -83,6 +93,7 @@ Network Simplex
cost_of_flow
max_flow_min_cost

.. _networkx.algorithms.flow.capacityscaling:

Capacity Scaling Minimum Cost Flow
----------------------------------
Expand Down
Loading

0 comments on commit ba43aea

Please sign in to comment.