Skip to content
This repository was archived by the owner on Sep 22, 2022. It is now read-only.

Commit dff9bd9

Browse files
committed
update requirements
add new tests add python 3.7 travis support
1 parent d3f5440 commit dff9bd9

File tree

3 files changed

+25
-3
lines changed

3 files changed

+25
-3
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ python:
77
- "3.5-dev"
88
- "3.6"
99
- "3.6-dev"
10+
- "3.7-dev"
1011
- "pypy"
1112
- "pypy3"
1213

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
nose<=2.0.0
2-
coverage<=5.0.0
3-
pytz<=2018
1+
coverage==4.5.2
2+
nose==1.3.7
3+
pytz==2018.9

tests/test_jalalidate.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ def test_shamsi_to_gregorian(self):
1818
self.assertEqual(JalaliDate(1396, 1, 1).to_gregorian(), date(2017, 3, 21))
1919
self.assertEqual(JalaliDate(1400, 6, 31).to_gregorian(), date(2021, 9, 22))
2020
self.assertEqual(JalaliDate(1396, 7, 27).to_gregorian(), date(2017, 10, 19))
21+
self.assertEqual(JalaliDate(1397, 11, 29).to_gregorian(), date(2019, 2, 18))
2122

2223
self.assertEqual(JalaliDate.today().to_gregorian(), date.today())
2324

@@ -27,6 +28,7 @@ def test_gregorian_to_shamsi(self):
2728
self.assertEqual(JalaliDate(date(2017, 3, 20)), JalaliDate(1395, 12, 30))
2829
self.assertEqual(JalaliDate(date(2000, 1, 1)), JalaliDate(1378, 10, 11))
2930
self.assertEqual(JalaliDate(date(2017, 10, 19)), JalaliDate(1396, 7, 27))
31+
self.assertEqual(JalaliDate(date(2019, 2, 18)), JalaliDate(1397, 11, 29))
3032

3133
self.assertEqual(JalaliDate(date.today()), JalaliDate.today())
3234

@@ -46,6 +48,7 @@ def test_chackdate(self):
4648
self.assertEqual(JalaliDate.chack_date(1396, 12, 30), False)
4749
self.assertEqual(JalaliDate.chack_date(1397, 7, 1), True)
4850
self.assertEqual(JalaliDate.chack_date(1396, 7, 27), True)
51+
self.assertEqual(JalaliDate.chack_date(1397, 11, 29), True)
4952

5053
def test_additions(self):
5154
self.assertEqual(JalaliDate(JalaliDate(1395, 3, 21)), JalaliDate(1395, 3, 21))
@@ -77,6 +80,8 @@ def test_leap(self):
7780
self.assertEqual(JalaliDate.is_leap(1387), True)
7881
self.assertEqual(JalaliDate.is_leap(1395), True)
7982
self.assertEqual(JalaliDate.is_leap(1396), False)
83+
self.assertEqual(JalaliDate.is_leap(1397), False)
84+
self.assertEqual(JalaliDate.is_leap(1398), False)
8085
self.assertEqual(JalaliDate.is_leap(1399), True)
8186
self.assertEqual(JalaliDate.is_leap(1400), False)
8287
self.assertEqual(JalaliDate.is_leap(1403), True)
@@ -116,6 +121,16 @@ def test_format(self):
116121

117122
self.assertEqual(format(j), "۱۳۹۵-۰۳-۰۱")
118123

124+
j = JalaliDate(1397, 11, 29)
125+
126+
self.assertEqual(j.strftime("%c"), "Doshanbeh 29 Bahman 1397")
127+
self.assertEqual(format(j), "1397-11-29")
128+
129+
j.locale = "fa"
130+
131+
self.assertEqual(j.strftime("%c"), "دوشنبه ۲۹ بهمن ۱۳۹۷")
132+
self.assertEqual(format(j), "۱۳۹۷-۱۱-۲۹")
133+
119134
def test_week(self):
120135
self.assertEqual(JalaliDate(1394, 3, 30).week_of_year(), 14)
121136
self.assertEqual(JalaliDate(1394, 7, 30).week_of_year(), 31)
@@ -128,6 +143,7 @@ def test_week(self):
128143
self.assertEqual(JalaliDate(1395, 12, 30).week_of_year(), 53)
129144
self.assertEqual(JalaliDate(1396, 1, 25).week_of_year(), 4)
130145
self.assertEqual(JalaliDate(1396, 7, 8).week_of_year(), 29)
146+
self.assertEqual(JalaliDate(1397, 11, 29).week_of_year(), 49)
131147

132148
self.assertEqual(JalaliDate(1367, 2, 14).weekday(), 4)
133149
self.assertEqual(JalaliDate(1393, 1, 1).weekday(), 6)
@@ -138,9 +154,11 @@ def test_week(self):
138154
self.assertEqual(JalaliDate(1396, 1, 1).weekday(), 3)
139155
self.assertEqual(JalaliDate(1396, 7, 27).weekday(), 5)
140156
self.assertEqual(JalaliDate(1397, 1, 1).weekday(), 4)
157+
self.assertEqual(JalaliDate(1397, 11, 29).weekday(), 2)
141158
self.assertEqual(JalaliDate(1400, 1, 1).weekday(), 1)
142159
self.assertEqual(JalaliDate(1400, 1, 1).isoweekday(), 2)
143160
self.assertEqual(JalaliDate(1396, 7, 27).isoweekday(), 6)
161+
self.assertEqual(JalaliDate(1397, 11, 29).isoweekday(), 3)
144162

145163
def test_operators(self):
146164
self.assertEqual(JalaliDate(1367, 2, 14) == JalaliDate(date(1988, 5, 4)), True)
@@ -151,12 +169,15 @@ def test_operators(self):
151169
self.assertEqual(JalaliDate(1395, 12, 30) >= JalaliDate(1395, 12, 30), True)
152170
self.assertEqual(JalaliDate(1367, 2, 14) <= JalaliDate(1369, 1, 1), True)
153171
self.assertEqual(JalaliDate(1367, 2, 14) >= JalaliDate(1369, 1, 1), False)
172+
self.assertEqual(JalaliDate(1397, 11, 29) >= JalaliDate(1397, 11, 10), True)
154173

155174
self.assertEqual(JalaliDate(1395, 3, 21) + timedelta(days=2), JalaliDate(1395, 3, 23))
156175
self.assertEqual(JalaliDate(1396, 7, 27) + timedelta(days=4), JalaliDate(1396, 8, 1))
157176
self.assertEqual(JalaliDate(1395, 3, 21) + timedelta(days=-38), JalaliDate(1395, 2, 14))
158177
self.assertEqual(JalaliDate(1395, 3, 21) - timedelta(days=38), JalaliDate(1395, 2, 14))
178+
self.assertEqual(JalaliDate(1397, 11, 29) + timedelta(days=2), JalaliDate(1397, 12, 1))
159179
self.assertEqual(JalaliDate(1395, 3, 21) - JalaliDate(1395, 2, 14), timedelta(days=38))
180+
self.assertEqual(JalaliDate(1397, 12, 1) - JalaliDate(1397, 11, 29), timedelta(hours=48))
160181
self.assertEqual(JalaliDate(1395, 3, 21) - date(2016, 5, 3), timedelta(days=38))
161182
self.assertEqual(JalaliDate(1395, 12, 30) - JalaliDate(1395, 1, 1), timedelta(days=365))
162183

0 commit comments

Comments
 (0)