Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Holiday2022 #8

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+72 −11
Open

Holiday2022 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e65796
2021 exception for Jul.
Jul 20, 2021
994bb3f
update 2021 test
Jul 20, 2021
63d25e5
2021 exception for Aug.
Jul 20, 2021
5f0274d
fix 2022
knok Jul 25, 2022
0e1cd0a
test for 2022
knok Jul 25, 2022
5533eb3
2022/2023
knok Jul 25, 2022
92d2ed7
fix sports, empelor
knok Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions holidays_jp/countries/jp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,12 @@ def JP_substitute(self, _list):
bymonth=7, bymonthday=23)),
Holiday('海の日',
rrule(YEARLY,
dtstart=datetime(2021, 1, 1),
dtstart=datetime(2021, 7, 22),
until=datetime(2021, 7, 22),
bymonth=7, bymonthday=22)),
Holiday('海の日',
rrule(YEARLY,
dtstart=datetime(2022, 1, 1),
bymonth=7, byweekday=MO, bysetpos=3)),
Holiday('山の日',
rrule(YEARLY,
Expand All @@ -198,7 +203,12 @@ def JP_substitute(self, _list):
bymonth=8, bymonthday=10)),
Holiday('山の日',
rrule(YEARLY,
dtstart=datetime(2021, 1, 1),
dtstart=datetime(2021, 8, 8),
until=datetime(2021, 8, 8),
bymonth=8, bymonthday=8)),
Holiday('山の日',
rrule(YEARLY,
dtstart=datetime(2022, 1, 1),
bymonth=8, bymonthday=11)),
Holiday('敬老の日',
rrule(YEARLY,
Expand Down Expand Up @@ -231,7 +241,12 @@ def JP_substitute(self, _list):
bymonth=7, bymonthday=24)),
Holiday('スポーツの日',
rrule(YEARLY,
dtstart=datetime(2021, 1, 1),
dtstart=datetime(2021, 7, 23),
until=datetime(2021, 7, 23),
bymonth=7, bymonthday=23)),
Holiday('スポーツの日',
rrule(YEARLY,
dtstart=datetime(2022, 1, 1),
bymonth=10, byweekday=MO, bysetpos=2)),
Holiday('文化の日',
rrule(YEARLY,
Expand All @@ -251,6 +266,10 @@ def JP_substitute(self, _list):
dtstart=datetime(1989, 2, 17),
until=datetime(2018, 12, 31),
bymonth=12, bymonthday=23)),
Holiday('天皇誕生日',
rrule(YEARLY,
dtstart=datetime(2023, 2, 23),
bymonth=2, bymonthday=23)),
Holiday('皇太子明仁親王の結婚の儀',
rrule(YEARLY,
dtstart=datetime(1959, 4, 10),
Expand Down
58 changes: 50 additions & 8 deletions holidays_jp/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def testJP2020(self):
def testJP2021(self):
from holidays_jp import CountryHolidays
holidays = CountryHolidays.get('JP', 2021)
self.assertEqual(len(holidays), 15)
self.assertEqual(len(holidays), 16)
self.assertHoliday(holidays[0], datetime.datetime(2021, 1, 1), '元日')
self.assertHoliday(holidays[1], datetime.datetime(2021, 1, 11), '成人の日')
self.assertHoliday(holidays[2], datetime.datetime(2021, 2, 11), '建国記念の日')
Expand All @@ -115,14 +115,56 @@ def testJP2021(self):
self.assertHoliday(holidays[5], datetime.datetime(2021, 5, 3), '憲法記念日')
self.assertHoliday(holidays[6], datetime.datetime(2021, 5, 4), 'みどりの日')
self.assertHoliday(holidays[7], datetime.datetime(2021, 5, 5), 'こどもの日')
self.assertHoliday(holidays[8], datetime.datetime(2021, 7, 19), '海の日')
self.assertHoliday(holidays[9], datetime.datetime(2021, 8, 11), '山の日')
self.assertHoliday(holidays[10], datetime.datetime(2021, 9, 20), '敬老の日')
self.assertHoliday(holidays[11], datetime.datetime(2021, 9, 23), '秋分の日')
self.assertHoliday(holidays[12], datetime.datetime(2021, 10, 11), 'スポーツの日')
self.assertHoliday(holidays[13], datetime.datetime(2021, 11, 3), '文化の日')
self.assertHoliday(holidays[14], datetime.datetime(2021, 11, 23), '勤労感謝の日')
self.assertHoliday(holidays[8], datetime.datetime(2021, 7, 22), '海の日')
self.assertHoliday(holidays[9], datetime.datetime(2021, 7, 23), 'スポーツの日')
self.assertHoliday(holidays[10], datetime.datetime(2021, 8, 8), '山の日')
self.assertHoliday(holidays[11], datetime.datetime(2021, 8, 9), '振替休日')
self.assertHoliday(holidays[12], datetime.datetime(2021, 9, 20), '敬老の日')
self.assertHoliday(holidays[13], datetime.datetime(2021, 9, 23), '秋分の日')
self.assertHoliday(holidays[14], datetime.datetime(2021, 11, 3), '文化の日')
self.assertHoliday(holidays[15], datetime.datetime(2021, 11, 23), '勤労感謝の日')

def testJP2022(self):
from holidays_jp import CountryHolidays
holidays = CountryHolidays.get('JP', 2022)
self.assertEqual(len(holidays), 15)
self.assertHoliday(holidays[0], datetime.datetime(2022, 1, 1), '元日')
self.assertHoliday(holidays[1], datetime.datetime(2022, 1, 10), '成人の日')
self.assertHoliday(holidays[2], datetime.datetime(2022, 2, 11), '建国記念の日')
self.assertHoliday(holidays[3], datetime.datetime(2022, 3, 21), '春分の日')
self.assertHoliday(holidays[4], datetime.datetime(2022, 4, 29), '昭和の日')
self.assertHoliday(holidays[5], datetime.datetime(2022, 5, 3), '憲法記念日')
self.assertHoliday(holidays[6], datetime.datetime(2022, 5, 4), 'みどりの日')
self.assertHoliday(holidays[7], datetime.datetime(2022, 5, 5), 'こどもの日')
self.assertHoliday(holidays[8], datetime.datetime(2022, 7, 18), '海の日')
self.assertHoliday(holidays[9], datetime.datetime(2022, 8, 11), '山の日')
self.assertHoliday(holidays[10], datetime.datetime(2022, 9, 19), '敬老の日')
self.assertHoliday(holidays[11], datetime.datetime(2022, 9, 23), '秋分の日')
self.assertHoliday(holidays[12], datetime.datetime(2022, 10, 10), 'スポーツの日')
self.assertHoliday(holidays[13], datetime.datetime(2022, 11, 3), '文化の日')
self.assertHoliday(holidays[14], datetime.datetime(2022, 11, 23), '勤労感謝の日')

def testJP2023(self):
from holidays_jp import CountryHolidays
holidays = CountryHolidays.get('JP', 2023)
self.assertEqual(len(holidays), 17)
self.assertHoliday(holidays[0], datetime.datetime(2023, 1, 1), '元日')
self.assertHoliday(holidays[1], datetime.datetime(2023, 1, 2), '振替休日')
self.assertHoliday(holidays[2], datetime.datetime(2023, 1, 9), '成人の日')
self.assertHoliday(holidays[3], datetime.datetime(2023, 2, 11), '建国記念の日')
self.assertHoliday(holidays[4], datetime.datetime(2023, 2, 23), '天皇誕生日')
self.assertHoliday(holidays[5], datetime.datetime(2023, 3, 21), '春分の日')
self.assertHoliday(holidays[6], datetime.datetime(2023, 4, 29), '昭和の日')
self.assertHoliday(holidays[7], datetime.datetime(2023, 5, 3), '憲法記念日')
self.assertHoliday(holidays[8], datetime.datetime(2023, 5, 4), 'みどりの日')
self.assertHoliday(holidays[9], datetime.datetime(2023, 5, 5), 'こどもの日')
self.assertHoliday(holidays[10], datetime.datetime(2023, 7, 17), '海の日')
self.assertHoliday(holidays[11], datetime.datetime(2023, 8, 11), '山の日')
self.assertHoliday(holidays[12], datetime.datetime(2023, 9, 18), '敬老の日')
self.assertHoliday(holidays[13], datetime.datetime(2023, 9, 23), '秋分の日')
self.assertHoliday(holidays[14], datetime.datetime(2023, 10, 9), 'スポーツの日')
self.assertHoliday(holidays[15], datetime.datetime(2023, 11, 3), '文化の日')
self.assertHoliday(holidays[16], datetime.datetime(2023, 11, 23), '勤労感謝の日')

def testJPBetween(self):
from holidays_jp import CountryHolidays
Expand Down