Merge branch 'networkx:main' into feature/closeness

.github/workflows/release.yml

@@ -15,11 +15,11 @@ jobs:
  # IMPORTANT: this permission is mandatory for trusted publishing
  id-token: write
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  fetch-depth: 0
 
- - uses: actions/setup-python@v4
+ - uses: actions/setup-python@v5
  name: Install Python
  with:
  python-version: "3.11"

.gitignore

@@ -135,3 +135,5 @@ html/
 
 # get_info update script
 temp__init__.py
+
+.DS_Store

.pre-commit-config.yaml

@@ -3,17 +3,11 @@
 
 repos:
  - repo: https:/adamchainz/blacken-docs
- rev: 1.16.0
+ rev: 1.18.0
  hooks:
  - id: blacken-docs
- - repo: https:/pre-commit/mirrors-prettier
- rev: v3.1.0
- hooks:
- - id: prettier
- files: \.(html|md|toml|yml|yaml)
- args: [--prose-wrap=preserve]
  - repo: https:/astral-sh/ruff-pre-commit
- rev: v0.1.8
+ rev: v0.6.7
  hooks:
  - id: ruff
  args:

_nx_parallel/__init__.py

@@ -77,7 +77,7 @@ def get_info():
  },
  },
  "approximate_all_pairs_node_connectivity": {
- "url": "https:/networkx/nx-parallel/blob/main/nx_parallel/algorithms/approximation/connectivity.py#L13",
+ "url": "https:/networkx/nx-parallel/blob/main/nx_parallel/algorithms/approximation/connectivity.py#L14",
  "additional_docs": "The parallel implementation first divides the a list of all permutation (in case of directed graphs) and combinations (in case of undirected graphs) of `nbunch` into chunks and then creates a generator to lazily compute the local node connectivities for each chunk, and then employs joblib's `Parallel` function to execute these computations in parallel across `n_jobs` number of CPU cores. At the end, the results are aggregated into a single dictionary and returned.",
  "additional_parameters": {
  'get_chunks : str, function (default = "chunks")': "A function that takes in `list(iter_func(nbunch, 2))` as input and returns an iterable `pairs_chunks`, here `iter_func` is `permutations` in case of directed graphs and `combinations` in case of undirected graphs. The default is to create chunks by slicing the list into `n_jobs` chunks, such that size of each chunk is atmost 10, and at least 1."
@@ -134,7 +134,7 @@ def get_info():
  },
  },
  "local_efficiency": {
- "url": "https:/networkx/nx-parallel/blob/main/nx_parallel/algorithms/efficiency_measures.py#L10",
+ "url": "https:/networkx/nx-parallel/blob/main/nx_parallel/algorithms/efficiency_measures.py#L11",
  "additional_docs": "The parallel computation is implemented by dividing the nodes into chunks and then computing and adding global efficiencies of all node in all chunks, in parallel, and then adding all these sums and dividing by the total number of nodes at the end.",
  "additional_parameters": {
  'get_chunks : str, function (default = "chunks")': "A function that takes in a list of all the nodes as input and returns an iterable `node_chunks`. The default chunking is done by slicing the `nodes` into `n_jobs` number of chunks."

nx_parallel/algorithms/approximation/connectivity.py

@@ -1,4 +1,5 @@
 """Parallel implementations of fast approximation for node connectivity"""
+
 import itertools
 from joblib import Parallel, delayed
 from networkx.algorithms.approximation.connectivity import local_node_connectivity

nx_parallel/algorithms/efficiency_measures.py

@@ -1,4 +1,5 @@
 """Provides functions for computing the efficiency of nodes and graphs."""
+
 import networkx as nx
 from joblib import Parallel, delayed
 import nx_parallel as nxp

pyproject.toml

@@ -48,6 +48,7 @@ parallel = "_nx_parallel:get_info"
 [project.optional-dependencies]
 developer = [
  'pre-commit==3.8.0',
+ 'ruff==0.6.7',
 ]
 test = [
  'pytest>=7.2',