Skip to content

Commit

Permalink
Merge branch 'dev' into US_non-public_observance
Browse files Browse the repository at this point in the history
  • Loading branch information
PPsyrius authored Feb 29, 2024
2 parents 3a44ca5 + 65211dc commit 6cb297e
Show file tree
Hide file tree
Showing 42 changed files with 2,055 additions and 202 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ Your PR description goes here.
Thanks again for your contribution!
-->

[contributing-guidelines]: https://github.com/vacanza/python-holidays/blob/beta/CONTRIBUTING.rst
[docs]: https://github.com/vacanza/python-holidays/tree/beta/docs/source
[contributing-guidelines]: https://github.com/vacanza/python-holidays/blob/dev/CONTRIBUTING.rst
[docs]: https://github.com/vacanza/python-holidays/tree/dev/docs/source
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ updates:
schedule:
interval: weekly
day: wednesday
target-branch: beta
target-branch: dev

- package-ecosystem: github-actions
directory: /
schedule:
interval: weekly
day: wednesday
target-branch: beta
target-branch: dev
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit-autoupdate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:

- uses: browniebroke/[email protected]

- uses: peter-evans/[email protected].0
- uses: peter-evans/[email protected].1
with:
base: beta
base: dev
body: Update pre-commit hooks to their latest versions.
branch: update-pre-commit-hooks
commit-message: 'chore: Update pre-commit hooks'
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repos:
- rst

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.2.1
rev: v0.2.2
hooks:
- id: ruff
- id: ruff-format
Expand Down
131 changes: 131 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
Python Holidays Authors
=======================

Aaron Picht
Aart Goossens
Akos Furton
Alejandro Antunes
Alexander Schulze
Alexandre Carvalho
Anders Wenhaug
Andres Marrugo
Anthony Rose
Anton Daitche
Arjun Anandkumar
Arkadii Yakovets
Artem Tserekh
Bailey Thompson
Ben Collerson
Ben Letham
Benjamin Lucas Wacha
Bernhard M. Wiedemann
Carlos Rocha
Chanran Kim
Chris McKeague
Chris Turra
Christian Alexander
Dan Gentry
Daniel Musketa
Daniël Niemeijer
David Hotham
Diogo Rosa
Dorian Monnier
Douglas Franklin
Eden Juscelino
Edison Robles
Edward Betts
Eldar Mustafayev
Emmanuel Arias
Eugenio Panadero Maciá
Fabian Affolter
Felix Lee
Filip Bednárik
Gabriel L Martinez
Gabriel Trabanco
Giedrius Mauza
Gordon Inggs
Greg Rafferty
Győző Papp
Heikki Orsila
Henrik Sozzi
Hugh McNamara
Hugo van Kemenade
Jacky Han
Jacob Punter
Jahir Fiquitiva
Jakob M. Kjær
Jan Pipek
Jason Jensen
Jeremy Chrimes
Jerry Agbesi
John Laswell
Joost van Driel
Jorge Cadena Argote
Jose Riha
Joshua Adelman
Joël van Amerongen
Julian Broudou
Jung Dong Ho
Justin Asfour
Kamil Leduchowski
Kate Golovanova
Kelsey Karin Hawley
Koert van der Veer
Koki Nomura
Maina Kamau
Malthe Borch
Marek Šuppa
Martin Becker
Martin Thurau
Maurizio Montel
Max Härtwig
Michael Thessel
Mike Borsetti
Mike Polyakovsky
Miroslav Šedivý
Monde Sinxi
Nataliia Dmytriievska
Nate Harris
Nathan Ell
Nicholas Spagnoletti
Nico Albers
Olivier Iffrig
Ondřej Nový
Osayd Abdu
Oscar Romero
Pablo Merino
Patrick Nicholson
Paulo Orrock
Pavel Sofroniev
Pedro Baptista
Peter Zsak
Pieter van der Westhuizen
Piotr Staniów
Raphael Borg Ellul Vincenti
Raychel Mattheeuw
Reinaldo Ramos
Robert Frazier
Robert Schmidtke
Robert Tran
Robin Emeršič
Ryan McCrory
Sam Tregar
Santiago Feliu
Sergi Almacellas Abellana
Sergio Mayoral Martinez
Shaurya Uppal
Sho Hirose
Simon Gurcke
Sugato Ray
Sylvain Pasche
Sylvia van Os
Takeshi Osoekawa
Tasnim Nishat Islam
Tewodros Meshesha
Thomas Bøvith
Tommy Sparber
Tudor Văran
Victor Luna
Victor Miti
Ville Skyttä
Youhei Sakurai
11 changes: 11 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
Version 0.43
============

