Update Thailand holidays: add holiday categories #1346

PPsyrius · 2023-06-29T13:38:09Z

Proposed change

Following the changes in #1320, Thailand holidays now support holiday categories.

Change List from 0.27 Release (More incoming, still WIP)

ARMED_FORCES:
+ Royal Thai Armed Forces Day

BANK:
+ Additional Closing Day for Bank for Agriculture and Agricultural Cooperatives
+ Mid-Year Closing Day

GOVERNMENT:
+ Royal Ploughing Ceremony (Moved from PUBLIC since this only apply to government employees)

PUBLIC (Old Default Category):
+ National Children's Day (Turns out these are National Public Holidays rather than just Observed National Days)
- Royal Ploughing Ceremony (see above)

SCHOOL
+ Teacher's Day

WORKDAY
+ Thai Veterans Day
+ National Science Day
+ National Artist Day
+ International Women's Day
+ National Forest Conservation Day
+ HM King Ramkamhaeng Memorial Day
+ National Aviation Day
+ Thai National Flag Day
+ Loy Krathong

Type of change

New country/market holidays support (thank you!)
Supported country/market holidays update (calendar discrepancy fix, localization)
Existing code/documentation/test/process quality improvement (best practice, cleanup, refactoring, optimization)
Dependency upgrade (version update)
Bugfix (non-breaking change which fixes an issue)
Breaking change (a code change causing existing functionality to break)
New feature (new python-holidays functionality in general)

Checklist

I've followed the contributing guidelines
This PR is filed against beta branch of the repository
This PR doesn't contain any merge conflicts and has clean commit history
The code style looks good: make pre-commit
All tests pass locally: make test, make tox (we strongly encourage adding tests to your code)
The related documentation has been added/updated (check off the box for free if no updates is required)

coveralls · 2023-06-29T13:47:47Z

coverage: 100.0%. remained the same when pulling 9356730 on PPsyrius:thailand_categories into 85b377d on dr-prodigy:beta.

KJhellico

Great! 🚀 I'm happy that my idea with categories was useful. Now I have extended it to special holidays as well.

holidays/countries/thailand.py

tests/countries/test_thailand.py

Co-Authored-By: ~Jhellico <KJhellico@users.noreply.github.com>

holidays/countries/thailand.py

Co-Authored-By: ~Jhellico <KJhellico@users.noreply.github.com>

arkid15r · 2023-07-05T22:24:04Z

Not sure if it's still WIP. Please update the description if it's ready for review.

PPsyrius · 2023-07-06T03:13:49Z

@arkid15r I'm afraid this is still very WIP as I've yet got the time to implement their National Date of Importance List for workday category in full

PPsyrius · 2023-08-01T04:07:38Z

