Skip to content

Commit

Permalink
Merge pull request #2041 from vacanza/dev
Browse files Browse the repository at this point in the history
v0.58
  • Loading branch information
arkid15r authored Oct 7, 2024
2 parents 228cc45 + 8f77401 commit 46e172d
Show file tree
Hide file tree
Showing 717 changed files with 9,224 additions and 4,142 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# For more information on CODEOWNERS, see:
# https://help.github.com/en/articles/about-code-owners

* @arkid15r @KJhellico
* @arkid15r @KJhellico @PPsyrius
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ blank_issues_enabled: false

contact_links:
- name: General question
url: https://github.com/vacanza/python-holidays/discussions/new?category=q-a
url: https://github.com/vacanza/holidays/discussions/new?category=q-a
about: Ask a question

- name: Bug Report
url: https://github.com/vacanza/python-holidays/issues/new?template=bug_report.md
url: https://github.com/vacanza/holidays/issues/new?template=bug_report.md
about: Report an issue

- name: Feature Request
url: https://github.com/vacanza/python-holidays/issues/new?template=feature_request.md
url: https://github.com/vacanza/holidays/issues/new?template=feature_request.md
about: Suggest an idea
8 changes: 4 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Thanks for contributing to python-holidays!
Thanks for contributing to holidays!
-->

## Proposed change
Expand All @@ -25,7 +25,7 @@ Your PR description goes here.
- [ ] Dependency update (version deprecation/pin/upgrade)
- [ ] 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)
- [ ] New feature (new `holidays` functionality in general)

## Checklist

Expand All @@ -41,5 +41,5 @@ Your PR description goes here.
Thanks again for your contribution!
-->

