REF: Handle absence/presence of tzinfo

nipy · Nov 18, 2024 · b35aa95 · b35aa95
1 parent 68b5913
commit b35aa95
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/nipype/info.py b/nipype/info.py
@@ -99,12 +99,11 @@ def get_nipype_gitversion():
 """
 
 # versions
-NIBABEL_MIN_VERSION = "2.1.0"
-NETWORKX_MIN_VERSION = "2.0"
-NUMPY_MIN_VERSION = "1.17"
-NUMPY_MAX_VERSION = "2.0"
-SCIPY_MIN_VERSION = "0.14"
-TRAITS_MIN_VERSION = "4.6"
+NIBABEL_MIN_VERSION = "3.0"
+NETWORKX_MIN_VERSION = "2.5"
+NUMPY_MIN_VERSION = "1.21"
+SCIPY_MIN_VERSION = "1.8"
+TRAITS_MIN_VERSION = "6.2"
 DATEUTIL_MIN_VERSION = "2.2"
 SIMPLEJSON_MIN_VERSION = "3.8.0"
 PROV_MIN_VERSION = "1.5.2"

diff --git a/nipype/utils/draw_gantt_chart.py b/nipype/utils/draw_gantt_chart.py
@@ -302,7 +302,14 @@ def draw_nodes(start, nodes_list, cores, minute_scale, space_between_minutes, co
         # Left
         left = 60
         for core in range(len(end_times)):
-            if end_times[core] < node_start:
+            try:
+                end_time_condition = end_times[core] < node_start
+            except TypeError:
+                # if one has a timezone and one does not
+                end_time_condition = end_times[core].replace(
+                    tzinfo=None
+                ) < node_start.replace(tzinfo=None)
+            if end_time_condition:
                 left += core * 30
                 end_times[core] = datetime.datetime(
                     node_finish.year,