tests/common.py:237: in _assertHolidays
    self.assertEqual(
E   AssertionError: 2287 != 28 : {('2021-02-12', 'วันหยุดพิเศษ (เพิ่มเติม)'), ('2045-01-14', 'วันเด็กแห่งชาติ'), ('1975-05-05', 'วันฉัตรมงคล'), ('1990-04-13', 'วันสงกรานต์'), ('2000-04-13', 'วันสงกรานต์'), ...

Maybe I should just restart this as a new PR at this rate

arkid15r · 2023-08-01T22:09:10Z

Maybe I should just restart this as a new PR at this rate

Hey @PPsyrius, it's totally fine to close it in favor of a new one or continue your work within this PR. Whatever works best for you.

Thank you 👍

KJhellico

And test is pass.

tests/countries/test_thailand.py

Co-authored-by: ~Jhellico <KJhellico@users.noreply.github.com>

coveralls · 2023-08-03T08:48:07Z

Pull Request Test Coverage Report for Build 6128863971

74 of 74 (100.0%) changed or added relevant lines in 2 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage remained the same at 100.0%

Totals
Change from base Build 6125338670:	0.0%
Covered Lines:	9160
Relevant Lines:	9160

💛 - Coveralls

Add categories support to subdivision holidays methods

KJhellico

LGTM. Are you planning to add any more holidays?

holidays/locale/en_US/LC_MESSAGES/TH.po

holidays/locale/th/LC_MESSAGES/TH.po

tests/countries/test_thailand.py

Co-Authored-By: ~Jhellico <KJhellico@users.noreply.github.com>

PPsyrius · 2023-09-08T03:42:28Z

LGTM. Are you planning to add any more holidays?

On additional workday ("Date of Significance" according to gov.) - IMO, we're still missing 30+ of them, but the rest are so miscellaneous we may as well merge this PR as-is then put the rest in later in the future. Any suggestion on how to proceed with this would be appreciated. @arkid15r @KJhellico

KJhellico · 2023-09-08T14:01:56Z

I think, it's time to merge this PR.

arkid15r · 2023-09-08T18:57:01Z

Any suggestion on how to proceed with this would be appreciated. @arkid15r @KJhellico

Well, it's up to you. I don't see any reasons to not make it ready for review if you feel so.
Great work here on this complex holiday calendar 👍
Thank you, @PPsyrius!

arkid15r

🇹🇭 LGTM

holidays/countries/thailand.py

arkid15r · 2023-09-12T17:02:09Z

This is another great update, I appreciate your work @PPsyrius.

This PR is in the merge queue and will be submitted automatically once tests are passed.

arkid15r

It needed another approval though

[TH] Thailand Holiday Categories

033bc2d

KJhellico reviewed Jun 29, 2023

View reviewed changes

holidays/countries/thailand.py Outdated Show resolved Hide resolved

holidays/countries/thailand.py Outdated Show resolved Hide resolved

tests/countries/test_thailand.py Outdated Show resolved Hide resolved

PPsyrius and others added 4 commits June 29, 2023 22:41

[TH] some format fixes

6f8f5fb

Co-Authored-By: ~Jhellico <KJhellico@users.noreply.github.com>

Merge branch 'beta' into thailand_categories

6483606

[TH] more suggestions, remove boilerplates

79347fa

Co-Authored-By: ~Jhellico <KJhellico@users.noreply.github.com>

[TH] bring coveralls back to 100

67292e2

KJhellico reviewed Jul 3, 2023

View reviewed changes

holidays/countries/thailand.py Outdated Show resolved Hide resolved

PPsyrius and others added 2 commits July 4, 2023 11:18

Merge branch 'beta' into thailand_categories

5d6cc45

[TH] suggestions, additional category types

9356730

Co-Authored-By: ~Jhellico <KJhellico@users.noreply.github.com>

arkid15r changed the title ~~Thailand Holiday Categories~~ Update Thailand holidays: add holiday categories Jul 5, 2023

arkid15r marked this pull request as draft July 10, 2023 19:28

PPsyrius added 5 commits August 1, 2023 10:20

Merge branch 'beta' into thailand_categories

573ec74

[TH] (still WIP) add back the updated loc

18c2660

[TH] (Still WIP) more fixes

fc3fd03

[TH] (still WIP) oof, forgot this

2a4fe34

[TH] (still WIP)

2e58b0e

KJhellico reviewed Aug 2, 2023

View reviewed changes

tests/countries/test_thailand.py Outdated Show resolved Hide resolved

tests/countries/test_thailand.py Outdated Show resolved Hide resolved

tests/countries/test_thailand.py Outdated Show resolved Hide resolved

PPsyrius and others added 6 commits August 3, 2023 09:48

Update tests/countries/test_thailand.py

2db7693

Co-authored-by: ~Jhellico <KJhellico@users.noreply.github.com>

Update tests/countries/test_thailand.py

0f237c3

Co-authored-by: ~Jhellico <KJhellico@users.noreply.github.com>

Update tests/countries/test_thailand.py

59a73be

Co-authored-by: ~Jhellico <KJhellico@users.noreply.github.com>

[TH] fix one accidentally removed test entry

0620bf6

[TH] not again...

8dc2b17

Use HolidayBase::_add_holiday_* family methods

7c7428a

Merge branch 'master' into thailand_categories

a2a902a

KJhellico and others added 8 commits August 25, 2023 19:43

Add categories support to subdivision holidays methods

393aa16

Refactor

c870db8

Merge pull request vacanza#1446 from KJhellico/add-subdiv-categories

2500381

Add categories support to subdivision holidays methods

Fix months imports (vacanza#1442)

c03fd9d

[TH][WIP] Implementing Suggestions, now supports WORKDAY

9efac85

Merge branch 'beta' into thailand_categories

b88241c

Merge remote-tracking branch 'upstream/beta' into thailand_categories

95688b9

[TH] Migrate to ObservedHolidayBase again

8d59d71

KJhellico reviewed Sep 7, 2023

View reviewed changes

holidays/locale/en_US/LC_MESSAGES/TH.po Outdated Show resolved Hide resolved

holidays/locale/th/LC_MESSAGES/TH.po Outdated Show resolved Hide resolved

KJhellico reviewed Sep 7, 2023

View reviewed changes

tests/countries/test_thailand.py Show resolved Hide resolved

PPsyrius and others added 2 commits September 8, 2023 10:39

[TH] Implementing Suggestions 2023.09.08

c8d0807

Co-Authored-By: ~Jhellico <KJhellico@users.noreply.github.com>

Merge branch 'beta' into thailand_categories

3f8e2cd

Merge branch 'beta' into thailand_categories

38d2116

PPsyrius marked this pull request as ready for review September 9, 2023 04:19

PPsyrius requested a review from arkid15r as a code owner September 9, 2023 04:19

arkid15r previously approved these changes Sep 12, 2023

View reviewed changes

holidays/countries/thailand.py Outdated Show resolved Hide resolved

Update holidays/countries/thailand.py

e11314a

arkid15r dismissed their stale review via e11314a September 12, 2023 16:50

Merge branch 'beta' into thailand_categories

cf7ad82

arkid15r enabled auto-merge September 12, 2023 16:51

arkid15r approved these changes Sep 12, 2023

View reviewed changes

arkid15r added this pull request to the merge queue Sep 12, 2023

Merged via the queue into vacanza:beta with commit 06bc39f Sep 12, 2023
22 checks passed

KJhellico mentioned this pull request Sep 18, 2023

v.0.33 #1477

Merged

PPsyrius deleted the thailand_categories branch September 22, 2023 02:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Thailand holidays: add holiday categories #1346

Update Thailand holidays: add holiday categories #1346

PPsyrius commented Jun 29, 2023 •

edited

coveralls commented Jun 29, 2023 •

edited

KJhellico left a comment

arkid15r commented Jul 5, 2023

PPsyrius commented Jul 6, 2023

PPsyrius commented Aug 1, 2023 •

edited

arkid15r commented Aug 1, 2023

KJhellico left a comment

coveralls commented Aug 3, 2023 •

edited

KJhellico left a comment

PPsyrius commented Sep 8, 2023

KJhellico commented Sep 8, 2023

arkid15r commented Sep 8, 2023

arkid15r left a comment

arkid15r commented Sep 12, 2023

arkid15r left a comment

Update Thailand holidays: add holiday categories #1346

Update Thailand holidays: add holiday categories #1346

Conversation

PPsyrius commented Jun 29, 2023 • edited

Proposed change

Change List from 0.27 Release (More incoming, still WIP)

Type of change

Checklist

coveralls commented Jun 29, 2023 • edited

KJhellico left a comment

Choose a reason for hiding this comment

arkid15r commented Jul 5, 2023

PPsyrius commented Jul 6, 2023

PPsyrius commented Aug 1, 2023 • edited

arkid15r commented Aug 1, 2023

KJhellico left a comment

Choose a reason for hiding this comment

coveralls commented Aug 3, 2023 • edited

Pull Request Test Coverage Report for Build 6128863971

💛 - Coveralls

KJhellico left a comment

Choose a reason for hiding this comment

PPsyrius commented Sep 8, 2023

KJhellico commented Sep 8, 2023

arkid15r commented Sep 8, 2023

arkid15r left a comment

Choose a reason for hiding this comment

arkid15r commented Sep 12, 2023

arkid15r left a comment

Choose a reason for hiding this comment

PPsyrius commented Jun 29, 2023 •

edited

coveralls commented Jun 29, 2023 •

edited

PPsyrius commented Aug 1, 2023 •

edited

coveralls commented Aug 3, 2023 •

edited