FIX: No longer depending on pydotplus (networkx >=2.0 update)

Fixes: #3244
nipy · Sep 17, 2020 · 89ba19a · 89ba19a
1 parent 97ce446
commit 89ba19a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/nipype/info.py b/nipype/info.py
@@ -99,7 +99,7 @@ def get_nipype_gitversion():
 
 # versions
 NIBABEL_MIN_VERSION = "2.1.0"
-NETWORKX_MIN_VERSION = "1.9"
+NETWORKX_MIN_VERSION = "2.0"
 NUMPY_MIN_VERSION = "1.13"
 # Numpy bug in python 3.7:
 # https://www.opensourceanswers.com/blog/you-shouldnt-use-python-37-for-data-science-right-now.html

diff --git a/nipype/interfaces/cmtk/nx.py b/nipype/interfaces/cmtk/nx.py
@@ -289,11 +289,6 @@ def compute_singlevalued_measures(ntwk, weighted=True, calculate_cliques=False):
     iflogger.info("Computing single valued measures:")
     measures = {}
     iflogger.info("...Computing degree assortativity (pearson number) ...")
-    try:
-        measures["degree_pearsonr"] = nx.degree_pearsonr(ntwk)
-    except AttributeError:  # For NetworkX 1.6
-        measures["degree_pearsonr"] = nx.degree_pearson_correlation_coefficient(ntwk)
-    iflogger.info("...Computing degree assortativity...")
     try:
         measures["degree_assortativity"] = nx.degree_assortativity(ntwk)
     except AttributeError:

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 # Auto-generated by tools/update_requirements.py
 click>=6.6.0
-networkx>=1.9
+networkx>=2.0
 nibabel>=2.1.0
 numpy>=1.13 ; python_version < "3.7"
 numpy>=1.15.3 ; python_version >= "3.7"