summaryrefslogtreecommitdiff
path: root/networkx
diff options
context:
space:
mode:
authorRoss Barnowski <rossbar@berkeley.edu>2022-08-17 18:18:58 +0300
committerGitHub <noreply@github.com>2022-08-17 08:18:58 -0700
commite7cf969e4ceee1dd7f76d9214c7d52bb6258ca58 (patch)
treefca85430eb52e0f1432aee99e44558a74553d4b1 /networkx
parent09ded6ead5a9a3bb1d5b8349518fb5add6d10ca7 (diff)
downloadnetworkx-e7cf969e4ceee1dd7f76d9214c7d52bb6258ca58.tar.gz
Bump nodelink args deprecation expiration to v3.2 (#5933)
* Bump deprecation expiration for nodelink params to v3.2. * Fixup warnings filter.
Diffstat (limited to 'networkx')
-rw-r--r--networkx/conftest.py2
-rw-r--r--networkx/readwrite/json_graph/node_link.py12
2 files changed, 7 insertions, 7 deletions
diff --git a/networkx/conftest.py b/networkx/conftest.py
index a847dd9e..2fa779a9 100644
--- a/networkx/conftest.py
+++ b/networkx/conftest.py
@@ -145,7 +145,7 @@ def set_warnings():
warnings.filterwarnings(
"ignore",
category=DeprecationWarning,
- message="signature change for node_link functions",
+ message="\n\nThe `attrs` keyword argument of node_link",
)
diff --git a/networkx/readwrite/json_graph/node_link.py b/networkx/readwrite/json_graph/node_link.py
index 419cf05b..452f5c73 100644
--- a/networkx/readwrite/json_graph/node_link.py
+++ b/networkx/readwrite/json_graph/node_link.py
@@ -50,7 +50,7 @@ def node_link_data(
.. deprecated:: 2.8.6
The `attrs` keyword argument will be replaced with `source`, `target`, `name`,
- `key` and `link`. in networkx 3.1
+ `key` and `link`. in networkx 3.2
If the `attrs` keyword and the new keywords are both used in a single function call (not recommended)
the `attrs` keyword argument will take precedence.
@@ -127,7 +127,7 @@ def node_link_data(
msg = (
"\n\nThe `attrs` keyword argument of node_link_data is deprecated\n"
- "and will be removed in networkx 3.1. It is replaced with explicit\n"
+ "and will be removed in networkx 3.2. It is replaced with explicit\n"
"keyword arguments: `source`, `target`, `name`, `key` and `link`.\n"
"To make this warning go away, and ensure usage is forward\n"
"compatible, replace `attrs` with the keywords. "
@@ -135,7 +135,7 @@ def node_link_data(
" >>> node_link_data(G, attrs={'target': 'foo', 'name': 'bar'})\n\n"
"should instead be written as\n\n"
" >>> node_link_data(G, target='foo', name='bar')\n\n"
- "in networkx 3.1.\n"
+ "in networkx 3.2.\n"
"The default values of the keywords will not change.\n"
)
warnings.warn(msg, DeprecationWarning, stacklevel=2)
@@ -207,7 +207,7 @@ def node_link_graph(
.. deprecated:: 2.8.6
The `attrs` keyword argument will be replaced with the individual keywords: `source`, `target`, `name`,
- `key` and `link`. in networkx 3.1.
+ `key` and `link`. in networkx 3.2.
If the `attrs` keyword and the new keywords are both used in a single function call (not recommended)
the `attrs` keyword argument will take precedence.
@@ -272,7 +272,7 @@ def node_link_graph(
msg = (
"\n\nThe `attrs` keyword argument of node_link_graph is deprecated\n"
- "and will be removed in networkx 3.1. It is replaced with explicit\n"
+ "and will be removed in networkx 3.2. It is replaced with explicit\n"
"keyword arguments: `source`, `target`, `name`, `key` and `link`.\n"
"To make this warning go away, and ensure usage is forward\n"
"compatible, replace `attrs` with the keywords. "
@@ -280,7 +280,7 @@ def node_link_graph(
" >>> node_link_graph(data, attrs={'target': 'foo', 'name': 'bar'})\n\n"
"should instead be written as\n\n"
" >>> node_link_graph(data, target='foo', name='bar')\n\n"
- "in networkx 3.1.\n"
+ "in networkx 3.2.\n"
"The default values of the keywords will not change.\n"
)
warnings.warn(msg, DeprecationWarning, stacklevel=2)