Released February 19, 2024

- Introduce subdivisions aliases (#1662 by @sphh, @arkid15r)
- Update Ireland holidays (#1687 by @KJhellico)
- Update Portugal holidays: fix Carnival date (#1694 by @DgRosa)
- Update Taiwan holidays (#1688 by @KJhellico)
- Update Thailand holidays: add Bridge Public Holiday on Apr 12, 2024 (#1690 by @PPsyrius)

Version 0.42
============

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributing
============

.. _prs: https://github.com/vacanza/python-holidays/pulls
.. _`beta branch`: https://github.com/vacanza/python-holidays/tree/beta
.. _`dev branch`: https://github.com/vacanza/python-holidays/tree/dev
.. |contributors| image:: https://img.shields.io/github/contributors/vacanza/python-holidays
:target: https://github.com/vacanza/python-holidays/graphs/contributors
:alt: contributors
Expand All @@ -15,7 +15,7 @@ Basics
------

When contributing with fixes and new features, please start forking/branching
from the `beta branch`_ to work on the latest code and reduce merging issues.
from the `dev branch`_ to work on the latest code and reduce merging issues.
If you add/change holiday official dates or names you must include references to
all sources (government sites, archived web pages, wiki pages, etc) you've used
while working on this PR. Contributed PRs_ are required to include valid test
Expand Down
27 changes: 15 additions & 12 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ flexible as possible.
:target: https://github.com/psf/black
:alt: Code style

.. image:: https://img.shields.io/coverallsCoverage/github/vacanza/python-holidays?branch=master&color=%2341B5BE&style=flat
.. image:: https://img.shields.io/coverallsCoverage/github/vacanza/python-holidays?branch=main&color=%2341B5BE&style=flat
:target: https://coveralls.io/r/vacanza/python-holidays
:alt: Code coverage

Expand All @@ -60,8 +60,8 @@ flexible as possible.
:target: https://github.com/vacanza/python-holidays/graphs/contributors
:alt: GitHub contributors

.. image:: https://img.shields.io/github/last-commit/vacanza/python-holidays/beta?color=%2341BE4A&style=flat
:target: https://github.com/vacanza/python-holidays/commits/beta
.. image:: https://img.shields.io/github/last-commit/vacanza/python-holidays/dev?color=%2341BE4A&style=flat
:target: https://github.com/vacanza/python-holidays/commits/dev
:alt: GitHub last commit


Expand All @@ -74,14 +74,14 @@ The latest stable version can always be installed or updated via pip:
$ pip install --upgrade holidays
The latest development (beta) version can be installed directly from GitHub:
The latest development (dev) version can be installed directly from GitHub:

.. code-block:: shell
$ pip install --upgrade https://github.com/vacanza/python-holidays/tarball/beta
$ pip install --upgrade https://github.com/vacanza/python-holidays/tarball/dev
All new features are always first pushed to beta branch, then released on
master branch upon official version upgrades.
All new features are always first pushed to dev branch, then released on
main branch upon official version upgrades.

Documentation
-------------
Expand Down Expand Up @@ -144,8 +144,10 @@ Available Countries

We currently support 143 country codes. The standard way to refer to a country
is by using its `ISO 3166-1 alpha-2 code`_, the same used for domain names, and
for a subdivision its `ISO 3166-2 code`_. Some of the countries support more
than one language for holiday names output.
for a subdivision its `ISO 3166-2 code`_. Some countries have common or foreign
names or abbreviations as aliases for their subdivisions. These are defined in
the (optional) ``subdivisions_aliases`` attribute.
Some of the countries support more than one language for holiday names output.
A default language is defined by ``default_language`` (optional) attribute
for each entity and is used as a fallback when neither user specified
language nor user locale language available. The default language code is
Expand All @@ -158,8 +160,9 @@ bank holidays, school holidays, additional (paid or non-paid) holidays, holidays
public employees, religious holidays (valid only for these religions followers). A list of all
categories supported by country is defined by ``supported_categories`` (optional) attribute.

The following is a list of supported countries, their subdivisions, available languages and
additional categories. All countries support **PUBLIC** holidays category by default.
The following is a list of supported countries, their subdivisions followed by their
aliases (if any) in brackets, available languages and additional holiday categories.
All countries support **PUBLIC** holidays category by default.
All other default values are highlighted with bold:


Expand Down Expand Up @@ -220,7 +223,7 @@ All other default values are highlighted with bold:
-
* - Austria
- AT
- States: 1, 2, 3, 4, 5, 6, 7, 8, **9**
- States: 1 (Burgenland, Bgld, B), 2 (Kärnten, Ktn, K), 3 (Niederösterreich, NÖ, N), 4 (Oberösterreich, OÖ, O), 5 (Salzburg, Sbg, S), 6 (Steiermark, Stmk, St), 7 (Tirol, T), 8 (Vorarlberg, Vbg, V), 9 (Wien, W)
- **de**, en_US, uk
- BANK
* - Azerbaijan
Expand Down
33 changes: 16 additions & 17 deletions RELEASE.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,25 @@ How to release a new version of Python Holidays

- Finalize the current development version

- switch to ``beta`` branch and pull the most recent changes
from https://github.com/vacanza/python-holidays remote ``beta`` branch.
- switch to ``dev`` branch and pull the most recent changes
from https://github.com/vacanza/python-holidays remote ``dev`` branch.
- generate release notes by running the following script
``scripts/generate_release_notes.py``
- insert the script's output into the top of ``CHANGES`` file
(see previous release notes for consistent formatting)
- commit the updated ``CHANGES`` file to ``beta`` branch with the following
- commit the updated ``CHANGES`` file to ``dev`` branch with the following
commit message 'Finalize v<version>', e.g. 'Finalize v0.39'
- push changes to https://github.com/vacanza/python-holidays ``beta`` branch
- make sure the push related CI/CD job(s) have been completed successfully
- push changes to https://github.com/vacanza/python-holidays ``dev`` branch
- make sure the push related CI/CD jobs have been completed successfully

- Merge the finalized changes into ``master`` branch:
- Merge the finalized changes into ``main`` branch:

- create a new PR for the recent changes from ``beta`` to ``master`` branch
- create a new PR for the recent changes from ``dev`` to ``main`` branch
using 'v<version>' as a PR title and the previously generated release notes
as a PR description
- get the PR reviewed by at least one of the code owners
- merge the PR into ``master`` branch with 'Create a merge commit' action
(**do not use 'Squash and merge'**)
- make sure the PR related CI/CD job(s) have been completed successfully
- merge the PR into ``main`` branch using 'Merge when ready' button
- make sure the PR related CI/CD jobs have been completed successfully
- make sure readthedocs.org documentation build jobs at
https://readthedocs.org/projects/python-holidays/builds/
have been completed successfully
Expand All @@ -33,7 +32,7 @@ How to release a new version of Python Holidays
on the 'Draft a new release' button
- click on 'Choose a tag', enter 'v<version>' into the input field
(you should see something like 'Create a new tag: v0.39' on publish'
- select **master** - instead of default ``beta`` in 'Target' dropdown
- select **main** - instead of default ``dev`` in 'Target' dropdown
- put 'v<version>' into 'Release title' field, e.g. 'v0.39'
- click on 'Generate release notes' button to collect new contributors and
full changelog link information (we normally keep it at the bottom with
Expand All @@ -49,20 +48,20 @@ How to release a new version of Python Holidays

- Verify the new release:

- make sure the release related CI/CD job(s) have been completed successfully
- make sure the release related CI/CD jobs have been completed successfully
- check https://pypi.org/project/holidays/ package page -- it should have
the current version and the released date updated

- Finish the process with the following post-release actions:

- send "Python Holidays 'v<version>' has been released!" (or similar) message
to Vacanza Team Slack #release channel
- pull the recent changes from ``master`` branch into ``beta``
- pull the recent changes from ``main`` branch into ``dev``
- bump the Python Holidays version at ``holidays/__init__.py`` file
- create a commit with 'Initialize v<version>' message, e.g.
'Initialize v0.40' and push it to ``beta`` branch (this may require
'Initialize v0.40' and push it to ``dev`` branch (this may require
running ``make package`` to pass the tests locally)
- make sure ``beta`` branch **is not behind** the master branch (there
- make sure ``dev`` branch **is not behind** the ``main`` branch (there
will be a message on top of the
https://github.com/vacanza/python-holidays/tree/beta page in case it is)
- make sure the push related CI/CD job(s) have been completed successfully
https://github.com/vacanza/python-holidays/tree/dev page in case it is)
- make sure the push related CI/CD jobs have been completed successfully
2 changes: 1 addition & 1 deletion holidays/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from holidays.registry import EntityLoader
from holidays.utils import *

__version__ = "0.43"
__version__ = "0.44"


EntityLoader.load("countries", globals())
Expand Down
Loading

0 comments on commit 6cb297e

Please sign in to comment.