-
Notifications
You must be signed in to change notification settings - Fork 219
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.
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
add new calendar: China #304
Conversation
@brunobord is this ok for merging? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On hold for the moment, I need to fix the Python 3.4 incompatibility.
.travis.yml
Outdated
@@ -13,9 +13,6 @@ matrix: | |||
- python: 2.7 | |||
env: TOXENV=py27 | |||
|
|||
- python: 3.4 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I dislike the fact that this PR introduces the dropping of Python 3.4. I see in other jobs that there's an issue with pandas
; so I'll try to find a way to solve this incompatibility more gracefully, and see if this sunsetting of Python 3.4 is necessary.
I'll keep you posted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@brunobord good job!
Changelog.md
Outdated
@@ -4,6 +4,12 @@ | |||
|
|||
Nothing here yet. | |||
|
|||
## v3.2.2 (2018-12-25) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please do not put new version numbers and/or release dates here.
You should rather add the "new calendars" section and your changelog item to the "master" list.
When it'll be ready, I'll make the proper release, etc, don't worry.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all right
All right, so master is now Python 3.4 - ready, so you can rebase your branch from master (or you may checkout the upstream repository, and cherry-pick your commits and make another pull-request if you prefer). Thank you for your nice contribution, we're almost there! :o) |
This reverts commit 17496d8.
updated |
Looking good, now. No offense, but I'm going to retrieve your branch locally, squash commits in order to have a cleaner history. Don't worry, your work on this calendar is still ACE and I can't thank you enough for this HUGE bump in the global population that will be able to use workalendar! |
- Solved the incompatibility between `pandas` latest version and Python 3.4. Upgraded travis distro to Xenial/16.04 LTS (#307). - Added instructions about the usage of the `iso_register` decorator in the pull-request template (#309). **New Calendars** - Added New Zealand, by @johnguant (#306). - Added Paraguay calendar, following the work of @reichert (#268). - Added China calendar, by @iamsk (#304). - Added Israel, by @armona, @tsehori (#281).
refs #
For information, read and make sure you're okay with the CONTRIBUTING document.
<country>
by@pseudo
(#)"