[contributing-guidelines]: https://github.com/vacanza/python-holidays/blob/dev/CONTRIBUTING.rst
[docs]: https://github.com/vacanza/python-holidays/tree/dev/docs/source
[contributing-guidelines]: https://github.com/vacanza/holidays/blob/dev/CONTRIBUTING.rst
[docs]: https://github.com/vacanza/holidays/tree/dev/docs/source
2 changes: 1 addition & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ci:
- changed-files:
- any-glob-to-any-file:
- .github/**
- .github/workflows/**

doc:
- changed-files:
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ name: CI/CD

on:
merge_group:
pull_request:
branches:
- dev
- main
- v1
pull_request:
push:
branches:
- dev
- main
- v1
workflow_dispatch:

env:
Expand Down Expand Up @@ -98,7 +102,7 @@ jobs:
make test
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4.5.0
uses: codecov/codecov-action@v4.6.0
with:
token: ${{ secrets.CODECOV_TOKEN }}

Expand Down Expand Up @@ -219,7 +223,7 @@ jobs:
publish-main:
name: Publish generated artifacts
if: |
github.repository == 'vacanza/python-holidays' &&
github.repository == 'vacanza/holidays' &&
github.event_name == 'push' &&
startsWith(github.event.ref, 'refs/tags/v')
environment: main
Expand Down Expand Up @@ -250,5 +254,5 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh release upload --repo vacanza/python-holidays ${{ github.ref_name }} dist/*
gh release upload --repo vacanza/python-holidays ${{ github.ref_name }} holidays-*-sbom.json
gh release upload --repo vacanza/holidays ${{ github.ref_name }} dist/*
gh release upload --repo vacanza/holidays ${{ github.ref_name }} holidays-*-sbom.json
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit-autoupdate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
jobs:
auto-update:
name: Update pre-commit hooks
if: ${{ github.repository == 'vacanza/python-holidays' }}
if: ${{ github.repository == 'vacanza/holidays' }}
permissions:
contents: write
pull-requests: write
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
pre-commit autoupdate
pre-commit run --all-files
- uses: peter-evans/[email protected].1
- uses: peter-evans/[email protected].5
with:
base: dev
body: Update pre-commit hooks to their latest versions.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
update-snapshots:
name: Update snapshots
if: github.repository == 'vacanza/python-holidays'
if: github.repository == 'vacanza/holidays'
permissions:
contents: write
pull-requests: write
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
run: |
make snapshot
- uses: peter-evans/[email protected].1
- uses: peter-evans/[email protected].5
with:
base: dev
body: Automatically generated snapshots update.
Expand Down
20 changes: 12 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-ast
- id: check-builtin-literals
- id: check-yaml
- id: end-of-file-fixer
exclude_types:
- rst
- id: fix-encoding-pragma
args:
- --remove
- id: mixed-line-ending
args:
- --fix=lf
- id: trailing-whitespace
exclude_types:
- rst

- repo: https://github.com/asottile/pyupgrade
rev: v3.17.0
hooks:
- id: pyupgrade
args:
- --py38-plus

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.5
rev: v0.6.9
hooks:
- id: ruff
- id: ruff-format
Expand All @@ -35,7 +39,7 @@ repos:
- docs/file_header.txt

- repo: https://github.com/pycqa/bandit
rev: 1.7.9
rev: 1.7.10
hooks:
- id: bandit
additional_dependencies:
Expand Down Expand Up @@ -76,7 +80,7 @@ repos:
- id: rst-backticks

- repo: https://github.com/tox-dev/tox-ini-fmt
rev: '1.4.0'
rev: '1.4.1'
hooks:
- id: tox-ini-fmt

Expand All @@ -89,4 +93,4 @@ repos:
name: run `make check`
pass_filenames: false
stages:
- push
- pre-push
5 changes: 3 additions & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Python Holidays Authors
=======================
Holidays Authors
================

Aaron Picht
Aart Goossens
Expand Down Expand Up @@ -139,4 +139,5 @@ Tudor Văran
Victor Luna
Victor Miti
Ville Skyttä
Vu Nhat Chuong
Youhei Sakurai
26 changes: 26 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
Version 0.58
============

Released October 7, 2024

- Add Congo holidays (#2037 by @PPsyrius)
- Add Saint Kitts & Nevis holidays (#2005 by @PPsyrius, @arkid15r)
- Add Vietnamese translation of VietNam holidays (#2025 by @vunhatchuong, @arkid15r)
- Update Kazakhstan holidays: add substituted holidays, localization (#2023 by @KJhellico)
- Update Malaysia holidays: add `th` localization (#2030 by @PPsyrius)
- Update Singapore holidays: add `en_SG`, `en_US`, `th` localization (#2031 by @PPsyrius)
- Update Sweden holidays: add `th` localization (#2029 by @PPsyrius)
- Update Azerbaijan holidays in 2024 (#2018 by @KJhellico)
- Update Curaçao holidays: add HALF_DAY holidays (#2039 by @KJhellico)
- Update Japan holidays (#2013 by @KJhellico)
- Update Nicaragua holidays (#2011 by @KJhellico)
- Update Taiwan holidays (#2026 by @KJhellico, @arkid15r)
- Update US holidays: American Samoa holidays (#2017 by @KJhellico)
- Update United States holidays: fix Washington's Birthday in GA & IN (#2014 by @KJhellico)
- Update `ci` label configuration (#2009 by @arkid15r)
- Update apostrophes: change `’` to `'` (#2016 by @arkid15r)
- Update working day related calculations (#2010 by @KJhellico, @arkid15r)
- Add @PPsyrius to CODEOWNERS (#2008 by @arkid15r)
- Move to `holidays` from `python-holidays` (#2027 by @arkid15r)
- Remove deprecated `fix-encoding-pragma`, add `pyupgrade` (#2007 by @PPsyrius, @arkid15r)

Version 0.57
============

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

.. _prs: https://github.com/vacanza/python-holidays/pulls
.. _`dev branch`: https://github.com/vacanza/python-holidays/tree/dev
.. _prs: https://github.com/vacanza/holidays/pulls
.. _`dev branch`: https://github.com/vacanza/holidays/tree/dev


Basics
Expand Down Expand Up @@ -99,7 +99,7 @@ If the translation already exists you'll just need to update it with the new
template entries (your .po file editor may help you to do that with no hassle).

Please also add tests (see already translated countries tests for examples).
The .mo files are generated automatically for the tests and the python-holidays
The .mo files are generated automatically for the tests and the holidays
package so you shouldn't worry about it. Just don't forget to
initialize the ``setUpClass`` properly:

Expand All @@ -113,7 +113,7 @@ initialize the ``setUpClass`` properly:
Build sphinx documentation
--------------------------

.. _readthedocs.io: https://python-holidays.readthedocs.io/
.. _readthedocs.io: https://holidays.readthedocs.io/

The project provides a Sphinx documentation source under ``./docs/source``,
published online on `readthedocs.io`_.
Expand All @@ -128,9 +128,9 @@ __ https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html
Contributors
------------

.. __: https://github.com/vacanza/python-holidays/blob/dev/AUTHORS
.. |contributors| image:: https://img.shields.io/github/contributors/vacanza/python-holidays
:target: https://github.com/vacanza/python-holidays/graphs/contributors
.. __: https://github.com/vacanza/holidays/blob/dev/AUTHORS
.. |contributors| image:: https://img.shields.io/github/contributors/vacanza/holidays
:target: https://github.com/vacanza/holidays/graphs/contributors
:alt: contributors

In order to keep the list of contributors up to date we encourage you add your
Expand Down
Loading

0 comments on commit 46e172d

Please sign in to comment.