Sync workalendar v5.2.2 #9

ShaheedHaque · 2019-07-10T17:52:05Z

This relates to #8. This is not yet ready to merge, see notes below regarding tests and files which need specific review.

[n/a] Tests with a significant number of years to be tested for your calendar.
[yes] Changelog amended with a mention describing your changes.

I've performed the merge, but my packaging skills are not up to getting the tests running (either tox or make test). I am able to:

sudo make install
Run a basic python3 test by hand:

$ python3
Python 3.7.3 (default, Apr  3 2019, 05:39:12) 
[GCC 8.3.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> from calendra.europe import united_kingdom
>>> foo = united_kingdom.UnitedKingdom()#.get_calendar_holidays(2020)
>>> foo.get_early_may_bank_holiday(2020)
Holiday(2020, 5, 8)

I would appreciate help getting the tests/tox to run. Also, the following files deserve closer review:

travis.yml is unchanged because I don't know Travis.
Contributing.* because I added a section on syncing.
CHANGES.rst because I added all the revision history.
tox.ini is unchanged because I don't know tox.
calendra/united_kindom.py because this was by far the most complicated merge.
calendra/usa/core.py because this was the second significant merge.
registry.py because I had to set load_standard_modules=False, and keep the old imports. I was not able to reconcile how to make the paths/imports work.

- Travis job configuration was upgraded to Xenial (16.04) - ``tox.ini``: conditional requirement. We'll be using the last version of ``pandas`` compatible with Python 3.4, and the latest for other Python versions

Bugfix: Resolve incompatibilities between latest Pandas and Python 3.4

Add New Zealand Calendar

Missing to include as holiday the day before good_friday

@reichert

based on the work of @reichert in workalendar#268. Changes: * Added tests for Paraguay class, * Added the date variation for Heroes Day, Founding of Asunción and Boqueron Battle Victory Day in 2017, * Added erroneous Independance day set to May 15th, wikipedia doesn't mention it, * Removed New Years Eve, wikipedia doesn't mention it, * Fixed flake8 issues, * Added Paraguay to the list on the README file, * Added changelog entry.

Add new calendar: China

…n-pr-template Added instructions about the usage of `iso_register` in the PR template

Holidays which are not included: - There are holidays which are taken as day off by large portions of the pupulation but are not considered official holidays, e.g. Chanuka. - There are a lot of jewish holidays which are not public holidays - There are muslim holidays which are conisdered days off for the Muslim population - Holidays which are optional paid leave e.g. Jerusalem Day - School holidays

Add israel calendar

@reichert

- Solved the incompatibility between `pandas` latest version and Python 3.4. Upgraded travis distro to Xenial/16.04 LTS (workalendar#307). - Added instructions about the usage of the `iso_register` decorator in the pull-request template (workalendar#309). **New Calendars** - Added New Zealand, by @johnguant (workalendar#306). - Added Paraguay calendar, following the work of @reichert (workalendar#268). - Added China calendar, by @iamsk (workalendar#304). - Added Israel, by @armona, @tsehori (workalendar#281).

Fix 2012 and 2002 UK holiday.

Fix a small flake8 issue with wrong indentation.

refs workalendar#31 * Scotland base calendars * Major towns and cities have their own calendars Four years after the beginning, I'm back.

refs workalendar#31

…r-next-generation Scotland calendars

closes workalendar#317

Fix Russia's Day of Unity date

@ludsoft

**New calendars** *WARNING* Scotland (sub)calendars are highly experimental and because of their very puzzling rules, may be false. Please use them with care. - Added Scotland calendars, i.e. Scotland, Aberdeen, Angus, Arbroath, Ayr, Carnoustie & Monifieth, Clydebank, Dumfries & Galloway, Dundee, East Dunbartonshire, Edinburgh, Elgin, Falkirk, Fife, Galashiels, Glasgow, Hawick, Inverclyde, Inverness, Kilmarnock, Lochaber, Monifieth, North Lanarkshire, Paisley, Perth, Scottish Borders, South Lanarkshire, Stirling, and West Dunbartonshire (workalendar#31). **Bugfixes** - Fixed United Kingdom bank holiday for 2002 and 2012, thx @ludsoft (workalendar#315). - Fix a small flake8 issue with wrong indentation (workalendar#319). - Fix Russia "Day of Unity" date, set to November 4th, thx @alexitkes for the bug report (workalendar#317).

closes workalendar#218

ShaheedHaque · 2019-07-11T09:07:21Z

Pytest and tox now run as follows for me:

==== 2305 passed, 158 skipped, 14 warnings in 12.47 seconds =====

But I still have no clue about travis. I think I will have to leave that to you @jaraco! Also, in addition to the list of "things you might want to look at" in my previous comment, ca90ebb might be worth review.

ShaheedHaque · 2019-07-11T09:34:26Z

OK, now that Travis is working, I think the code is ready to merge subject to your review @jaraco. To summarise, the current areas recommended for specific attention are:

Contributing.* because I added a section on syncing.
CHANGES.rst because I added all the revision history.
calendra/united_kindom.py because this was by far the most complicated merge.
calendra/usa/core.py because this was the second significant merge.
registry.py because I had to set load_standard_modules=False, and keep the old imports. I was not able to reconcile how to make the paths/imports work.
a90ebb because it contains specific "design" changes to the respective tests.

ShaheedHaque · 2019-08-12T00:54:58Z

Ping...any prospect of getting this closed out before upstream drifts too far?

jaraco

All things considered, this is looking great. The main issue is the use of 'shift' functions that create duplicate holidays. If we can eliminate those, I'll feel really good about accepting this. Everything else is mostly nitpicks. Let me know if you need/want help eliminating the shift functions.

calendra/europe/united_kingdom.py

jaraco · 2019-08-12T12:14:14Z

calendra/europe/united_kingdom.py

+            spring_bank_holiday = date(2002, 6, 4)
+        else:
+            spring_bank_holiday = UnitedKingdom. \
+                get_last_weekday_in_month(year, 5, MON)


Again, better to prefer relativedelta.

calendra/europe/united_kingdom.py

CHANGES.rst

CONTRIBUTING.rst

jaraco · 2019-08-12T12:35:46Z

calendra/core.py

@@ -567,6 +568,23 @@ def get_whit_sunday(self, year):
    def get_corpus_christi(self, year):
        return self.get_easter_sunday(year) + timedelta(days=60)

+    def shift_christmas_boxing_days(self, year):


I'm pretty sure this isn't needed.

calendra/usa/core.py

setup.py

ShaheedHaque · 2019-08-18T17:36:25Z

@jaraco just in case, I am hoping for further feedback from you on a few questions...at your convenience of source!

ShaheedHaque · 2019-09-12T16:14:04Z

Gentle ping...

…nce' dates for UK holidays.

jaraco · 2019-10-27T15:38:32Z

Thanks again Shaheed for the hard work putting this merge together. Please review my last few commits to see what I had in mind. I'll get this release out ASAP.

ShaheedHaque

I see what you mean about relativedelta; it does indeed make the code quite a bit nicer.

ShaheedHaque

I'm not qualified to comment as I find Python packaging baroque and impenetrable beyond reasonableness ;-).

ShaheedHaque · 2019-10-27T15:47:09Z

My pleasure; glad to have been of some help.

…

On Sun, 27 Oct 2019 at 15:38, Jason R. Coombs ***@***.***> wrote: Merged #9 <#9> into master. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#9?email_source=notifications&email_token=ABFHWKOJ7HQMBZANV3247FDQQWYYDA5CNFSM4H7RYOLKYY3PNVWWK3TUL52HS4DFWZEXG43VMVCXMZLOORHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZGOUO32A7Q#event-2746720382>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABFHWKIZHRM3QM5XOAJPSPLQQWYYDANCNFSM4H7RYOLA> .

jaraco · 2019-10-27T15:52:30Z

I expect the 4.0.0 release to go out here.

brunobord and others added 30 commits December 6, 2018 15:16

Back to development => 3.3.0.dev0

3272be1

Bugfix: Resolve incompatibilities between latest Pandas and Python 3.4

21c771b

- Travis job configuration was upgraded to Xenial (16.04) - ``tox.ini``: conditional requirement. We'll be using the last version of ``pandas`` compatible with Python 3.4, and the latest for other Python versions

Merge pull request workalendar#307 from peopledoc/py34-pandas-issue

40eabd9

Bugfix: Resolve incompatibilities between latest Pandas and Python 3.4

Add New Zealand Calendar

6196002

Fix calculating the shift day for christmas and new years

a3a3ead

Merge pull request workalendar#306 from johnguant/newzealand

cbca55a

Add New Zealand Calendar

Including paraguay holidays

6113345

Missing to include as holiday the day before good_friday

Including holy thursday

4addcef

add new calendar: China

6da3855

Merge pull request workalendar#313 from peopledoc/iamsk-feature/chinese

ad8ea13

Add new calendar: China

Added instructions about the usage of iso_register in the PR template

7869cd9

Merge pull request workalendar#309 from peopledoc/add-iso-registratio…

ed1b639

…n-pr-template Added instructions about the usage of `iso_register` in the PR template

Merge pull request workalendar#310 from peopledoc/add-israel-calendar

eb0ff5e

Add israel calendar

Back to dev => 4.1.0.dev0

b0b0f2b

Fix 2012 and 2002 UK holiday.

f597af7

Merge pull request workalendar#316 from ludsoft/315-UnitedKingdom

58585bd

Fix 2012 and 2002 UK holiday.

Fix a small flake8 issue with wrong indentation.

f2007a5

Merge pull request workalendar#319 from peopledoc/fix-indentation-issue

42dbdc2

Fix a small flake8 issue with wrong indentation.

Adding Scotland calendars

fb35a15

refs workalendar#31 * Scotland base calendars * Major towns and cities have their own calendars Four years after the beginning, I'm back.

Added a warning for Scotland calendars

d8e48f5

refs workalendar#31

Merge pull request workalendar#320 from peopledoc/31-scotland-calenda…

dcd9ab4

…r-next-generation Scotland calendars

Fix Russia's Day of Unity date

f329fff

closes workalendar#317

Merge pull request workalendar#321 from peopledoc/317-fix-day-of-unity

dc56098

Fix Russia's Day of Unity date

Back to dev => 4.2.0.dev0

96a7db9

unrelated: cleaned up unused constants.

31e64cc

Added the American Samoa calendar (US territory)

b5a4ed4

closes workalendar#218

brunobord and others added 6 commits July 7, 2019 22:23

v5.2.2

d005865

Merge tag '5.2.2' into srh_sync_workalendar_5_2_2

faa8268

Get pytest running.

64e22db

Use same spelling as upstream (even though it is inconsistent).

08818e4

Linter issues--;

9ade35a

Adapt tests to reflect separation of observed dates.

ca90ebb

Shaheed Haque added 3 commits July 11, 2019 10:13

Correctly specify test dependencies.

3b9092f

Run setup.py's content just as it was originally done.

9bb4767

Try adding pyluach as a dependency in tox.ini to see if it fixes Travis.

272e1de

Shaheed Haque added 2 commits July 11, 2019 10:43

Eliminate a cosmetic change I introduced.

ca69c2f

Restore change entry dropped in error.

ddcf6cc

jaraco requested changes Aug 12, 2019

View reviewed changes

Shaheed Haque and others added 3 commits August 12, 2019 18:15

Start to address feedback comments.

685f253

Remove unused function as per feedback.

690dcf0

Remove duplicate 'dist' declaration

524cd0c

jaraco added 3 commits October 27, 2019 10:34

Prefer 'relativedelta' for computing relative dates. Restore 'observa…

bd4b0a9

…nce' dates for UK holidays.

Update New Zealand to use relativedelta and Holiday features.

dae5cbb

Move pyluach into a simple dependency.

315f940

jaraco approved these changes Oct 27, 2019

View reviewed changes

jaraco merged commit b97f2ec into jaraco:master Oct 27, 2019

ShaheedHaque commented Oct 27, 2019

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync workalendar v5.2.2 #9

Sync workalendar v5.2.2 #9

ShaheedHaque commented Jul 10, 2019 •

edited

ShaheedHaque commented Jul 11, 2019 •

edited

ShaheedHaque commented Jul 11, 2019

ShaheedHaque commented Aug 12, 2019

jaraco left a comment

jaraco Aug 12, 2019

ShaheedHaque Aug 12, 2019

jaraco Aug 12, 2019

ShaheedHaque commented Aug 18, 2019

ShaheedHaque commented Sep 12, 2019

jaraco commented Oct 27, 2019

ShaheedHaque left a comment

ShaheedHaque left a comment

ShaheedHaque commented Oct 27, 2019 via email

jaraco commented Oct 27, 2019

Sync workalendar v5.2.2 #9

Sync workalendar v5.2.2 #9

Conversation

ShaheedHaque commented Jul 10, 2019 • edited

ShaheedHaque commented Jul 11, 2019 • edited

ShaheedHaque commented Jul 11, 2019

ShaheedHaque commented Aug 12, 2019

jaraco left a comment

Choose a reason for hiding this comment

jaraco Aug 12, 2019

Choose a reason for hiding this comment

ShaheedHaque Aug 12, 2019

Choose a reason for hiding this comment

jaraco Aug 12, 2019

Choose a reason for hiding this comment

ShaheedHaque commented Aug 18, 2019

ShaheedHaque commented Sep 12, 2019

jaraco commented Oct 27, 2019

ShaheedHaque left a comment

Choose a reason for hiding this comment

ShaheedHaque left a comment

Choose a reason for hiding this comment

ShaheedHaque commented Oct 27, 2019 via email

jaraco commented Oct 27, 2019

ShaheedHaque commented Jul 10, 2019 •

edited

ShaheedHaque commented Jul 11, 2019 •

edited