Skip to content

Commit

Permalink
fixup! fixup! Florida specific calendars
Browse files Browse the repository at this point in the history
  • Loading branch information
brunobord committed May 17, 2019
1 parent f817452 commit e32bfe3
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## master (unreleased)

- Drop Python 3.4 support (#352).
- Added Florida specific calendars: Florida Legal, Florida Circuit Courts (#216).
- Added Florida specific calendars: Florida Legal, Florida Circuit Courts, Miami-Dade (#216).

## v4.4.0 (2019-05-17)

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ America
* Guam
* Suffolk County, Massachusetts
* California Education, Berkeley, San Francisco, West Hollywood
* Florida Legal and Florida Circuit Courts
* Florida Legal and Florida Circuit Courts, Miami-Dade
* Canada (including provincial and territory holidays)

Asia
Expand Down
6 changes: 5 additions & 1 deletion workalendar/tests/test_usa.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
California, CaliforniaEducation, CaliforniaBerkeley,
CaliforniaSanFrancisco, CaliforniaWestHollywood,
# Florida and others
Florida, FloridaLegal, FloridaCircuitCourts,
Florida, FloridaLegal, FloridaCircuitCourts, FloridaMiamiDade,
Colorado, Connecticut, Delaware, DistrictOfColumbia, Georgia, Hawaii,
Indiana, Illinois, Idaho, Iowa, Kansas, Kentucky, Louisiana, Maine,
Maryland, Massachusetts, Minnesota, Michigan, Mississippi, Missouri,
Expand Down Expand Up @@ -752,6 +752,10 @@ def test_yom_kippur_2019(self):
self.assertIn(yom_kippur, holidays)


class FloridaMiamiDadeTests(FloridaBasicTest, UnitedStatesTest):
cal_class = FloridaMiamiDade


class GeorgiaTest(NoPresidentialDay, UnitedStatesTest):
cal_class = Georgia

Expand Down
6 changes: 4 additions & 2 deletions workalendar/usa/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
from .connecticut import Connecticut
from .delaware import Delaware
from .district_columbia import DistrictOfColumbia
from .florida import Florida, FloridaLegal, FloridaCircuitCourts
from .florida import (
Florida, FloridaLegal, FloridaCircuitCourts, FloridaMiamiDade
)
from .georgia import Georgia
from .hawaii import Hawaii
from .idaho import Idaho
Expand Down Expand Up @@ -77,7 +79,7 @@
'Connecticut',
'Delaware',
'DistrictOfColumbia',
'Florida', 'FloridaLegal', 'FloridaCircuitCourts',
'Florida', 'FloridaLegal', 'FloridaCircuitCourts', 'FloridaMiamiDade',
'Georgia',
'Hawaii',
'Idaho',
Expand Down
6 changes: 6 additions & 0 deletions workalendar/usa/florida.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,9 @@ def get_variable_days(self, year):
))

return days


class FloridaMiamiDade(Florida):
"""Miami-Dade, Florida"""
include_federal_presidents_day = True
include_columbus_day = True

0 comments on commit e32bfe3

Please sign in to comment.