saymrwulf/prophet
1
0
Fork 0
mirror of https://github.com/saymrwulf/prophet.git synced 2026-05-19 21:32:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace lunardate lunar2solar calls with LunarCalendar

Browse source
This commit is contained in:
Timothy Salmon 2019-07-28 15:04:38 -05:00 committed by Ben Letham
parent ded98c493e
commit c02bb3bc15
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
python/fbprophet/hdays.py
View file

@ -12,8 +12,7 @@ from datetime import date, timedelta
from convertdate.islamic import from_gregorian, to_gregorian
from holidays import WEEKEND, HolidayBase, easter, rd
from lunardate import LunarDate
from lunarcalendar import Lunar, Converter
# Official public holidays at a country level
# ------------ Holidays in Brazil---------------------
@ -88,7 +87,7 @@ class Indonesia(HolidayBase):
# Chinese New Year/ Spring Festival
name = "Chinese New Year"
for offset in range(-1, 2, 1):
ds = LunarDate(year + offset, 1, 1).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 1, 1))
if ds.year == year:
self[ds] = name
@ -148,7 +147,7 @@ class Indonesia(HolidayBase):
# Buddha's Birthday
name = "Buddha's Birthday"
for offset in range(-1, 2, 1):
ds = LunarDate(year + offset, 4, 15).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 4, 15))
if ds.year == year:
self[ds] = name
@ -467,7 +466,7 @@ class Malaysia(HolidayBase):
# Chinese New Year
name = "Chinese New Year"
for offset in range(-1, 2, 1):
ds = LunarDate(year + offset, 1, 1).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 1, 1))
if ds.year == year:
self[ds] = name
@ -492,7 +491,7 @@ class Malaysia(HolidayBase):
# Buddha's Birthday
name = "Wesak Day"
for offset in range(-1, 2, 1):
ds = LunarDate(year + offset, 4, 15).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 4, 15))
if ds.year == year:
self[ds] = name
@ -584,31 +583,31 @@ class Vietnam(HolidayBase):
name = "Vietnamese New Year"
for offset in range(-1, 2, 1):
try:
ds = LunarDate(year - 1 + offset, 12, 30).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year - 1 + offset, 12, 30))
except ValueError:
ds = LunarDate(year - 1 + offset, 12, 29).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year - 1 + offset, 12, 29))
if ds.year == year:
self[ds] = name
ds = LunarDate(year + offset, 1, 1).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 1, 1))
if ds.year == year:
self[ds] = name
ds = LunarDate(year + offset, 1, 2).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 1, 2))
if ds.year == year:
self[ds] = name
ds = LunarDate(year + offset, 1, 3).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 1, 3))
if ds.year == year:
self[ds] = name
ds = LunarDate(year + offset, 1, 4).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 1, 4))
if ds.year == year:
self[ds] = name
ds = LunarDate(year + offset, 1, 5).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 1, 5))
if ds.year == year:
self[ds] = name
# Hung Kings Commemorations
name = "Hung Kings Commemorations"
for offset in range(-1, 2, 1):
ds = LunarDate(year + offset, 3, 10).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 3, 10))
if ds.year == year:
self[ds] = name
@ -685,7 +684,7 @@ class Thailand(HolidayBase):
# Buddha's Birthday
name = "Buddha's Birthday"
for offset in range(-1, 2, 1):
ds = LunarDate(year + offset, 4, 15).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 4, 15))
if ds.year == year:
self[ds] = name
@ -1245,7 +1244,7 @@ class China(HolidayBase):
# Chinese New Year/ Spring Festival
name = "Chinese New Year"
for offset in range(-1, 2, 1):
ds = LunarDate(year + offset, 1, 1).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 1, 1))
if ds.year == year:
self[ds] = name
@ -1261,14 +1260,14 @@ class China(HolidayBase):
# Dragon Boat Festival
name = "Dragon Boat Festival"
for offset in range(-1, 2, 1):
ds = LunarDate(year + offset, 5, 5).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 5, 5))
if ds.year == year:
self[ds] = name
# Mid-Autumn Festival
name = "Mid-Autumn Festival"
for offset in range(-1, 2, 1):
ds = LunarDate(year + offset, 8, 15).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 8, 15))
if ds.year == year:
self[ds] = name
@ -1362,7 +1361,7 @@ class Korea(HolidayBase):
# New Year's Day by the Lunar
name = "New Year's Day by the Lunar"
for offset in range(-1, 2, 1):
ds = LunarDate(year + offset, 1, 1).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 1, 1))
if ds.year == year:
self[ds] = name
@ -1373,7 +1372,7 @@ class Korea(HolidayBase):
# Buddha's Birthday
name = "Buddha's Birthday"
for offset in range(-1, 2, 1):
ds = LunarDate(year + offset, 4, 8).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 4, 8))
if ds.year == year:
self[ds] = name
@ -1392,7 +1391,7 @@ class Korea(HolidayBase):
# Chuseok
name = "Chuseok"
for offset in range(-1, 2, 1):
ds = LunarDate(year + offset, 8, 15).toSolarDate()
ds = Converter.Lunar2Solar(Lunar(year + offset, 8, 15))
if ds.year == year:
self[ds] = name

2
python/requirements.txt
View file

@ -3,7 +3,7 @@ pystan>=2.14
numpy>=1.10.0
pandas>=0.23.4
matplotlib>=2.0.0
lunardate>=0.1.5
LunarCalendar>=0.0.9
convertdate>=2.1.2
holidays>=0.9.5
setuptools-git>=1.2