Skip to content

Commit 89ba19a

Browse files
committed
FIX: No longer depending on pydotplus (networkx >=2.0 update)
Fixes: #3244
1 parent 97ce446 commit 89ba19a

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

nipype/info.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def get_nipype_gitversion():
9999

100100
# versions
101101
NIBABEL_MIN_VERSION = "2.1.0"
102-
NETWORKX_MIN_VERSION = "1.9"
102+
NETWORKX_MIN_VERSION = "2.0"
103103
NUMPY_MIN_VERSION = "1.13"
104104
# Numpy bug in python 3.7:
105105
# https://www.opensourceanswers.com/blog/you-shouldnt-use-python-37-for-data-science-right-now.html

nipype/interfaces/cmtk/nx.py

-5
Original file line numberDiff line numberDiff line change
@@ -289,11 +289,6 @@ def compute_singlevalued_measures(ntwk, weighted=True, calculate_cliques=False):
289289
iflogger.info("Computing single valued measures:")
290290
measures = {}
291291
iflogger.info("...Computing degree assortativity (pearson number) ...")
292-
try:
293-
measures["degree_pearsonr"] = nx.degree_pearsonr(ntwk)
294-
except AttributeError: # For NetworkX 1.6
295-
measures["degree_pearsonr"] = nx.degree_pearson_correlation_coefficient(ntwk)
296-
iflogger.info("...Computing degree assortativity...")
297292
try:
298293
measures["degree_assortativity"] = nx.degree_assortativity(ntwk)
299294
except AttributeError:

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Auto-generated by tools/update_requirements.py
22
click>=6.6.0
3-
networkx>=1.9
3+
networkx>=2.0
44
nibabel>=2.1.0
55
numpy>=1.13 ; python_version < "3.7"
66
numpy>=1.15.3 ; python_version >= "3.7"

0 commit comments

Comments
 (0)