stop using CalendarDateTime

Author: rcomer

lib/iris/plot.py

@@ -591,7 +591,7 @@ def _fixup_dates(coord, values):
             r = [datetime.datetime(*date) for date in dates]
         else:
             try:
-                import nc_time_axis
+                import nc_time_axis  # noqa: F401
             except ImportError:
                 msg = (
                     "Cannot plot against time in a non-gregorian "
@@ -603,12 +603,10 @@ def _fixup_dates(coord, values):
                 raise IrisError(msg)
 
             r = [
-                nc_time_axis.CalendarDateTime(
-                    cftime.datetime(*date, calendar=coord.units.calendar),
-                    coord.units.calendar,
-                )
+                cftime.datetime(*date, calendar=coord.units.calendar)
                 for date in dates
             ]
+
         values = np.empty(len(r), dtype=object)
         values[:] = r
     return values

lib/iris/tests/integration/plot/test_netcdftime.py

@@ -18,10 +18,6 @@
 
 from iris.coords import AuxCoord
 
-if tests.NC_TIME_AXIS_AVAILABLE:
-    from nc_time_axis import CalendarDateTime
-
-
 # Run tests in no graphics mode if matplotlib is not available.
 if tests.MPL_AVAILABLE:
     import iris.plot as iplt
@@ -48,9 +44,8 @@ def test_360_day_calendar(self):
             )
             for atime in times
         ]
-        expected_ydata = np.array(
-            [CalendarDateTime(time, calendar) for time in times]
-        )
+
+        expected_ydata = times
         (line1,) = iplt.plot(time_coord)
         result_ydata = line1.get_ydata()
         self.assertArrayEqual(expected_ydata, result_ydata)

lib/iris/tests/unit/plot/test__fixup_dates.py

@@ -52,9 +52,7 @@ def test_360_day_calendar(self):
             cftime.datetime(2000, 2, 29, calendar=calendar),
             cftime.datetime(2000, 2, 30, calendar=calendar),
         ]
-        self.assertArrayEqual(
-            [cdt.datetime for cdt in result], expected_datetimes
-        )
+        self.assertArrayEqual(result, expected_datetimes)
 
     @tests.skip_nc_time_axis
     def test_365_day_calendar(self):
@@ -67,9 +65,7 @@ def test_365_day_calendar(self):
             cftime.datetime(2000, 2, 25, 1, 0, calendar=calendar),
             cftime.datetime(2000, 2, 25, 2, 30, calendar=calendar),
         ]
-        self.assertArrayEqual(
-            [cdt.datetime for cdt in result], expected_datetimes
-        )
+        self.assertArrayEqual(result, expected_datetimes)
 
     @tests.skip_nc_time_axis
     def test_360_day_calendar_attribute(self):