Skip to content

Commit 1d64fa3

Browse files
authored
remove dateutil (Azure#30888)
* remove dateutil * update * update * update
1 parent 1f2d810 commit 1d64fa3

File tree

5 files changed

+35
-36
lines changed

5 files changed

+35
-36
lines changed

sdk/metricsadvisor/azure-ai-metricsadvisor/dev_requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
-e ../../../tools/azure-devtools
33
-e ../../identity/azure-identity
44
../../core/azure-core
5-
aiohttp>=3.0
6-
python-dateutil>=2.8.0
5+
aiohttp>=3.0

sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feed_ingestion_async.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import datetime
88
import functools
9-
from dateutil.tz import tzutc
9+
from datetime import timezone
1010
import pytest
1111
from devtools_testutils.aio import recorded_by_proxy_async
1212
from devtools_testutils import AzureRecordedTestCase
@@ -40,8 +40,8 @@ async def test_list_data_feed_ingestion_status(self, client):
4040
async with client:
4141
ingestions = client.list_data_feed_ingestion_status(
4242
data_feed_id=self.data_feed_id,
43-
start_time=datetime.datetime(2021, 8, 9, tzinfo=tzutc()),
44-
end_time=datetime.datetime(2021, 9, 16, tzinfo=tzutc()),
43+
start_time=datetime.datetime(2021, 8, 9, tzinfo=timezone.utc),
44+
end_time=datetime.datetime(2021, 9, 16, tzinfo=timezone.utc),
4545
)
4646
ingestions_list = []
4747
async for status in ingestions:
@@ -57,14 +57,14 @@ async def test_list_data_feed_ingest_status_skip(self, client):
5757
async with client:
5858
ingestions = client.list_data_feed_ingestion_status(
5959
data_feed_id=self.data_feed_id,
60-
start_time=datetime.datetime(2021, 8, 9, tzinfo=tzutc()),
61-
end_time=datetime.datetime(2021, 9, 16, tzinfo=tzutc()),
60+
start_time=datetime.datetime(2021, 8, 9, tzinfo=timezone.utc),
61+
end_time=datetime.datetime(2021, 9, 16, tzinfo=timezone.utc),
6262
)
6363

6464
ingestions_with_skips = client.list_data_feed_ingestion_status(
6565
data_feed_id=self.data_feed_id,
66-
start_time=datetime.datetime(2021, 8, 9, tzinfo=tzutc()),
67-
end_time=datetime.datetime(2021, 9, 16, tzinfo=tzutc()),
66+
start_time=datetime.datetime(2021, 8, 9, tzinfo=timezone.utc),
67+
end_time=datetime.datetime(2021, 9, 16, tzinfo=timezone.utc),
6868
skip=5
6969
)
7070
ingestions_list = []
@@ -86,6 +86,6 @@ async def test_refresh_data_feed_ingestion(self, client):
8686
async with client:
8787
await client.refresh_data_feed_ingestion(
8888
self.data_feed_id,
89-
start_time=datetime.datetime(2022, 2, 28, tzinfo=tzutc()),
90-
end_time=datetime.datetime(2022, 3, 1, tzinfo=tzutc()),
89+
start_time=datetime.datetime(2022, 2, 28, tzinfo=timezone.utc),
90+
end_time=datetime.datetime(2022, 3, 1, tzinfo=timezone.utc),
9191
)

sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_async.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import datetime
99
import uuid
10-
from dateutil.tz import tzutc
10+
from datetime import timezone
1111
import pytest
1212
import functools
1313
from azure.core.exceptions import ResourceNotFoundError
@@ -70,7 +70,7 @@ async def test_create_simple_data_feed(self, client, variables):
7070
assert data_feed.granularity.granularity_type == "Daily"
7171
assert data_feed.schema.metrics[0].name == "cost"
7272
assert data_feed.schema.metrics[1].name == "revenue"
73-
assert data_feed.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=tzutc())
73+
assert data_feed.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=timezone.utc)
7474

