Skip to content

Commit aad56da

Browse files
committed
Remove dependency on arrow
1 parent ad7181f commit aad56da

File tree

3 files changed

+19
-23
lines changed

3 files changed

+19
-23
lines changed

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ clickhouse-driver = {version="*", optional=true}
3939
duckdb = {version="^0.6.0", optional=true}
4040

4141
[tool.poetry.dev-dependencies]
42-
arrow = "^1.2.3"
4342
parameterized = "*"
4443
unittest-parallel = "*"
4544
preql = "^0.2.19"

tests/test_api.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import arrow
2-
from datetime import datetime
1+
from datetime import datetime, timedelta
32

43
from data_diff import diff_tables, connect_to_table, Algorithm
54
from data_diff.databases import MySQL
@@ -17,20 +16,20 @@ def setUp(self) -> None:
1716

1817
self.conn = self.connection
1918

20-
self.now = now = arrow.get()
19+
self.now = now = datetime.now()
2120

2221
rows = [
2322
(now, "now"),
24-
(self.now.shift(seconds=-10), "a"),
25-
(self.now.shift(seconds=-7), "b"),
26-
(self.now.shift(seconds=-6), "c"),
23+
(self.now - timedelta(seconds=10), "a"),
24+
(self.now - timedelta(seconds=7), "b"),
25+
(self.now - timedelta(seconds=6), "c"),
2726
]
2827

2928
self.conn.query(
3029
[
31-
self.src_table.insert_rows((i, ts.datetime, s) for i, (ts, s) in enumerate(rows)),
30+
self.src_table.insert_rows((i, ts, s) for i, (ts, s) in enumerate(rows)),
3231
self.dst_table.create(self.src_table),
33-
self.src_table.insert_row(len(rows), self.now.shift(seconds=-3).datetime, "3 seconds ago"),
32+
self.src_table.insert_row(len(rows), self.now - timedelta(seconds=3), "3 seconds ago"),
3433
commit,
3534
]
3635
)

tests/test_diff_tables.py

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
from datetime import datetime
1+
from datetime import datetime, timedelta
22
from typing import Callable
33
import uuid
44
import unittest
55

6-
import arrow # comes with preql
7-
86
from data_diff.sqeleton.queries import table, this, commit
97
from data_diff.sqeleton.utils import ArithAlphanumeric, numberToAlphanum
108

@@ -48,32 +46,32 @@ def setUp(self):
4846
super().setUp()
4947

5048
src_table = self.src_table
51-
self.now = now = arrow.get()
49+
self.now = now = datetime.now()
5250

5351
rows = [
54-
(now.shift(days=-50), "50 days ago"),
55-
(now.shift(hours=-3), "3 hours ago"),
56-
(now.shift(minutes=-10), "10 mins ago"),
57-
(now.shift(seconds=-1), "1 second ago"),
52+
(now - timedelta(days=50), "50 days ago"),
53+
(now - timedelta(hours=3), "3 hours ago"),
54+
(now - timedelta(minutes=10), "10 mins ago"),
55+
(now - timedelta(seconds=1), "1 second ago"),
5856
(now, "now"),
5957
]
6058

6159
self.connection.query(
6260
[
63-
src_table.insert_rows((i, ts.datetime, s) for i, (ts, s) in enumerate(rows)),
61+
src_table.insert_rows((i, ts, s) for i, (ts, s) in enumerate(rows)),
6462
table(self.table_dst_path).create(src_table),
6563
commit,
66-
src_table.insert_row(len(rows), self.now.shift(seconds=-5).datetime, "5 seconds ago"),
64+
src_table.insert_row(len(rows), self.now - timedelta(seconds=5), "5 seconds ago"),
6765
commit,
6866
]
6967
)
7068

7169
def test_init(self):
7270
a = table_segment(
73-
self.connection, self.table_src_path, "id", "datetime", max_update=self.now.datetime, case_sensitive=False
71+
self.connection, self.table_src_path, "id", "datetime", max_update=self.now, case_sensitive=False
7472
)
7573
self.assertRaises(
76-
ValueError, table_segment, self.connection, self.table_src_path, "id", max_update=self.now.datetime
74+
ValueError, table_segment, self.connection, self.table_src_path, "id", max_update=self.now
7775
)
7876

7977
def test_basic(self):
@@ -88,7 +86,7 @@ def test_basic(self):
8886

8987
def test_offset(self):
9088
differ = HashDiffer(bisection_factor=2, bisection_threshold=10)
91-
sec1 = self.now.shift(seconds=-3).datetime
89+
sec1 = self.now - timedelta(seconds=3)
9290
a = table_segment(self.connection, self.table_src_path, "id", "datetime", max_update=sec1, case_sensitive=False)
9391
b = table_segment(self.connection, self.table_dst_path, "id", "datetime", max_update=sec1, case_sensitive=False)
9492
assert a.count() == 4, a.count()
@@ -103,7 +101,7 @@ def test_offset(self):
103101
assert b.count() == 2
104102
assert not list(differ.diff_tables(a, b))
105103

106-
day1 = self.now.shift(days=-1).datetime
104+
day1 = self.now - timedelta(days=1)
107105

108106
a = table_segment(
109107
self.connection,

0 commit comments

Comments
 (0)