From 53516fb75f782d358fd2fe735118d3be935d0bba Mon Sep 17 00:00:00 2001 From: jswhit Date: Tue, 29 Sep 2020 10:39:40 -0600 Subject: [PATCH 1/5] mods needed for cftime PR #202 --- nc_time_axis/tests/integration/test_plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nc_time_axis/tests/integration/test_plot.py b/nc_time_axis/tests/integration/test_plot.py index ba1d5b7..780a8fd 100644 --- a/nc_time_axis/tests/integration/test_plot.py +++ b/nc_time_axis/tests/integration/test_plot.py @@ -26,7 +26,7 @@ def tearDown(self): plt.close('all') def test_360_day_calendar_CalendarDateTime(self): - datetimes = [cftime.datetime(1986, month, 30) + datetimes = [cftime.datetime(1986, month, 30, calendar='360_day') for month in range(1, 6)] cal_datetimes = [nc_time_axis.CalendarDateTime(dt, '360_day') for dt in datetimes] From 0f94586adbd1208e848bc41e7ab43061256e92c0 Mon Sep 17 00:00:00 2001 From: Jeff Whitaker Date: Fri, 6 Nov 2020 19:32:33 -0700 Subject: [PATCH 2/5] comment out test in test_NetCDFTimeDateLocator.py --- nc_time_axis/tests/integration/test_plot.py | 2 +- .../tests/unit/test_NetCDFTimeDateLocator.py | 21 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/nc_time_axis/tests/integration/test_plot.py b/nc_time_axis/tests/integration/test_plot.py index 780a8fd..40dcabf 100644 --- a/nc_time_axis/tests/integration/test_plot.py +++ b/nc_time_axis/tests/integration/test_plot.py @@ -35,7 +35,7 @@ def test_360_day_calendar_CalendarDateTime(self): np.testing.assert_array_equal(result_ydata, cal_datetimes) def test_360_day_calendar_raw_dates(self): - datetimes = [cftime.Datetime360Day(1986, month, 30) + datetimes = [cftime.Datetime360Day(1986, month, 30, calendar='360_day') for month in range(1, 6)] line1, = plt.plot(datetimes) result_ydata = line1.get_ydata() diff --git a/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py b/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py index ed48f43..5d5b946 100644 --- a/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py +++ b/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py @@ -143,16 +143,17 @@ def check(self, max_n_ticks, num1, num2, calendar): ) return locator.tick_values(num1, num2) - def test_yearly_yr0_remove(self): - for calendar in self.all_calendars: - # convert values to dates, check that none of them has year 0 - num2date = cftime.utime(self.date_unit, calendar).num2date - ticks = self.check(5, 0, 100 * 365, calendar) - year_ticks = [num2date(t).year for t in ticks] - if calendar in self.yr0_remove_calendars: - self.assertNotIn(0, year_ticks) - else: - self.assertIn(0, year_ticks) +""" def test_yearly_yr0_remove(self): + for calendar in self.all_calendars: + # convert values to dates, check that none of them has year 0 + num2date = cftime.utime(self.date_unit, calendar).num2date + ticks = self.check(5, 0, 100 * 365, calendar) + year_ticks = [num2date(t).year for t in ticks] + if calendar in self.yr0_remove_calendars: + self.assertNotIn(0, year_ticks) + else: + self.assertIn(0, year_ticks) +""" if __name__ == "__main__": From 5a2cbb0d526819e205618bf3a16fdd99d678c379 Mon Sep 17 00:00:00 2001 From: Jeff Whitaker Date: Sat, 16 Jan 2021 09:16:12 -0700 Subject: [PATCH 3/5] address comments by reviewer --- nc_time_axis/tests/integration/test_plot.py | 4 ++-- nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nc_time_axis/tests/integration/test_plot.py b/nc_time_axis/tests/integration/test_plot.py index 40dcabf..b15faff 100644 --- a/nc_time_axis/tests/integration/test_plot.py +++ b/nc_time_axis/tests/integration/test_plot.py @@ -26,7 +26,7 @@ def tearDown(self): plt.close('all') def test_360_day_calendar_CalendarDateTime(self): - datetimes = [cftime.datetime(1986, month, 30, calendar='360_day') + datetimes = [cftime.datetime(1986, month, 30, calendar=None) for month in range(1, 6)] cal_datetimes = [nc_time_axis.CalendarDateTime(dt, '360_day') for dt in datetimes] @@ -35,7 +35,7 @@ def test_360_day_calendar_CalendarDateTime(self): np.testing.assert_array_equal(result_ydata, cal_datetimes) def test_360_day_calendar_raw_dates(self): - datetimes = [cftime.Datetime360Day(1986, month, 30, calendar='360_day') + datetimes = [cftime.Datetime360Day(1986, month, 30) for month in range(1, 6)] line1, = plt.plot(datetimes) result_ydata = line1.get_ydata() diff --git a/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py b/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py index 5d5b946..0f6b789 100644 --- a/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py +++ b/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py @@ -143,7 +143,7 @@ def check(self, max_n_ticks, num1, num2, calendar): ) return locator.tick_values(num1, num2) -""" def test_yearly_yr0_remove(self): + def test_yearly_yr0_remove(self): for calendar in self.all_calendars: # convert values to dates, check that none of them has year 0 num2date = cftime.utime(self.date_unit, calendar).num2date @@ -153,7 +153,7 @@ def check(self, max_n_ticks, num1, num2, calendar): self.assertNotIn(0, year_ticks) else: self.assertIn(0, year_ticks) -""" + if __name__ == "__main__": From e18bdac3a806e21e99548b34dc1ddc549bd88599 Mon Sep 17 00:00:00 2001 From: Jeff Whitaker Date: Sat, 16 Jan 2021 09:17:48 -0700 Subject: [PATCH 4/5] remove extra whitespace --- .../tests/unit/test_NetCDFTimeDateLocator.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py b/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py index 0f6b789..916ab51 100644 --- a/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py +++ b/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py @@ -144,15 +144,15 @@ def check(self, max_n_ticks, num1, num2, calendar): return locator.tick_values(num1, num2) def test_yearly_yr0_remove(self): - for calendar in self.all_calendars: - # convert values to dates, check that none of them has year 0 - num2date = cftime.utime(self.date_unit, calendar).num2date - ticks = self.check(5, 0, 100 * 365, calendar) - year_ticks = [num2date(t).year for t in ticks] - if calendar in self.yr0_remove_calendars: - self.assertNotIn(0, year_ticks) - else: - self.assertIn(0, year_ticks) + for calendar in self.all_calendars: + # convert values to dates, check that none of them has year 0 + num2date = cftime.utime(self.date_unit, calendar).num2date + ticks = self.check(5, 0, 100 * 365, calendar) + year_ticks = [num2date(t).year for t in ticks] + if calendar in self.yr0_remove_calendars: + self.assertNotIn(0, year_ticks) + else: + self.assertIn(0, year_ticks) From f5c5ca7a4581a67d8b2988ae997804ed8e26ca77 Mon Sep 17 00:00:00 2001 From: Jeff Whitaker Date: Sat, 16 Jan 2021 09:18:29 -0700 Subject: [PATCH 5/5] remove extra line --- nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py | 1 - 1 file changed, 1 deletion(-) diff --git a/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py b/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py index 916ab51..ed48f43 100644 --- a/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py +++ b/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py @@ -155,6 +155,5 @@ def test_yearly_yr0_remove(self): self.assertIn(0, year_ticks) - if __name__ == "__main__": unittest.main()