|
4 | 4 | import enum
|
5 | 5 | import json
|
6 | 6 | from collections import OrderedDict
|
7 |
| -from datetime import date, datetime, timedelta |
| 7 | +from datetime import date, datetime, timedelta, timezone |
8 | 8 |
|
9 | 9 | import pytest
|
10 |
| -import pytz |
11 | 10 |
|
12 | 11 | import ibis.expr.datatypes as dt
|
13 | 12 |
|
@@ -94,9 +93,9 @@ def test_infer_mixed_type_fails():
|
94 | 93 |
|
95 | 94 |
|
96 | 95 | def test_infer_timestamp_with_tz():
|
97 |
| - now_utc = datetime.now(pytz.UTC) |
98 |
| - assert now_utc.tzinfo == pytz.UTC |
99 |
| - assert dt.infer(now_utc).timezone == str(pytz.UTC) |
| 96 | + now_utc = datetime.now(timezone.utc) |
| 97 | + assert now_utc.tzinfo == timezone.utc |
| 98 | + assert dt.infer(now_utc).timezone == str(timezone.utc) |
100 | 99 |
|
101 | 100 |
|
102 | 101 | def test_infer_timedelta():
|
@@ -127,19 +126,19 @@ def test_infer_timedelta():
|
127 | 126 | ("2019-01-01 01:02:03.000004", datetime(2019, 1, 1, 1, 2, 3, 4)),
|
128 | 127 | (
|
129 | 128 | "2019-01-01 01:02:03.000004+00:00",
|
130 |
| - datetime(2019, 1, 1, 1, 2, 3, 4, tzinfo=pytz.utc), |
| 129 | + datetime(2019, 1, 1, 1, 2, 3, 4, tzinfo=timezone.utc), |
131 | 130 | ),
|
132 | 131 | (
|
133 | 132 | "2019-01-01 01:02:03.000004+01:00",
|
134 |
| - datetime(2019, 1, 1, 1, 2, 3, 4, tzinfo=pytz.FixedOffset(60)), |
| 133 | + datetime(2019, 1, 1, 1, 2, 3, 4, tzinfo=timezone(timedelta(hours=1))), |
135 | 134 | ),
|
136 | 135 | (
|
137 | 136 | "2019-01-01 01:02:03.000004-01:00",
|
138 |
| - datetime(2019, 1, 1, 1, 2, 3, 4, tzinfo=pytz.FixedOffset(-60)), |
| 137 | + datetime(2019, 1, 1, 1, 2, 3, 4, tzinfo=timezone(timedelta(hours=-1))), |
139 | 138 | ),
|
140 | 139 | (
|
141 | 140 | "2019-01-01 01:02:03.000004+01",
|
142 |
| - datetime(2019, 1, 1, 1, 2, 3, 4, tzinfo=pytz.FixedOffset(60)), |
| 141 | + datetime(2019, 1, 1, 1, 2, 3, 4, tzinfo=timezone(timedelta(hours=1))), |
143 | 142 | ),
|
144 | 143 | (datetime(2019, 1, 1), datetime(2019, 1, 1)),
|
145 | 144 | (datetime(2019, 1, 1, 1, 2, 3, 4), datetime(2019, 1, 1, 1, 2, 3, 4)),
|
|
0 commit comments