8000 Adding refactored tests · DWesl/numpy@81b2a67 · GitHub
[go: up one dir, main page]
Skip to content

Commit 81b2a67

Browse files
V-R-SV-R-S
committed
Adding refactored tests
. .
1 parent 21c2e70 commit 81b2a67

File tree

2 files changed

+10
-23
lines changed

2 files changed

+10
-23
lines changed

‎numpy/_core/tests/test_datetime.py

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import datetime
22
import pickle
3+
from zoneinfo import ZoneInfo
34

45
import pytest
56

@@ -16,13 +17,6 @@
1617
suppress_warnings,
1718
)
1819

19-
# Use pytz to test out various time zones if available
20-
try:
21-
from pytz import timezone as tz
22-
_has_pytz = True
23-
except ImportError:
24-
_has_pytz = False
25-
2620
try:
2721
RecursionError
2822
except NameError:
@@ -1886,7 +1880,6 @@ def test_datetime_as_string(self):
18861880
np.datetime64('2032-01-01T00:00:00', 'us'), unit='auto'),
18871881
'2032-01-01')
18881882

1889-
@pytest.mark.skipif(not _has_pytz, reason="The pytz module is not available.")
18901883
def test_datetime_as_string_timezone(self):
18911884
# timezone='local' vs 'UTC'
18921885
a = np.datetime64('2010-03-15T06:30', 'm')
@@ -1901,29 +1894,29 @@ def test_datetime_as_string_timezone(self):
19011894

19021895
b = np.datetime64('2010-02-15T06:30', 'm')
19031896

1904-
assert_equal(np.datetime_as_string(a, timezone=tz('US/Central')),
1897+
assert_equal(np.datetime_as_string(a, timezone=ZoneInfo('US/Central')),
19051898
'2010-03-15T01:30-0500')
1906-
assert_equal(np.datetime_as_string(a, timezone=tz('US/Eastern')),
1899+
assert_equal(np.datetime_as_string(a, timezone=ZoneInfo('US/Eastern')),
19071900
'2010-03-15T02:30-0400')
1908-
assert_equal(np.datetime_as_string(a, timezone=tz('US/Pacific')),
1901+
assert_equal(np.datetime_as_string(a, timezone=ZoneInfo('US/Pacific')),
19091902
'2010-03-14T23:30-0700')
19101903

1911-
assert_equal(np.datetime_as_string(b, timezone=tz('US/Central')),
1904+
assert_equal(np.datetime_as_string(b, timezone=ZoneInfo('US/Central')),
19121905
'2010-02-15T00:30-0600')
1913-
assert_equal(np.datetime_as_string(b, timezone=tz('US/Eastern')),
1906+
assert_equal(np.datetime_as_string(b, timezone=ZoneInfo('US/Eastern')),
19141907
'2010-02-15T01:30-0500')
1915-
assert_equal(np.datetime_as_string(b, timezone=tz('US/Pacific')),
1908+
assert_equal(np.datetime_as_string(b, timezone=ZoneInfo('US/Pacific')),
19161909
'2010-02-14T22:30-0800')
19171910

19181911
# Dates to strings with a timezone attached is disabled by default
19191912
assert_raises(TypeError, np.datetime_as_string, a, unit='D',
1920-
timezone=tz('US/Pacific'))
1913+
timezone=ZoneInfo('US/Pacific'))
19211914
# Check that we can print out the date in the specified time zone
19221915
assert_equal(np.datetime_as_string(a, unit='D',
1923-
timezone=tz('US/Pacific'), casting='unsafe'),
1916+
timezone=ZoneInfo('US/Pacific'), casting='unsafe'),
19241917
'2010-03-14')
19251918
assert_equal(np.datetime_as_string(b, unit='D',
1926-
timezone=tz('US/Central'), casting='unsafe'),
1919+
timezone=ZoneInfo('US/Central'), casting='unsafe'),
19271920
'2010-02-15')
19281921

19291922
def test_datetime_arange(self):

‎numpy/_core/tests/test_deprecations.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
import numpy as np
1414
from numpy.testing import assert_raises, temppath
1515

16-
try:
17-
import pytz # noqa: F401
18-
_has_pytz = True
19-
except ImportError:
20-
_has_pytz = False
21-
2216

2317
class _DeprecationTestCase:
2418
# Just as warning: warnings uses re.match, so the start of this message

0 commit comments

Comments
 (0)
0