7575
finally:
7676
await self.clean_up(client.delete_data_feed, variables)
@@ -146,7 +146,7 @@ async def test_create_data_feed_from_sql_server(self, client, variables):
146146
assert data_feed.schema.dimensions[1].name == "city"
147147
assert data_feed.schema.dimensions[0].display_name == "display category"
148148
assert data_feed.schema.dimensions[1].display_name == "display city"
149-
assert data_feed.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=tzutc())
149+
assert data_feed.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=timezone.utc)
150150
assert data_feed.ingestion_settings.data_source_request_concurrency == 0
151151
assert data_feed.ingestion_settings.ingestion_retry_delay == -1
152152
assert data_feed.ingestion_settings.ingestion_start_offset == -1
@@ -243,7 +243,7 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self, client,
243243
assert data_feed.schema.dimensions[1].name == "city"
244244
assert data_feed.schema.dimensions[0].display_name == "display category"
245245
assert data_feed.schema.dimensions[1].display_name == "display city"
246-
assert data_feed.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=tzutc())
246+
assert data_feed.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=timezone.utc)
247247
assert data_feed.ingestion_settings.data_source_request_concurrency == 0
248248
assert data_feed.ingestion_settings.ingestion_retry_delay == -1
249249
assert data_feed.ingestion_settings.ingestion_start_offset == -1
@@ -861,7 +861,7 @@ async def test_update_data_feed_with_model(self, client, variables):
861861
assert updated.name == variables["data_feed_updated_name"]
862862
assert updated.data_feed_description == "updated"
863863
assert updated.schema.timestamp_column == "time"
864-
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2021, 12, 10, tzinfo=tzutc())
864+
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2021, 12, 10, tzinfo=timezone.utc)
865865
assert updated.ingestion_settings.ingestion_start_offset == 1
866866
assert updated.ingestion_settings.data_source_request_concurrency == 1
867867
assert updated.ingestion_settings.ingestion_retry_delay == 120
@@ -920,7 +920,7 @@ async def test_update_data_feed_with_kwargs(self, client, variables):
920920
assert updated.name == variables["data_feed_updated_name"]
921921
assert updated.data_feed_description == "updated"
922922
assert updated.schema.timestamp_column == "time"
923-
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2021, 9, 10, tzinfo=tzutc())
923+
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2021, 9, 10, tzinfo=timezone.utc)
924924
assert updated.ingestion_settings.ingestion_start_offset == 1
925925
assert updated.ingestion_settings.data_source_request_concurrency == 1
926926
assert updated.ingestion_settings.ingestion_retry_delay == 120
@@ -998,7 +998,7 @@ async def test_update_data_feed_with_model_and_kwargs(self, client, variables):
998998
assert updated.name == variables["data_feed_updated_name"]
999999
assert updated.data_feed_description == "updateMe"
10001000
assert updated.schema.timestamp_column == "time"
1001-
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2021, 9, 10, tzinfo=tzutc())
1001+
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2021, 9, 10, tzinfo=timezone.utc)
10021002
assert updated.ingestion_settings.ingestion_start_offset == 1
10031003
assert updated.ingestion_settings.data_source_request_concurrency == 1
10041004
assert updated.ingestion_settings.ingestion_retry_delay == 120
@@ -1053,7 +1053,7 @@ async def test_update_data_feed_by_reseting_properties(self, client, variables):
10531053
assert updated.name == variables["data_feed_updated_name"]
10541054
# assert updated.data_feed_description == "" # doesn't currently clear
10551055
# assert updated.schema.timestamp_column == "" # doesn't currently clear
1056-
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=tzutc())
1056+
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=timezone.utc)
10571057
assert updated.ingestion_settings.ingestion_start_offset == -1
10581058
assert updated.ingestion_settings.data_source_request_concurrency == 0
10591059
assert updated.ingestion_settings.ingestion_retry_delay == -1

sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feed_ingestion.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import datetime
99
import functools
10-
from dateutil.tz import tzutc
10+
from datetime import timezone
1111
import pytest
1212
from devtools_testutils import recorded_by_proxy
1313
from azure.ai.metricsadvisor import MetricsAdvisorAdministrationClient
@@ -35,8 +35,8 @@ def test_list_data_feed_ingestion_status(self, client):
3535

3636
ingestions = client.list_data_feed_ingestion_status(
3737
data_feed_id=self.data_feed_id,
38-
start_time=datetime.datetime(2021, 8, 9, tzinfo=tzutc()),
39-
end_time=datetime.datetime(2021, 9, 16, tzinfo=tzutc()),
38+
start_time=datetime.datetime(2021, 8, 9, tzinfo=timezone.utc),
39+
end_time=datetime.datetime(2021, 9, 16, tzinfo=timezone.utc),
4040
)
4141
assert len(list(ingestions)) > 0
4242

@@ -47,14 +47,14 @@ def test_list_data_feed_ingest_status_skip(self, client):
4747

4848
ingestions = client.list_data_feed_ingestion_status(
4949
data_feed_id=self.data_feed_id,
50-
start_time=datetime.datetime(2021, 8, 9, tzinfo=tzutc()),
51-
end_time=datetime.datetime(2021, 9, 16, tzinfo=tzutc()),
50+
start_time=datetime.datetime(2021, 8, 9, tzinfo=timezone.utc),
51+
end_time=datetime.datetime(2021, 9, 16, tzinfo=timezone.utc),
5252
)
5353

5454
ingestions_with_skips = client.list_data_feed_ingestion_status(
5555
data_feed_id=self.data_feed_id,
56-
start_time=datetime.datetime(2021, 8, 9, tzinfo=tzutc()),
57-
end_time=datetime.datetime(2021, 9, 16, tzinfo=tzutc()),
56+
start_time=datetime.datetime(2021, 8, 9, tzinfo=timezone.utc),
57+
end_time=datetime.datetime(2021, 9, 16, tzinfo=timezone.utc),
5858
skip=5
5959
)
6060
ingestions_list = list(ingestions)
@@ -67,7 +67,7 @@ def test_list_data_feed_ingest_status_skip(self, client):
6767
def test_refresh_data_feed_ingestion(self, client):
6868
client.refresh_data_feed_ingestion(
6969
self.data_feed_id,
70-
start_time=datetime.datetime(2022, 2, 28, tzinfo=tzutc()),
71-
end_time=datetime.datetime(2022, 3, 1, tzinfo=tzutc()),
70+
start_time=datetime.datetime(2022, 2, 28, tzinfo=timezone.utc),
71+
end_time=datetime.datetime(2022, 3, 1, tzinfo=timezone.utc),
7272
)
7373

sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import datetime
99
import uuid
10-
from dateutil.tz import tzutc
10+
from datetime import timezone
1111
import pytest
1212
import functools
1313
from azure.core.exceptions import ResourceNotFoundError
@@ -67,7 +67,7 @@ def test_create_simple_data_feed(self, client, variables):
6767
assert data_feed.granularity.granularity_type == "Daily"
6868
assert data_feed.schema.metrics[0].name == "cost"
6969
assert data_feed.schema.metrics[1].name == "revenue"
70-
assert data_feed.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=tzutc())
70+
assert data_feed.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=timezone.utc)
7171
finally:
7272
self.clean_up(client.delete_data_feed, variables)
7373
return variables
@@ -140,7 +140,7 @@ def test_create_data_feed_from_sql_server(self, client, variables):
140140
assert data_feed.schema.dimensions[1].name == "city"
141141
assert data_feed.schema.dimensions[0].display_name == "display category"
142142
assert data_feed.schema.dimensions[1].display_name == "display city"
143-
assert data_feed.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=tzutc())
143+
assert data_feed.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=timezone.utc)
144144
assert data_feed.ingestion_settings.data_source_request_concurrency == 0
145145
assert data_feed.ingestion_settings.ingestion_retry_delay == -1
146146
assert data_feed.ingestion_settings.ingestion_start_offset == -1
@@ -236,7 +236,7 @@ def test_create_data_feed_from_sql_server_with_custom_values(self, client, varia
236236
assert data_feed.schema.dimensions[1].name == "city"
237237
assert data_feed.schema.dimensions[0].display_name == "display category"
238238
assert data_feed.schema.dimensions[1].display_name == "display city"
239-
assert data_feed.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=tzutc())
239+
assert data_feed.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=timezone.utc)
240240
assert data_feed.ingestion_settings.data_source_request_concurrency == 0
241241
assert data_feed.ingestion_settings.ingestion_retry_delay == -1
242242
assert data_feed.ingestion_settings.ingestion_start_offset == -1
@@ -813,7 +813,7 @@ def test_update_data_feed_with_model(self, client, variables):
813813
assert updated.name == variables["data_feed_updated_name"]
814814
assert updated.data_feed_description == "updated"
815815
assert updated.schema.timestamp_column == "time"
816-
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2021, 12, 10, tzinfo=tzutc())
816+
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2021, 12, 10, tzinfo=timezone.utc)
817817
assert updated.ingestion_settings.ingestion_start_offset == 1
818818
assert updated.ingestion_settings.data_source_request_concurrency == 1
819819
assert updated.ingestion_settings.ingestion_retry_delay == 120
@@ -871,7 +871,7 @@ def test_update_data_feed_with_kwargs(self, client, variables):
871871
assert updated.name == variables["data_feed_updated_name"]
872872
assert updated.data_feed_description == "updated"
873873
assert updated.schema.timestamp_column == "time"
874-
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2021, 9, 10, tzinfo=tzutc())
874+
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2021, 9, 10, tzinfo=timezone.utc)
875875
assert updated.ingestion_settings.ingestion_start_offset == 1
876876
assert updated.ingestion_settings.data_source_request_concurrency == 1
877877
assert updated.ingestion_settings.ingestion_retry_delay == 120
@@ -948,7 +948,7 @@ def test_update_data_feed_with_model_and_kwargs(self, client, variables):
948948
assert updated.name == variables["data_feed_updated_name"]
949949
assert updated.data_feed_description == "updateMe"
950950
assert updated.schema.timestamp_column == "time"
951-
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2021, 9, 10, tzinfo=tzutc())
951+
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2021, 9, 10, tzinfo=timezone.utc)
952952
assert updated.ingestion_settings.ingestion_start_offset == 1
953953
assert updated.ingestion_settings.data_source_request_concurrency == 1
954954
assert updated.ingestion_settings.ingestion_retry_delay == 120
@@ -1002,7 +1002,7 @@ def test_update_data_feed_by_reseting_properties(self, client, variables):
10021002
assert updated.name == variables["data_feed_updated_name"]
10031003
# assert updated.data_feed_description == "" # doesn't currently clear
10041004
# assert updated.schema.timestamp_column == "" # doesn't currently clear
1005-
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=tzutc())
1005+
assert updated.ingestion_settings.ingestion_begin_time == datetime.datetime(2019, 10, 1, tzinfo=timezone.utc)
10061006
assert updated.ingestion_settings.ingestion_start_offset == -1
10071007
assert updated.ingestion_settings.data_source_request_concurrency == 0
10081008
assert updated.ingestion_settings.ingestion_retry_delay == -1

0 commit comments

Comments
 (0)