From a3fba08e23e8373447a4e690f45d7e5f19c3c536 Mon Sep 17 00:00:00 2001 From: Arkadii Yakovets Date: Thu, 6 Jun 2024 09:23:30 -0700 Subject: [PATCH] v1: update entities location --- .pre-commit-config.yaml | 2 +- README.rst | 33 +++++++++-------- docs/source/examples.rst | 4 +-- docs/source/modules.rst | 4 +-- holidays/__init__.py | 4 +-- .../entities}/__init__.py | 0 holidays/entities/iso10383/README.md | 10 ++++++ .../iso10383}/__init__.py | 0 .../iso10383}/european_central_bank.py | 0 .../iso10383}/ice_futures_europe.py | 0 .../iso10383}/ny_stock_exchange.py | 0 holidays/entities/iso3166/README.md | 12 +++++++ .../iso3166}/__init__.py | 0 .../iso3166}/albania.py | 0 .../iso3166}/algeria.py | 0 .../iso3166}/american_samoa.py | 2 +- .../iso3166}/andorra.py | 0 .../{countries => entities/iso3166}/angola.py | 0 .../iso3166}/argentina.py | 0 .../iso3166}/armenia.py | 0 .../{countries => entities/iso3166}/aruba.py | 0 .../iso3166}/australia.py | 0 .../iso3166}/austria.py | 0 .../iso3166}/azerbaijan.py | 0 .../iso3166}/bahamas.py | 0 .../iso3166}/bahrain.py | 0 .../iso3166}/bangladesh.py | 0 .../iso3166}/barbados.py | 0 .../iso3166}/belarus.py | 0 .../iso3166}/belgium.py | 0 .../{countries => entities/iso3166}/belize.py | 0 .../iso3166}/bolivia.py | 0 .../iso3166}/bosnia_and_herzegovina.py | 0 .../iso3166}/botswana.py | 0 .../{countries => entities/iso3166}/brazil.py | 0 .../{countries => entities/iso3166}/brunei.py | 0 .../iso3166}/bulgaria.py | 0 .../iso3166}/burkina_faso.py | 0 .../iso3166}/burundi.py | 0 .../iso3166}/cambodia.py | 0 .../iso3166}/cameroon.py | 0 .../{countries => entities/iso3166}/canada.py | 0 .../{countries => entities/iso3166}/chad.py | 0 .../{countries => entities/iso3166}/chile.py | 0 .../{countries => entities/iso3166}/china.py | 0 .../iso3166}/colombia.py | 0 .../iso3166}/costa_rica.py | 0 .../iso3166}/croatia.py | 0 .../{countries => entities/iso3166}/cuba.py | 0 .../iso3166}/curacao.py | 0 .../{countries => entities/iso3166}/cyprus.py | 0 .../iso3166}/czechia.py | 0 .../iso3166}/denmark.py | 0 .../iso3166}/djibouti.py | 0 .../iso3166}/dominican_republic.py | 0 .../iso3166}/ecuador.py | 0 .../{countries => entities/iso3166}/egypt.py | 0 .../iso3166}/el_salvador.py | 0 .../iso3166}/estonia.py | 0 .../iso3166}/eswatini.py | 0 .../iso3166}/ethiopia.py | 0 .../iso3166}/finland.py | 0 .../{countries => entities/iso3166}/france.py | 0 .../{countries => entities/iso3166}/gabon.py | 0 .../iso3166}/georgia.py | 0 .../iso3166}/germany.py | 0 .../{countries => entities/iso3166}/ghana.py | 0 .../{countries => entities/iso3166}/greece.py | 0 .../iso3166}/greenland.py | 0 .../{countries => entities/iso3166}/guam.py | 2 +- .../iso3166}/guatemala.py | 0 .../iso3166}/honduras.py | 0 .../iso3166}/hongkong.py | 0 .../iso3166}/hungary.py | 0 .../iso3166}/iceland.py | 0 .../{countries => entities/iso3166}/india.py | 0 .../iso3166}/indonesia.py | 0 .../{countries => entities/iso3166}/iran.py | 0 .../iso3166}/ireland.py | 0 .../iso3166}/isle_of_man.py | 2 +- .../{countries => entities/iso3166}/israel.py | 0 .../{countries => entities/iso3166}/italy.py | 0 .../iso3166}/jamaica.py | 0 .../{countries => entities/iso3166}/japan.py | 0 .../{countries => entities/iso3166}/jersey.py | 0 .../{countries => entities/iso3166}/jordan.py | 0 .../iso3166}/kazakhstan.py | 0 .../{countries => entities/iso3166}/kenya.py | 0 .../{countries => entities/iso3166}/kuwait.py | 0 .../iso3166}/kyrgyzstan.py | 0 .../{countries => entities/iso3166}/laos.py | 0 .../{countries => entities/iso3166}/latvia.py | 0 .../iso3166}/lesotho.py | 0 .../iso3166}/liechtenstein.py | 0 .../iso3166}/lithuania.py | 0 .../iso3166}/luxembourg.py | 0 .../iso3166}/madagascar.py | 0 .../{countries => entities/iso3166}/malawi.py | 0 .../iso3166}/malaysia.py | 0 .../iso3166}/maldives.py | 0 .../{countries => entities/iso3166}/malta.py | 0 .../iso3166}/marshall_islands.py | 0 .../{countries => entities/iso3166}/mexico.py | 0 .../iso3166}/moldova.py | 0 .../{countries => entities/iso3166}/monaco.py | 0 .../iso3166}/montenegro.py | 0 .../iso3166}/morocco.py | 0 .../iso3166}/mozambique.py | 0 .../iso3166}/namibia.py | 0 .../iso3166}/netherlands.py | 0 .../iso3166}/new_zealand.py | 0 .../iso3166}/nicaragua.py | 0 .../iso3166}/nigeria.py | 0 .../iso3166}/north_macedonia.py | 0 .../iso3166}/northern_mariana_islands.py | 2 +- .../{countries => entities/iso3166}/norway.py | 0 .../iso3166}/pakistan.py | 0 .../{countries => entities/iso3166}/palau.py | 0 .../{countries => entities/iso3166}/panama.py | 0 .../iso3166}/papua_new_guinea.py | 0 .../iso3166}/paraguay.py | 0 .../{countries => entities/iso3166}/peru.py | 0 .../iso3166}/philippines.py | 0 .../{countries => entities/iso3166}/poland.py | 0 .../iso3166}/portugal.py | 0 .../iso3166}/puerto_rico.py | 2 +- .../iso3166}/romania.py | 0 .../{countries => entities/iso3166}/russia.py | 0 .../iso3166}/san_marino.py | 0 .../iso3166}/saudi_arabia.py | 0 .../{countries => entities/iso3166}/serbia.py | 0 .../iso3166}/seychelles.py | 0 .../iso3166}/singapore.py | 0 .../iso3166}/slovakia.py | 0 .../iso3166}/slovenia.py | 0 .../iso3166}/south_africa.py | 0 .../iso3166}/south_korea.py | 0 .../{countries => entities/iso3166}/spain.py | 0 .../{countries => entities/iso3166}/sweden.py | 0 .../iso3166}/switzerland.py | 0 .../{countries => entities/iso3166}/taiwan.py | 0 .../iso3166}/tanzania.py | 0 .../iso3166}/thailand.py | 0 .../iso3166}/timor_leste.py | 0 .../{countries => entities/iso3166}/tonga.py | 0 .../iso3166}/tunisia.py | 0 .../{countries => entities/iso3166}/turkey.py | 0 .../iso3166}/ukraine.py | 0 .../iso3166}/united_arab_emirates.py | 0 .../iso3166}/united_kingdom.py | 0 .../iso3166}/united_states.py | 0 .../united_states_minor_outlying_islands.py | 2 +- .../iso3166}/united_states_virgin_islands.py | 2 +- .../iso3166}/uruguay.py | 0 .../iso3166}/uzbekistan.py | 0 .../iso3166}/vanuatu.py | 0 .../iso3166}/vatican_city.py | 0 .../iso3166}/venezuela.py | 0 .../iso3166}/vietnam.py | 0 .../{countries => entities/iso3166}/zambia.py | 0 .../iso3166}/zimbabwe.py | 0 holidays/holiday_base.py | 2 +- holidays/registry.py | 8 ++--- pyproject.toml | 2 +- tests/{financial => entities}/__init__.py | 0 tests/entities/iso10383/__init__.py | 11 ++++++ .../iso10383}/test_european_central_bank.py | 2 +- .../iso10383}/test_ice_futures_europe.py | 2 +- .../iso10383}/test_ny_stock_exchange.py | 2 +- tests/entities/iso3166/__init__.py | 11 ++++++ .../iso3166}/test_albania.py | 2 +- .../iso3166}/test_algeria.py | 2 +- .../iso3166}/test_american_samoa.py | 2 +- .../iso3166}/test_andorra.py | 2 +- .../iso3166}/test_angola.py | 2 +- .../iso3166}/test_argentina.py | 2 +- .../iso3166}/test_armenia.py | 2 +- .../iso3166}/test_aruba.py | 2 +- .../iso3166}/test_australia.py | 2 +- .../iso3166}/test_austria.py | 2 +- .../iso3166}/test_azerbaijan.py | 2 +- .../iso3166}/test_bahamas.py | 2 +- .../iso3166}/test_bahrain.py | 2 +- .../iso3166}/test_bangladesh.py | 2 +- .../iso3166}/test_barbados.py | 2 +- .../iso3166}/test_belarus.py | 2 +- .../iso3166}/test_belgium.py | 2 +- .../iso3166}/test_belize.py | 2 +- .../iso3166}/test_bolivia.py | 2 +- .../iso3166}/test_bosnia_and_herzegovina.py | 2 +- .../iso3166}/test_botswana.py | 2 +- .../iso3166}/test_brazil.py | 2 +- .../iso3166}/test_brunei.py | 2 +- .../iso3166}/test_bulgaria.py | 2 +- .../iso3166}/test_burkina_faso.py | 2 +- .../iso3166}/test_burundi.py | 2 +- .../iso3166}/test_cambodia.py | 2 +- .../iso3166}/test_cameroon.py | 2 +- .../iso3166}/test_canada.py | 2 +- .../iso3166}/test_chad.py | 2 +- .../iso3166}/test_chile.py | 2 +- .../iso3166}/test_china.py | 2 +- .../iso3166}/test_colombia.py | 2 +- .../iso3166}/test_costa_rica.py | 2 +- .../iso3166}/test_croatia.py | 2 +- .../iso3166}/test_cuba.py | 2 +- .../iso3166}/test_curacao.py | 2 +- .../iso3166}/test_cyprus.py | 2 +- .../iso3166}/test_czechia.py | 2 +- .../iso3166}/test_denmark.py | 2 +- .../iso3166}/test_djibouti.py | 2 +- .../iso3166}/test_dominican_republic.py | 2 +- .../iso3166}/test_ecuador.py | 2 +- .../iso3166}/test_egypt.py | 2 +- .../iso3166}/test_el_salvador.py | 2 +- .../iso3166}/test_estonia.py | 2 +- .../iso3166}/test_eswatini.py | 2 +- .../iso3166}/test_ethiopia.py | 2 +- .../iso3166}/test_finland.py | 2 +- .../iso3166}/test_france.py | 2 +- .../iso3166}/test_gabon.py | 2 +- .../iso3166}/test_georgia.py | 2 +- .../iso3166}/test_germany.py | 2 +- .../iso3166}/test_ghana.py | 2 +- .../iso3166}/test_greece.py | 2 +- .../iso3166}/test_greenland.py | 2 +- .../iso3166}/test_guam.py | 2 +- .../iso3166}/test_guatemala.py | 2 +- .../iso3166}/test_honduras.py | 2 +- .../iso3166}/test_hongkong.py | 2 +- .../iso3166}/test_hungary.py | 2 +- .../iso3166}/test_iceland.py | 2 +- .../iso3166}/test_india.py | 2 +- .../iso3166}/test_indonesia.py | 2 +- .../iso3166}/test_iran.py | 2 +- .../iso3166}/test_ireland.py | 2 +- .../iso3166}/test_isle_of_man.py | 2 +- .../iso3166}/test_israel.py | 2 +- .../iso3166}/test_italy.py | 2 +- .../iso3166}/test_jamaica.py | 2 +- .../iso3166}/test_japan.py | 2 +- .../iso3166}/test_jersey.py | 2 +- .../iso3166}/test_jordan.py | 2 +- .../iso3166}/test_kazakhstan.py | 2 +- .../iso3166}/test_kenya.py | 2 +- .../iso3166}/test_kuwait.py | 2 +- .../iso3166}/test_kyrgyzstan.py | 2 +- .../iso3166}/test_laos.py | 2 +- .../iso3166}/test_latvia.py | 2 +- .../iso3166}/test_lesotho.py | 2 +- .../iso3166}/test_liechtenstein.py | 2 +- .../iso3166}/test_lithuania.py | 2 +- .../iso3166}/test_luxembourg.py | 2 +- .../iso3166}/test_madagascar.py | 2 +- .../iso3166}/test_malawi.py | 2 +- .../iso3166}/test_malaysia.py | 2 +- .../iso3166}/test_maldives.py | 2 +- .../iso3166}/test_malta.py | 2 +- .../iso3166}/test_marshall_islands.py | 2 +- .../iso3166}/test_mexico.py | 2 +- .../iso3166}/test_moldova.py | 2 +- .../iso3166}/test_monaco.py | 2 +- .../iso3166}/test_montenegro.py | 2 +- .../iso3166}/test_morocco.py | 2 +- .../iso3166}/test_mozambique.py | 2 +- .../iso3166}/test_namibia.py | 2 +- .../iso3166}/test_netherlands.py | 2 +- .../iso3166}/test_new_zealand.py | 2 +- .../iso3166}/test_nicaragua.py | 2 +- .../iso3166}/test_nigeria.py | 2 +- .../iso3166}/test_north_macedonia.py | 2 +- .../iso3166}/test_northern_mariana_islands.py | 2 +- .../iso3166}/test_norway.py | 2 +- .../iso3166}/test_pakistan.py | 2 +- .../iso3166}/test_palau.py | 2 +- .../iso3166}/test_panama.py | 2 +- .../iso3166}/test_papua_new_guinea.py | 2 +- .../iso3166}/test_paraguay.py | 2 +- .../iso3166}/test_peru.py | 2 +- .../iso3166}/test_philippines.py | 2 +- .../iso3166}/test_poland.py | 2 +- .../iso3166}/test_portugal.py | 2 +- .../iso3166}/test_puerto_rico.py | 2 +- .../iso3166}/test_romania.py | 2 +- .../iso3166}/test_russia.py | 2 +- .../iso3166}/test_san_marino.py | 2 +- .../iso3166}/test_saudi_arabia.py | 2 +- .../iso3166}/test_serbia.py | 2 +- .../iso3166}/test_seychelles.py | 2 +- .../iso3166}/test_singapore.py | 2 +- .../iso3166}/test_slovakia.py | 2 +- .../iso3166}/test_slovenia.py | 2 +- .../iso3166}/test_south_africa.py | 2 +- .../iso3166}/test_south_korea.py | 2 +- .../iso3166}/test_spain.py | 2 +- .../iso3166}/test_sweden.py | 2 +- .../iso3166}/test_switzerland.py | 2 +- .../iso3166}/test_taiwan.py | 2 +- .../iso3166}/test_tanzania.py | 2 +- .../iso3166}/test_thailand.py | 2 +- .../iso3166}/test_timor_leste.py | 2 +- .../iso3166}/test_tonga.py | 2 +- .../iso3166}/test_tunisia.py | 2 +- .../iso3166}/test_turkey.py | 2 +- .../iso3166}/test_ukraine.py | 2 +- .../iso3166}/test_united_arab_emirates.py | 2 +- .../iso3166}/test_united_kingdom.py | 2 +- .../iso3166}/test_united_states.py | 2 +- ...st_united_states_minor_outlying_islands.py | 2 +- .../test_united_states_virgin_islands.py | 2 +- .../iso3166}/test_uruguay.py | 2 +- .../iso3166}/test_uzbekistan.py | 2 +- .../iso3166}/test_vanuatu.py | 2 +- .../iso3166}/test_vatican_city.py | 2 +- .../iso3166}/test_venezuela.py | 2 +- .../iso3166}/test_vietnam.py | 2 +- .../iso3166}/test_zambia.py | 2 +- .../iso3166}/test_zimbabwe.py | 2 +- tests/test_docs.py | 7 ++-- tests/test_holiday_base.py | 2 +- tests/test_registry.py | 35 ++++++++++--------- tests/test_utils.py | 8 +++-- tests/third_party/test_numpy.py | 6 ++-- 323 files changed, 264 insertions(+), 213 deletions(-) rename {tests/countries => holidays/entities}/__init__.py (100%) create mode 100644 holidays/entities/iso10383/README.md rename holidays/{financial => entities/iso10383}/__init__.py (100%) rename holidays/{financial => entities/iso10383}/european_central_bank.py (100%) rename holidays/{financial => entities/iso10383}/ice_futures_europe.py (100%) rename holidays/{financial => entities/iso10383}/ny_stock_exchange.py (100%) create mode 100644 holidays/entities/iso3166/README.md rename holidays/{countries => entities/iso3166}/__init__.py (100%) rename holidays/{countries => entities/iso3166}/albania.py (100%) rename holidays/{countries => entities/iso3166}/algeria.py (100%) rename holidays/{countries => entities/iso3166}/american_samoa.py (95%) rename holidays/{countries => entities/iso3166}/andorra.py (100%) rename holidays/{countries => entities/iso3166}/angola.py (100%) rename holidays/{countries => entities/iso3166}/argentina.py (100%) rename holidays/{countries => entities/iso3166}/armenia.py (100%) rename holidays/{countries => entities/iso3166}/aruba.py (100%) rename holidays/{countries => entities/iso3166}/australia.py (100%) rename holidays/{countries => entities/iso3166}/austria.py (100%) rename holidays/{countries => entities/iso3166}/azerbaijan.py (100%) rename holidays/{countries => entities/iso3166}/bahamas.py (100%) rename holidays/{countries => entities/iso3166}/bahrain.py (100%) rename holidays/{countries => entities/iso3166}/bangladesh.py (100%) rename holidays/{countries => entities/iso3166}/barbados.py (100%) rename holidays/{countries => entities/iso3166}/belarus.py (100%) rename holidays/{countries => entities/iso3166}/belgium.py (100%) rename holidays/{countries => entities/iso3166}/belize.py (100%) rename holidays/{countries => entities/iso3166}/bolivia.py (100%) rename holidays/{countries => entities/iso3166}/bosnia_and_herzegovina.py (100%) rename holidays/{countries => entities/iso3166}/botswana.py (100%) rename holidays/{countries => entities/iso3166}/brazil.py (100%) rename holidays/{countries => entities/iso3166}/brunei.py (100%) rename holidays/{countries => entities/iso3166}/bulgaria.py (100%) rename holidays/{countries => entities/iso3166}/burkina_faso.py (100%) rename holidays/{countries => entities/iso3166}/burundi.py (100%) rename holidays/{countries => entities/iso3166}/cambodia.py (100%) rename holidays/{countries => entities/iso3166}/cameroon.py (100%) rename holidays/{countries => entities/iso3166}/canada.py (100%) rename holidays/{countries => entities/iso3166}/chad.py (100%) rename holidays/{countries => entities/iso3166}/chile.py (100%) rename holidays/{countries => entities/iso3166}/china.py (100%) rename holidays/{countries => entities/iso3166}/colombia.py (100%) rename holidays/{countries => entities/iso3166}/costa_rica.py (100%) rename holidays/{countries => entities/iso3166}/croatia.py (100%) rename holidays/{countries => entities/iso3166}/cuba.py (100%) rename holidays/{countries => entities/iso3166}/curacao.py (100%) rename holidays/{countries => entities/iso3166}/cyprus.py (100%) rename holidays/{countries => entities/iso3166}/czechia.py (100%) rename holidays/{countries => entities/iso3166}/denmark.py (100%) rename holidays/{countries => entities/iso3166}/djibouti.py (100%) rename holidays/{countries => entities/iso3166}/dominican_republic.py (100%) rename holidays/{countries => entities/iso3166}/ecuador.py (100%) rename holidays/{countries => entities/iso3166}/egypt.py (100%) rename holidays/{countries => entities/iso3166}/el_salvador.py (100%) rename holidays/{countries => entities/iso3166}/estonia.py (100%) rename holidays/{countries => entities/iso3166}/eswatini.py (100%) rename holidays/{countries => entities/iso3166}/ethiopia.py (100%) rename holidays/{countries => entities/iso3166}/finland.py (100%) rename holidays/{countries => entities/iso3166}/france.py (100%) rename holidays/{countries => entities/iso3166}/gabon.py (100%) rename holidays/{countries => entities/iso3166}/georgia.py (100%) rename holidays/{countries => entities/iso3166}/germany.py (100%) rename holidays/{countries => entities/iso3166}/ghana.py (100%) rename holidays/{countries => entities/iso3166}/greece.py (100%) rename holidays/{countries => entities/iso3166}/greenland.py (100%) rename holidays/{countries => entities/iso3166}/guam.py (95%) rename holidays/{countries => entities/iso3166}/guatemala.py (100%) rename holidays/{countries => entities/iso3166}/honduras.py (100%) rename holidays/{countries => entities/iso3166}/hongkong.py (100%) rename holidays/{countries => entities/iso3166}/hungary.py (100%) rename holidays/{countries => entities/iso3166}/iceland.py (100%) rename holidays/{countries => entities/iso3166}/india.py (100%) rename holidays/{countries => entities/iso3166}/indonesia.py (100%) rename holidays/{countries => entities/iso3166}/iran.py (100%) rename holidays/{countries => entities/iso3166}/ireland.py (100%) rename holidays/{countries => entities/iso3166}/isle_of_man.py (95%) rename holidays/{countries => entities/iso3166}/israel.py (100%) rename holidays/{countries => entities/iso3166}/italy.py (100%) rename holidays/{countries => entities/iso3166}/jamaica.py (100%) rename holidays/{countries => entities/iso3166}/japan.py (100%) rename holidays/{countries => entities/iso3166}/jersey.py (100%) rename holidays/{countries => entities/iso3166}/jordan.py (100%) rename holidays/{countries => entities/iso3166}/kazakhstan.py (100%) rename holidays/{countries => entities/iso3166}/kenya.py (100%) rename holidays/{countries => entities/iso3166}/kuwait.py (100%) rename holidays/{countries => entities/iso3166}/kyrgyzstan.py (100%) rename holidays/{countries => entities/iso3166}/laos.py (100%) rename holidays/{countries => entities/iso3166}/latvia.py (100%) rename holidays/{countries => entities/iso3166}/lesotho.py (100%) rename holidays/{countries => entities/iso3166}/liechtenstein.py (100%) rename holidays/{countries => entities/iso3166}/lithuania.py (100%) rename holidays/{countries => entities/iso3166}/luxembourg.py (100%) rename holidays/{countries => entities/iso3166}/madagascar.py (100%) rename holidays/{countries => entities/iso3166}/malawi.py (100%) rename holidays/{countries => entities/iso3166}/malaysia.py (100%) rename holidays/{countries => entities/iso3166}/maldives.py (100%) rename holidays/{countries => entities/iso3166}/malta.py (100%) rename holidays/{countries => entities/iso3166}/marshall_islands.py (100%) rename holidays/{countries => entities/iso3166}/mexico.py (100%) rename holidays/{countries => entities/iso3166}/moldova.py (100%) rename holidays/{countries => entities/iso3166}/monaco.py (100%) rename holidays/{countries => entities/iso3166}/montenegro.py (100%) rename holidays/{countries => entities/iso3166}/morocco.py (100%) rename holidays/{countries => entities/iso3166}/mozambique.py (100%) rename holidays/{countries => entities/iso3166}/namibia.py (100%) rename holidays/{countries => entities/iso3166}/netherlands.py (100%) rename holidays/{countries => entities/iso3166}/new_zealand.py (100%) rename holidays/{countries => entities/iso3166}/nicaragua.py (100%) rename holidays/{countries => entities/iso3166}/nigeria.py (100%) rename holidays/{countries => entities/iso3166}/north_macedonia.py (100%) rename holidays/{countries => entities/iso3166}/northern_mariana_islands.py (95%) rename holidays/{countries => entities/iso3166}/norway.py (100%) rename holidays/{countries => entities/iso3166}/pakistan.py (100%) rename holidays/{countries => entities/iso3166}/palau.py (100%) rename holidays/{countries => entities/iso3166}/panama.py (100%) rename holidays/{countries => entities/iso3166}/papua_new_guinea.py (100%) rename holidays/{countries => entities/iso3166}/paraguay.py (100%) rename holidays/{countries => entities/iso3166}/peru.py (100%) rename holidays/{countries => entities/iso3166}/philippines.py (100%) rename holidays/{countries => entities/iso3166}/poland.py (100%) rename holidays/{countries => entities/iso3166}/portugal.py (100%) rename holidays/{countries => entities/iso3166}/puerto_rico.py (95%) rename holidays/{countries => entities/iso3166}/romania.py (100%) rename holidays/{countries => entities/iso3166}/russia.py (100%) rename holidays/{countries => entities/iso3166}/san_marino.py (100%) rename holidays/{countries => entities/iso3166}/saudi_arabia.py (100%) rename holidays/{countries => entities/iso3166}/serbia.py (100%) rename holidays/{countries => entities/iso3166}/seychelles.py (100%) rename holidays/{countries => entities/iso3166}/singapore.py (100%) rename holidays/{countries => entities/iso3166}/slovakia.py (100%) rename holidays/{countries => entities/iso3166}/slovenia.py (100%) rename holidays/{countries => entities/iso3166}/south_africa.py (100%) rename holidays/{countries => entities/iso3166}/south_korea.py (100%) rename holidays/{countries => entities/iso3166}/spain.py (100%) rename holidays/{countries => entities/iso3166}/sweden.py (100%) rename holidays/{countries => entities/iso3166}/switzerland.py (100%) rename holidays/{countries => entities/iso3166}/taiwan.py (100%) rename holidays/{countries => entities/iso3166}/tanzania.py (100%) rename holidays/{countries => entities/iso3166}/thailand.py (100%) rename holidays/{countries => entities/iso3166}/timor_leste.py (100%) rename holidays/{countries => entities/iso3166}/tonga.py (100%) rename holidays/{countries => entities/iso3166}/tunisia.py (100%) rename holidays/{countries => entities/iso3166}/turkey.py (100%) rename holidays/{countries => entities/iso3166}/ukraine.py (100%) rename holidays/{countries => entities/iso3166}/united_arab_emirates.py (100%) rename holidays/{countries => entities/iso3166}/united_kingdom.py (100%) rename holidays/{countries => entities/iso3166}/united_states.py (100%) rename holidays/{countries => entities/iso3166}/united_states_minor_outlying_islands.py (95%) rename holidays/{countries => entities/iso3166}/united_states_virgin_islands.py (95%) rename holidays/{countries => entities/iso3166}/uruguay.py (100%) rename holidays/{countries => entities/iso3166}/uzbekistan.py (100%) rename holidays/{countries => entities/iso3166}/vanuatu.py (100%) rename holidays/{countries => entities/iso3166}/vatican_city.py (100%) rename holidays/{countries => entities/iso3166}/venezuela.py (100%) rename holidays/{countries => entities/iso3166}/vietnam.py (100%) rename holidays/{countries => entities/iso3166}/zambia.py (100%) rename holidays/{countries => entities/iso3166}/zimbabwe.py (100%) rename tests/{financial => entities}/__init__.py (100%) create mode 100644 tests/entities/iso10383/__init__.py rename tests/{financial => entities/iso10383}/test_european_central_bank.py (96%) rename tests/{financial => entities/iso10383}/test_ice_futures_europe.py (95%) rename tests/{financial => entities/iso10383}/test_ny_stock_exchange.py (99%) create mode 100644 tests/entities/iso3166/__init__.py rename tests/{countries => entities/iso3166}/test_albania.py (99%) rename tests/{countries => entities/iso3166}/test_algeria.py (98%) rename tests/{countries => entities/iso3166}/test_american_samoa.py (95%) rename tests/{countries => entities/iso3166}/test_andorra.py (98%) rename tests/{countries => entities/iso3166}/test_angola.py (99%) rename tests/{countries => entities/iso3166}/test_argentina.py (99%) rename tests/{countries => entities/iso3166}/test_armenia.py (98%) rename tests/{countries => entities/iso3166}/test_aruba.py (99%) rename tests/{countries => entities/iso3166}/test_australia.py (99%) rename tests/{countries => entities/iso3166}/test_austria.py (99%) rename tests/{countries => entities/iso3166}/test_azerbaijan.py (99%) rename tests/{countries => entities/iso3166}/test_bahamas.py (99%) rename tests/{countries => entities/iso3166}/test_bahrain.py (98%) rename tests/{countries => entities/iso3166}/test_bangladesh.py (94%) rename tests/{countries => entities/iso3166}/test_barbados.py (99%) rename tests/{countries => entities/iso3166}/test_belarus.py (98%) rename tests/{countries => entities/iso3166}/test_belgium.py (99%) rename tests/{countries => entities/iso3166}/test_belize.py (99%) rename tests/{countries => entities/iso3166}/test_bolivia.py (99%) rename tests/{countries => entities/iso3166}/test_bosnia_and_herzegovina.py (99%) rename tests/{countries => entities/iso3166}/test_botswana.py (98%) rename tests/{countries => entities/iso3166}/test_brazil.py (99%) rename tests/{countries => entities/iso3166}/test_brunei.py (99%) rename tests/{countries => entities/iso3166}/test_bulgaria.py (99%) rename tests/{countries => entities/iso3166}/test_burkina_faso.py (97%) rename tests/{countries => entities/iso3166}/test_burundi.py (98%) rename tests/{countries => entities/iso3166}/test_cambodia.py (99%) rename tests/{countries => entities/iso3166}/test_cameroon.py (98%) rename tests/{countries => entities/iso3166}/test_canada.py (99%) rename tests/{countries => entities/iso3166}/test_chad.py (97%) rename tests/{countries => entities/iso3166}/test_chile.py (99%) rename tests/{countries => entities/iso3166}/test_china.py (99%) rename tests/{countries => entities/iso3166}/test_colombia.py (99%) rename tests/{countries => entities/iso3166}/test_costa_rica.py (99%) rename tests/{countries => entities/iso3166}/test_croatia.py (99%) rename tests/{countries => entities/iso3166}/test_cuba.py (99%) rename tests/{countries => entities/iso3166}/test_curacao.py (99%) rename tests/{countries => entities/iso3166}/test_cyprus.py (99%) rename tests/{countries => entities/iso3166}/test_czechia.py (99%) rename tests/{countries => entities/iso3166}/test_denmark.py (98%) rename tests/{countries => entities/iso3166}/test_djibouti.py (98%) rename tests/{countries => entities/iso3166}/test_dominican_republic.py (98%) rename tests/{countries => entities/iso3166}/test_ecuador.py (99%) rename tests/{countries => entities/iso3166}/test_egypt.py (98%) rename tests/{countries => entities/iso3166}/test_el_salvador.py (97%) rename tests/{countries => entities/iso3166}/test_estonia.py (98%) rename tests/{countries => entities/iso3166}/test_eswatini.py (98%) rename tests/{countries => entities/iso3166}/test_ethiopia.py (99%) rename tests/{countries => entities/iso3166}/test_finland.py (99%) rename tests/{countries => entities/iso3166}/test_france.py (99%) rename tests/{countries => entities/iso3166}/test_gabon.py (97%) rename tests/{countries => entities/iso3166}/test_georgia.py (98%) rename tests/{countries => entities/iso3166}/test_germany.py (99%) rename tests/{countries => entities/iso3166}/test_ghana.py (98%) rename tests/{countries => entities/iso3166}/test_greece.py (99%) rename tests/{countries => entities/iso3166}/test_greenland.py (98%) rename tests/{countries => entities/iso3166}/test_guam.py (95%) rename tests/{countries => entities/iso3166}/test_guatemala.py (98%) rename tests/{countries => entities/iso3166}/test_honduras.py (98%) rename tests/{countries => entities/iso3166}/test_hongkong.py (99%) rename tests/{countries => entities/iso3166}/test_hungary.py (99%) rename tests/{countries => entities/iso3166}/test_iceland.py (98%) rename tests/{countries => entities/iso3166}/test_india.py (98%) rename tests/{countries => entities/iso3166}/test_indonesia.py (99%) rename tests/{countries => entities/iso3166}/test_iran.py (99%) rename tests/{countries => entities/iso3166}/test_ireland.py (98%) rename tests/{countries => entities/iso3166}/test_isle_of_man.py (97%) rename tests/{countries => entities/iso3166}/test_israel.py (99%) rename tests/{countries => entities/iso3166}/test_italy.py (99%) rename tests/{countries => entities/iso3166}/test_jamaica.py (98%) rename tests/{countries => entities/iso3166}/test_japan.py (99%) rename tests/{countries => entities/iso3166}/test_jersey.py (99%) rename tests/{countries => entities/iso3166}/test_jordan.py (98%) rename tests/{countries => entities/iso3166}/test_kazakhstan.py (98%) rename tests/{countries => entities/iso3166}/test_kenya.py (98%) rename tests/{countries => entities/iso3166}/test_kuwait.py (98%) rename tests/{countries => entities/iso3166}/test_kyrgyzstan.py (97%) rename tests/{countries => entities/iso3166}/test_laos.py (99%) rename tests/{countries => entities/iso3166}/test_latvia.py (99%) rename tests/{countries => entities/iso3166}/test_lesotho.py (97%) rename tests/{countries => entities/iso3166}/test_liechtenstein.py (99%) rename tests/{countries => entities/iso3166}/test_lithuania.py (99%) rename tests/{countries => entities/iso3166}/test_luxembourg.py (98%) rename tests/{countries => entities/iso3166}/test_madagascar.py (99%) rename tests/{countries => entities/iso3166}/test_malawi.py (98%) rename tests/{countries => entities/iso3166}/test_malaysia.py (99%) rename tests/{countries => entities/iso3166}/test_maldives.py (98%) rename tests/{countries => entities/iso3166}/test_malta.py (98%) rename tests/{countries => entities/iso3166}/test_marshall_islands.py (98%) rename tests/{countries => entities/iso3166}/test_mexico.py (98%) rename tests/{countries => entities/iso3166}/test_moldova.py (98%) rename tests/{countries => entities/iso3166}/test_monaco.py (98%) rename tests/{countries => entities/iso3166}/test_montenegro.py (97%) rename tests/{countries => entities/iso3166}/test_morocco.py (98%) rename tests/{countries => entities/iso3166}/test_mozambique.py (98%) rename tests/{countries => entities/iso3166}/test_namibia.py (97%) rename tests/{countries => entities/iso3166}/test_netherlands.py (99%) rename tests/{countries => entities/iso3166}/test_new_zealand.py (99%) rename tests/{countries => entities/iso3166}/test_nicaragua.py (98%) rename tests/{countries => entities/iso3166}/test_nigeria.py (98%) rename tests/{countries => entities/iso3166}/test_north_macedonia.py (95%) rename tests/{countries => entities/iso3166}/test_northern_mariana_islands.py (94%) rename tests/{countries => entities/iso3166}/test_norway.py (98%) rename tests/{countries => entities/iso3166}/test_pakistan.py (99%) rename tests/{countries => entities/iso3166}/test_palau.py (99%) rename tests/{countries => entities/iso3166}/test_panama.py (98%) rename tests/{countries => entities/iso3166}/test_papua_new_guinea.py (99%) rename tests/{countries => entities/iso3166}/test_paraguay.py (99%) rename tests/{countries => entities/iso3166}/test_peru.py (98%) rename tests/{countries => entities/iso3166}/test_philippines.py (96%) rename tests/{countries => entities/iso3166}/test_poland.py (99%) rename tests/{countries => entities/iso3166}/test_portugal.py (99%) rename tests/{countries => entities/iso3166}/test_puerto_rico.py (95%) rename tests/{countries => entities/iso3166}/test_romania.py (99%) rename tests/{countries => entities/iso3166}/test_russia.py (99%) rename tests/{countries => entities/iso3166}/test_san_marino.py (97%) rename tests/{countries => entities/iso3166}/test_saudi_arabia.py (99%) rename tests/{countries => entities/iso3166}/test_serbia.py (98%) rename tests/{countries => entities/iso3166}/test_seychelles.py (99%) rename tests/{countries => entities/iso3166}/test_singapore.py (99%) rename tests/{countries => entities/iso3166}/test_slovakia.py (99%) rename tests/{countries => entities/iso3166}/test_slovenia.py (98%) rename tests/{countries => entities/iso3166}/test_south_africa.py (99%) rename tests/{countries => entities/iso3166}/test_south_korea.py (99%) rename tests/{countries => entities/iso3166}/test_spain.py (99%) rename tests/{countries => entities/iso3166}/test_sweden.py (99%) rename tests/{countries => entities/iso3166}/test_switzerland.py (99%) rename tests/{countries => entities/iso3166}/test_taiwan.py (99%) rename tests/{countries => entities/iso3166}/test_tanzania.py (99%) rename tests/{countries => entities/iso3166}/test_thailand.py (99%) rename tests/{countries => entities/iso3166}/test_timor_leste.py (99%) rename tests/{countries => entities/iso3166}/test_tonga.py (99%) rename tests/{countries => entities/iso3166}/test_tunisia.py (98%) rename tests/{countries => entities/iso3166}/test_turkey.py (99%) rename tests/{countries => entities/iso3166}/test_ukraine.py (99%) rename tests/{countries => entities/iso3166}/test_united_arab_emirates.py (98%) rename tests/{countries => entities/iso3166}/test_united_kingdom.py (99%) rename tests/{countries => entities/iso3166}/test_united_states.py (99%) rename tests/{countries => entities/iso3166}/test_united_states_minor_outlying_islands.py (92%) rename tests/{countries => entities/iso3166}/test_united_states_virgin_islands.py (94%) rename tests/{countries => entities/iso3166}/test_uruguay.py (99%) rename tests/{countries => entities/iso3166}/test_uzbekistan.py (99%) rename tests/{countries => entities/iso3166}/test_vanuatu.py (99%) rename tests/{countries => entities/iso3166}/test_vatican_city.py (98%) rename tests/{countries => entities/iso3166}/test_venezuela.py (99%) rename tests/{countries => entities/iso3166}/test_vietnam.py (98%) rename tests/{countries => entities/iso3166}/test_zambia.py (98%) rename tests/{countries => entities/iso3166}/test_zimbabwe.py (98%) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6ce9ea875..cdca1605b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - rst - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.7 + rev: v0.4.8 hooks: - id: ruff - id: ruff-format diff --git a/README.rst b/README.rst index daa875516..d11a69ecf 100644 --- a/README.rst +++ b/README.rst @@ -124,7 +124,7 @@ timestamps: '1/1/2014' in us_holidays # True 1388597445 in us_holidays # True -Some holidays may be only present in parts of a country: +Some holidays may be only present in parts of an entity: .. code-block:: python @@ -138,35 +138,35 @@ Please see the `python-holidays documentation`_ for additional examples and detailed information. -Available Countries -------------------- +Available ISO 3166 Entities +--------------------------- .. _ISO 3166-1 alpha-2 code: https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes .. _ISO 3166-2 code: https://en.wikipedia.org/wiki/ISO_3166-2 .. _ISO 639-1 code: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes .. _ISO 639-2 code: https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes -We currently support 148 country codes. The standard way to refer to a country +We currently support 148 ISO 3166 entity codes. The standard way to refer to an entity 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 countries have common or foreign +for a subdivision its `ISO 3166-2 code`_. Some entities 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. +Some of the entities 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 -a `ISO 639-1 code`_. A list of all languages supported by country is defined by +a `ISO 639-1 code`_. A list of all languages supported by entity is defined by ``supported_languages`` (optional) attribute. If there is no designated `ISO 639-1 code`_ then `ISO 639-2 code`_ can be used. -Many countries have other categories of holidays in addition to common (national-wide) holidays: +Many entities have other categories of holidays in addition to common (national-wide) holidays: bank holidays, school holidays, additional (paid or non-paid) holidays, holidays of state or 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. +categories supported by entity is defined by ``supported_categories`` (optional) attribute. -The following is a list of supported countries, their subdivisions followed by their +The following is a list of supported entities, 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 entities support **PUBLIC** holidays category by default. All other default values are highlighted with bold: @@ -175,7 +175,7 @@ All other default values are highlighted with bold: :header-rows: 1 :class: tight-table - * - Country + * - Entity - Code - Subdivisions - Supported Languages @@ -927,14 +927,13 @@ All other default values are highlighted with bold: - -Available Financial Markets -=========================== +Available ISO 10383 Entities +============================ .. _ISO 10383 MIC: https://www.iso20022.org/market-identifier-codes -The standard way to refer to a financial market is to use its `ISO 10383 MIC`_ -(Market Identifier Code) as a "country" code when available. The -following financial markets are available: +The standard way to refer to an ISO 10383 entity is to use its `ISO 10383 MIC`_ +(Market Identifier Code). The following ISO 10383 entities are available: .. list-table:: :widths: 23 4 83 diff --git a/docs/source/examples.rst b/docs/source/examples.rst index 2d6c084c8..1f60e55a0 100644 --- a/docs/source/examples.rst +++ b/docs/source/examples.rst @@ -35,7 +35,7 @@ functions to create the object using a string with the country code: .. code-block:: python >>> us_holidays = holidays.country_holidays('US') - >>> nyse_holidays = holidays.financial_holidays('NYSE') + >>> nyse_holidays = holidays.entities.iso10383_holidays('NYSE') Let's print out the holidays in 2014 specific to California, USA: @@ -238,7 +238,7 @@ to override is :py:meth:`_populate`: .. code-block:: python - >>> from holidays.countries import US + >>> from holidays.entities.iso3166 import US >>> class CorporateHolidays(US): >>> def _populate(self, year): >>> # Populate the holiday list with the default US holidays. diff --git a/docs/source/modules.rst b/docs/source/modules.rst index a076b4ef0..1a84a4bf4 100644 --- a/docs/source/modules.rst +++ b/docs/source/modules.rst @@ -5,5 +5,5 @@ Supported Entities :toctree: _autosummary :recursive: - holidays.countries - holidays.financial + holidays.entities.iso3166 + holidays.entities.iso10383 diff --git a/holidays/__init__.py b/holidays/__init__.py index 1607c2935..457b28373 100644 --- a/holidays/__init__.py +++ b/holidays/__init__.py @@ -26,8 +26,8 @@ __version__ = "0.51" -EntityLoader.load("countries", globals()) -EntityLoader.load("financial", globals()) +EntityLoader.load("iso3166", globals()) +EntityLoader.load("iso10383", globals()) warnings.warn( FUTURE_INCOMPATIBILITY_WARNING_TEMPLATE.format(version=__version__), diff --git a/tests/countries/__init__.py b/holidays/entities/__init__.py similarity index 100% rename from tests/countries/__init__.py rename to holidays/entities/__init__.py diff --git a/holidays/entities/iso10383/README.md b/holidays/entities/iso10383/README.md new file mode 100644 index 000000000..ff25158db --- /dev/null +++ b/holidays/entities/iso10383/README.md @@ -0,0 +1,10 @@ + +# [ISO-10383 entities](https://en.wikipedia.org/wiki/Market_Identifier_Code) + +ISO 10383 is the ISO standard that specifies a universal method of identifying exchanges, trading platforms and regulated or non-regulated markets as sources of prices and related information in order to facilitate automated processing. + +Additional information: + +- +- +- diff --git a/holidays/financial/__init__.py b/holidays/entities/iso10383/__init__.py similarity index 100% rename from holidays/financial/__init__.py rename to holidays/entities/iso10383/__init__.py diff --git a/holidays/financial/european_central_bank.py b/holidays/entities/iso10383/european_central_bank.py similarity index 100% rename from holidays/financial/european_central_bank.py rename to holidays/entities/iso10383/european_central_bank.py diff --git a/holidays/financial/ice_futures_europe.py b/holidays/entities/iso10383/ice_futures_europe.py similarity index 100% rename from holidays/financial/ice_futures_europe.py rename to holidays/entities/iso10383/ice_futures_europe.py diff --git a/holidays/financial/ny_stock_exchange.py b/holidays/entities/iso10383/ny_stock_exchange.py similarity index 100% rename from holidays/financial/ny_stock_exchange.py rename to holidays/entities/iso10383/ny_stock_exchange.py diff --git a/holidays/entities/iso3166/README.md b/holidays/entities/iso3166/README.md new file mode 100644 index 000000000..786410e7e --- /dev/null +++ b/holidays/entities/iso3166/README.md @@ -0,0 +1,12 @@ +# [ISO-3166 entities](https://en.wikipedia.org/wiki/ISO_3166) + +ISO 3166-1 alpha-2 codes are two-letter country codes defined in ISO 3166-1, part of the ISO 3166 standard[1] published by the International Organization for Standardization (ISO), to represent countries, dependent territories, and special areas of geographical interest. They are the most widely used of the country codes published by ISO (the others being alpha-3 and numeric), and are used most prominently for the Internet's country code top-level domains (with a few exceptions). + +ISO 3166-1 alpha-3 codes are three-letter country codes defined in ISO 3166-1, part of the ISO 3166 standard published by the International Organization for Standardization (ISO), to represent countries, dependent territories, and special areas of geographical interest. They allow a better visual association between the codes and the country names than the two-letter alpha-2 codes (the third set of codes is numeric and hence offers no visual association). + +ISO 3166-2 is part of the ISO 3166 standard published by the International Organization for Standardization (ISO), and defines codes for identifying the principal subdivisions (e.g., provinces or states) of all countries coded in ISO 3166-1. + +Additional information: + +- +- diff --git a/holidays/countries/__init__.py b/holidays/entities/iso3166/__init__.py similarity index 100% rename from holidays/countries/__init__.py rename to holidays/entities/iso3166/__init__.py diff --git a/holidays/countries/albania.py b/holidays/entities/iso3166/albania.py similarity index 100% rename from holidays/countries/albania.py rename to holidays/entities/iso3166/albania.py diff --git a/holidays/countries/algeria.py b/holidays/entities/iso3166/algeria.py similarity index 100% rename from holidays/countries/algeria.py rename to holidays/entities/iso3166/algeria.py diff --git a/holidays/countries/american_samoa.py b/holidays/entities/iso3166/american_samoa.py similarity index 95% rename from holidays/countries/american_samoa.py rename to holidays/entities/iso3166/american_samoa.py index 52cfda484..4f95f1c6d 100644 --- a/holidays/countries/american_samoa.py +++ b/holidays/entities/iso3166/american_samoa.py @@ -11,7 +11,7 @@ # License: MIT (see LICENSE file) from holidays.constants import PUBLIC, UNOFFICIAL -from holidays.countries.united_states import US +from holidays.entities.iso3166.united_states import US class HolidaysAS(US): diff --git a/holidays/countries/andorra.py b/holidays/entities/iso3166/andorra.py similarity index 100% rename from holidays/countries/andorra.py rename to holidays/entities/iso3166/andorra.py diff --git a/holidays/countries/angola.py b/holidays/entities/iso3166/angola.py similarity index 100% rename from holidays/countries/angola.py rename to holidays/entities/iso3166/angola.py diff --git a/holidays/countries/argentina.py b/holidays/entities/iso3166/argentina.py similarity index 100% rename from holidays/countries/argentina.py rename to holidays/entities/iso3166/argentina.py diff --git a/holidays/countries/armenia.py b/holidays/entities/iso3166/armenia.py similarity index 100% rename from holidays/countries/armenia.py rename to holidays/entities/iso3166/armenia.py diff --git a/holidays/countries/aruba.py b/holidays/entities/iso3166/aruba.py similarity index 100% rename from holidays/countries/aruba.py rename to holidays/entities/iso3166/aruba.py diff --git a/holidays/countries/australia.py b/holidays/entities/iso3166/australia.py similarity index 100% rename from holidays/countries/australia.py rename to holidays/entities/iso3166/australia.py diff --git a/holidays/countries/austria.py b/holidays/entities/iso3166/austria.py similarity index 100% rename from holidays/countries/austria.py rename to holidays/entities/iso3166/austria.py diff --git a/holidays/countries/azerbaijan.py b/holidays/entities/iso3166/azerbaijan.py similarity index 100% rename from holidays/countries/azerbaijan.py rename to holidays/entities/iso3166/azerbaijan.py diff --git a/holidays/countries/bahamas.py b/holidays/entities/iso3166/bahamas.py similarity index 100% rename from holidays/countries/bahamas.py rename to holidays/entities/iso3166/bahamas.py diff --git a/holidays/countries/bahrain.py b/holidays/entities/iso3166/bahrain.py similarity index 100% rename from holidays/countries/bahrain.py rename to holidays/entities/iso3166/bahrain.py diff --git a/holidays/countries/bangladesh.py b/holidays/entities/iso3166/bangladesh.py similarity index 100% rename from holidays/countries/bangladesh.py rename to holidays/entities/iso3166/bangladesh.py diff --git a/holidays/countries/barbados.py b/holidays/entities/iso3166/barbados.py similarity index 100% rename from holidays/countries/barbados.py rename to holidays/entities/iso3166/barbados.py diff --git a/holidays/countries/belarus.py b/holidays/entities/iso3166/belarus.py similarity index 100% rename from holidays/countries/belarus.py rename to holidays/entities/iso3166/belarus.py diff --git a/holidays/countries/belgium.py b/holidays/entities/iso3166/belgium.py similarity index 100% rename from holidays/countries/belgium.py rename to holidays/entities/iso3166/belgium.py diff --git a/holidays/countries/belize.py b/holidays/entities/iso3166/belize.py similarity index 100% rename from holidays/countries/belize.py rename to holidays/entities/iso3166/belize.py diff --git a/holidays/countries/bolivia.py b/holidays/entities/iso3166/bolivia.py similarity index 100% rename from holidays/countries/bolivia.py rename to holidays/entities/iso3166/bolivia.py diff --git a/holidays/countries/bosnia_and_herzegovina.py b/holidays/entities/iso3166/bosnia_and_herzegovina.py similarity index 100% rename from holidays/countries/bosnia_and_herzegovina.py rename to holidays/entities/iso3166/bosnia_and_herzegovina.py diff --git a/holidays/countries/botswana.py b/holidays/entities/iso3166/botswana.py similarity index 100% rename from holidays/countries/botswana.py rename to holidays/entities/iso3166/botswana.py diff --git a/holidays/countries/brazil.py b/holidays/entities/iso3166/brazil.py similarity index 100% rename from holidays/countries/brazil.py rename to holidays/entities/iso3166/brazil.py diff --git a/holidays/countries/brunei.py b/holidays/entities/iso3166/brunei.py similarity index 100% rename from holidays/countries/brunei.py rename to holidays/entities/iso3166/brunei.py diff --git a/holidays/countries/bulgaria.py b/holidays/entities/iso3166/bulgaria.py similarity index 100% rename from holidays/countries/bulgaria.py rename to holidays/entities/iso3166/bulgaria.py diff --git a/holidays/countries/burkina_faso.py b/holidays/entities/iso3166/burkina_faso.py similarity index 100% rename from holidays/countries/burkina_faso.py rename to holidays/entities/iso3166/burkina_faso.py diff --git a/holidays/countries/burundi.py b/holidays/entities/iso3166/burundi.py similarity index 100% rename from holidays/countries/burundi.py rename to holidays/entities/iso3166/burundi.py diff --git a/holidays/countries/cambodia.py b/holidays/entities/iso3166/cambodia.py similarity index 100% rename from holidays/countries/cambodia.py rename to holidays/entities/iso3166/cambodia.py diff --git a/holidays/countries/cameroon.py b/holidays/entities/iso3166/cameroon.py similarity index 100% rename from holidays/countries/cameroon.py rename to holidays/entities/iso3166/cameroon.py diff --git a/holidays/countries/canada.py b/holidays/entities/iso3166/canada.py similarity index 100% rename from holidays/countries/canada.py rename to holidays/entities/iso3166/canada.py diff --git a/holidays/countries/chad.py b/holidays/entities/iso3166/chad.py similarity index 100% rename from holidays/countries/chad.py rename to holidays/entities/iso3166/chad.py diff --git a/holidays/countries/chile.py b/holidays/entities/iso3166/chile.py similarity index 100% rename from holidays/countries/chile.py rename to holidays/entities/iso3166/chile.py diff --git a/holidays/countries/china.py b/holidays/entities/iso3166/china.py similarity index 100% rename from holidays/countries/china.py rename to holidays/entities/iso3166/china.py diff --git a/holidays/countries/colombia.py b/holidays/entities/iso3166/colombia.py similarity index 100% rename from holidays/countries/colombia.py rename to holidays/entities/iso3166/colombia.py diff --git a/holidays/countries/costa_rica.py b/holidays/entities/iso3166/costa_rica.py similarity index 100% rename from holidays/countries/costa_rica.py rename to holidays/entities/iso3166/costa_rica.py diff --git a/holidays/countries/croatia.py b/holidays/entities/iso3166/croatia.py similarity index 100% rename from holidays/countries/croatia.py rename to holidays/entities/iso3166/croatia.py diff --git a/holidays/countries/cuba.py b/holidays/entities/iso3166/cuba.py similarity index 100% rename from holidays/countries/cuba.py rename to holidays/entities/iso3166/cuba.py diff --git a/holidays/countries/curacao.py b/holidays/entities/iso3166/curacao.py similarity index 100% rename from holidays/countries/curacao.py rename to holidays/entities/iso3166/curacao.py diff --git a/holidays/countries/cyprus.py b/holidays/entities/iso3166/cyprus.py similarity index 100% rename from holidays/countries/cyprus.py rename to holidays/entities/iso3166/cyprus.py diff --git a/holidays/countries/czechia.py b/holidays/entities/iso3166/czechia.py similarity index 100% rename from holidays/countries/czechia.py rename to holidays/entities/iso3166/czechia.py diff --git a/holidays/countries/denmark.py b/holidays/entities/iso3166/denmark.py similarity index 100% rename from holidays/countries/denmark.py rename to holidays/entities/iso3166/denmark.py diff --git a/holidays/countries/djibouti.py b/holidays/entities/iso3166/djibouti.py similarity index 100% rename from holidays/countries/djibouti.py rename to holidays/entities/iso3166/djibouti.py diff --git a/holidays/countries/dominican_republic.py b/holidays/entities/iso3166/dominican_republic.py similarity index 100% rename from holidays/countries/dominican_republic.py rename to holidays/entities/iso3166/dominican_republic.py diff --git a/holidays/countries/ecuador.py b/holidays/entities/iso3166/ecuador.py similarity index 100% rename from holidays/countries/ecuador.py rename to holidays/entities/iso3166/ecuador.py diff --git a/holidays/countries/egypt.py b/holidays/entities/iso3166/egypt.py similarity index 100% rename from holidays/countries/egypt.py rename to holidays/entities/iso3166/egypt.py diff --git a/holidays/countries/el_salvador.py b/holidays/entities/iso3166/el_salvador.py similarity index 100% rename from holidays/countries/el_salvador.py rename to holidays/entities/iso3166/el_salvador.py diff --git a/holidays/countries/estonia.py b/holidays/entities/iso3166/estonia.py similarity index 100% rename from holidays/countries/estonia.py rename to holidays/entities/iso3166/estonia.py diff --git a/holidays/countries/eswatini.py b/holidays/entities/iso3166/eswatini.py similarity index 100% rename from holidays/countries/eswatini.py rename to holidays/entities/iso3166/eswatini.py diff --git a/holidays/countries/ethiopia.py b/holidays/entities/iso3166/ethiopia.py similarity index 100% rename from holidays/countries/ethiopia.py rename to holidays/entities/iso3166/ethiopia.py diff --git a/holidays/countries/finland.py b/holidays/entities/iso3166/finland.py similarity index 100% rename from holidays/countries/finland.py rename to holidays/entities/iso3166/finland.py diff --git a/holidays/countries/france.py b/holidays/entities/iso3166/france.py similarity index 100% rename from holidays/countries/france.py rename to holidays/entities/iso3166/france.py diff --git a/holidays/countries/gabon.py b/holidays/entities/iso3166/gabon.py similarity index 100% rename from holidays/countries/gabon.py rename to holidays/entities/iso3166/gabon.py diff --git a/holidays/countries/georgia.py b/holidays/entities/iso3166/georgia.py similarity index 100% rename from holidays/countries/georgia.py rename to holidays/entities/iso3166/georgia.py diff --git a/holidays/countries/germany.py b/holidays/entities/iso3166/germany.py similarity index 100% rename from holidays/countries/germany.py rename to holidays/entities/iso3166/germany.py diff --git a/holidays/countries/ghana.py b/holidays/entities/iso3166/ghana.py similarity index 100% rename from holidays/countries/ghana.py rename to holidays/entities/iso3166/ghana.py diff --git a/holidays/countries/greece.py b/holidays/entities/iso3166/greece.py similarity index 100% rename from holidays/countries/greece.py rename to holidays/entities/iso3166/greece.py diff --git a/holidays/countries/greenland.py b/holidays/entities/iso3166/greenland.py similarity index 100% rename from holidays/countries/greenland.py rename to holidays/entities/iso3166/greenland.py diff --git a/holidays/countries/guam.py b/holidays/entities/iso3166/guam.py similarity index 95% rename from holidays/countries/guam.py rename to holidays/entities/iso3166/guam.py index 88099b042..810441d5b 100644 --- a/holidays/countries/guam.py +++ b/holidays/entities/iso3166/guam.py @@ -11,7 +11,7 @@ # License: MIT (see LICENSE file) from holidays.constants import PUBLIC, UNOFFICIAL -from holidays.countries.united_states import US +from holidays.entities.iso3166.united_states import US class HolidaysGU(US): diff --git a/holidays/countries/guatemala.py b/holidays/entities/iso3166/guatemala.py similarity index 100% rename from holidays/countries/guatemala.py rename to holidays/entities/iso3166/guatemala.py diff --git a/holidays/countries/honduras.py b/holidays/entities/iso3166/honduras.py similarity index 100% rename from holidays/countries/honduras.py rename to holidays/entities/iso3166/honduras.py diff --git a/holidays/countries/hongkong.py b/holidays/entities/iso3166/hongkong.py similarity index 100% rename from holidays/countries/hongkong.py rename to holidays/entities/iso3166/hongkong.py diff --git a/holidays/countries/hungary.py b/holidays/entities/iso3166/hungary.py similarity index 100% rename from holidays/countries/hungary.py rename to holidays/entities/iso3166/hungary.py diff --git a/holidays/countries/iceland.py b/holidays/entities/iso3166/iceland.py similarity index 100% rename from holidays/countries/iceland.py rename to holidays/entities/iso3166/iceland.py diff --git a/holidays/countries/india.py b/holidays/entities/iso3166/india.py similarity index 100% rename from holidays/countries/india.py rename to holidays/entities/iso3166/india.py diff --git a/holidays/countries/indonesia.py b/holidays/entities/iso3166/indonesia.py similarity index 100% rename from holidays/countries/indonesia.py rename to holidays/entities/iso3166/indonesia.py diff --git a/holidays/countries/iran.py b/holidays/entities/iso3166/iran.py similarity index 100% rename from holidays/countries/iran.py rename to holidays/entities/iso3166/iran.py diff --git a/holidays/countries/ireland.py b/holidays/entities/iso3166/ireland.py similarity index 100% rename from holidays/countries/ireland.py rename to holidays/entities/iso3166/ireland.py diff --git a/holidays/countries/isle_of_man.py b/holidays/entities/iso3166/isle_of_man.py similarity index 95% rename from holidays/countries/isle_of_man.py rename to holidays/entities/iso3166/isle_of_man.py index a15101e12..645d5356b 100644 --- a/holidays/countries/isle_of_man.py +++ b/holidays/entities/iso3166/isle_of_man.py @@ -10,7 +10,7 @@ # Website: https://github.com/vacanza/python-holidays # License: MIT (see LICENSE file) -from holidays.countries.united_kingdom import UnitedKingdom, UnitedKingdomStaticHolidays +from holidays.entities.iso3166.united_kingdom import UnitedKingdom, UnitedKingdomStaticHolidays from holidays.groups import ChristianHolidays, InternationalHolidays, StaticHolidays from holidays.observed_holiday_base import ObservedHolidayBase, SAT_SUN_TO_NEXT_MON diff --git a/holidays/countries/israel.py b/holidays/entities/iso3166/israel.py similarity index 100% rename from holidays/countries/israel.py rename to holidays/entities/iso3166/israel.py diff --git a/holidays/countries/italy.py b/holidays/entities/iso3166/italy.py similarity index 100% rename from holidays/countries/italy.py rename to holidays/entities/iso3166/italy.py diff --git a/holidays/countries/jamaica.py b/holidays/entities/iso3166/jamaica.py similarity index 100% rename from holidays/countries/jamaica.py rename to holidays/entities/iso3166/jamaica.py diff --git a/holidays/countries/japan.py b/holidays/entities/iso3166/japan.py similarity index 100% rename from holidays/countries/japan.py rename to holidays/entities/iso3166/japan.py diff --git a/holidays/countries/jersey.py b/holidays/entities/iso3166/jersey.py similarity index 100% rename from holidays/countries/jersey.py rename to holidays/entities/iso3166/jersey.py diff --git a/holidays/countries/jordan.py b/holidays/entities/iso3166/jordan.py similarity index 100% rename from holidays/countries/jordan.py rename to holidays/entities/iso3166/jordan.py diff --git a/holidays/countries/kazakhstan.py b/holidays/entities/iso3166/kazakhstan.py similarity index 100% rename from holidays/countries/kazakhstan.py rename to holidays/entities/iso3166/kazakhstan.py diff --git a/holidays/countries/kenya.py b/holidays/entities/iso3166/kenya.py similarity index 100% rename from holidays/countries/kenya.py rename to holidays/entities/iso3166/kenya.py diff --git a/holidays/countries/kuwait.py b/holidays/entities/iso3166/kuwait.py similarity index 100% rename from holidays/countries/kuwait.py rename to holidays/entities/iso3166/kuwait.py diff --git a/holidays/countries/kyrgyzstan.py b/holidays/entities/iso3166/kyrgyzstan.py similarity index 100% rename from holidays/countries/kyrgyzstan.py rename to holidays/entities/iso3166/kyrgyzstan.py diff --git a/holidays/countries/laos.py b/holidays/entities/iso3166/laos.py similarity index 100% rename from holidays/countries/laos.py rename to holidays/entities/iso3166/laos.py diff --git a/holidays/countries/latvia.py b/holidays/entities/iso3166/latvia.py similarity index 100% rename from holidays/countries/latvia.py rename to holidays/entities/iso3166/latvia.py diff --git a/holidays/countries/lesotho.py b/holidays/entities/iso3166/lesotho.py similarity index 100% rename from holidays/countries/lesotho.py rename to holidays/entities/iso3166/lesotho.py diff --git a/holidays/countries/liechtenstein.py b/holidays/entities/iso3166/liechtenstein.py similarity index 100% rename from holidays/countries/liechtenstein.py rename to holidays/entities/iso3166/liechtenstein.py diff --git a/holidays/countries/lithuania.py b/holidays/entities/iso3166/lithuania.py similarity index 100% rename from holidays/countries/lithuania.py rename to holidays/entities/iso3166/lithuania.py diff --git a/holidays/countries/luxembourg.py b/holidays/entities/iso3166/luxembourg.py similarity index 100% rename from holidays/countries/luxembourg.py rename to holidays/entities/iso3166/luxembourg.py diff --git a/holidays/countries/madagascar.py b/holidays/entities/iso3166/madagascar.py similarity index 100% rename from holidays/countries/madagascar.py rename to holidays/entities/iso3166/madagascar.py diff --git a/holidays/countries/malawi.py b/holidays/entities/iso3166/malawi.py similarity index 100% rename from holidays/countries/malawi.py rename to holidays/entities/iso3166/malawi.py diff --git a/holidays/countries/malaysia.py b/holidays/entities/iso3166/malaysia.py similarity index 100% rename from holidays/countries/malaysia.py rename to holidays/entities/iso3166/malaysia.py diff --git a/holidays/countries/maldives.py b/holidays/entities/iso3166/maldives.py similarity index 100% rename from holidays/countries/maldives.py rename to holidays/entities/iso3166/maldives.py diff --git a/holidays/countries/malta.py b/holidays/entities/iso3166/malta.py similarity index 100% rename from holidays/countries/malta.py rename to holidays/entities/iso3166/malta.py diff --git a/holidays/countries/marshall_islands.py b/holidays/entities/iso3166/marshall_islands.py similarity index 100% rename from holidays/countries/marshall_islands.py rename to holidays/entities/iso3166/marshall_islands.py diff --git a/holidays/countries/mexico.py b/holidays/entities/iso3166/mexico.py similarity index 100% rename from holidays/countries/mexico.py rename to holidays/entities/iso3166/mexico.py diff --git a/holidays/countries/moldova.py b/holidays/entities/iso3166/moldova.py similarity index 100% rename from holidays/countries/moldova.py rename to holidays/entities/iso3166/moldova.py diff --git a/holidays/countries/monaco.py b/holidays/entities/iso3166/monaco.py similarity index 100% rename from holidays/countries/monaco.py rename to holidays/entities/iso3166/monaco.py diff --git a/holidays/countries/montenegro.py b/holidays/entities/iso3166/montenegro.py similarity index 100% rename from holidays/countries/montenegro.py rename to holidays/entities/iso3166/montenegro.py diff --git a/holidays/countries/morocco.py b/holidays/entities/iso3166/morocco.py similarity index 100% rename from holidays/countries/morocco.py rename to holidays/entities/iso3166/morocco.py diff --git a/holidays/countries/mozambique.py b/holidays/entities/iso3166/mozambique.py similarity index 100% rename from holidays/countries/mozambique.py rename to holidays/entities/iso3166/mozambique.py diff --git a/holidays/countries/namibia.py b/holidays/entities/iso3166/namibia.py similarity index 100% rename from holidays/countries/namibia.py rename to holidays/entities/iso3166/namibia.py diff --git a/holidays/countries/netherlands.py b/holidays/entities/iso3166/netherlands.py similarity index 100% rename from holidays/countries/netherlands.py rename to holidays/entities/iso3166/netherlands.py diff --git a/holidays/countries/new_zealand.py b/holidays/entities/iso3166/new_zealand.py similarity index 100% rename from holidays/countries/new_zealand.py rename to holidays/entities/iso3166/new_zealand.py diff --git a/holidays/countries/nicaragua.py b/holidays/entities/iso3166/nicaragua.py similarity index 100% rename from holidays/countries/nicaragua.py rename to holidays/entities/iso3166/nicaragua.py diff --git a/holidays/countries/nigeria.py b/holidays/entities/iso3166/nigeria.py similarity index 100% rename from holidays/countries/nigeria.py rename to holidays/entities/iso3166/nigeria.py diff --git a/holidays/countries/north_macedonia.py b/holidays/entities/iso3166/north_macedonia.py similarity index 100% rename from holidays/countries/north_macedonia.py rename to holidays/entities/iso3166/north_macedonia.py diff --git a/holidays/countries/northern_mariana_islands.py b/holidays/entities/iso3166/northern_mariana_islands.py similarity index 95% rename from holidays/countries/northern_mariana_islands.py rename to holidays/entities/iso3166/northern_mariana_islands.py index 3c3e46da8..fd1ef82ac 100644 --- a/holidays/countries/northern_mariana_islands.py +++ b/holidays/entities/iso3166/northern_mariana_islands.py @@ -11,7 +11,7 @@ # License: MIT (see LICENSE file) from holidays.constants import PUBLIC, UNOFFICIAL -from holidays.countries.united_states import US +from holidays.entities.iso3166.united_states import US class HolidaysMP(US): diff --git a/holidays/countries/norway.py b/holidays/entities/iso3166/norway.py similarity index 100% rename from holidays/countries/norway.py rename to holidays/entities/iso3166/norway.py diff --git a/holidays/countries/pakistan.py b/holidays/entities/iso3166/pakistan.py similarity index 100% rename from holidays/countries/pakistan.py rename to holidays/entities/iso3166/pakistan.py diff --git a/holidays/countries/palau.py b/holidays/entities/iso3166/palau.py similarity index 100% rename from holidays/countries/palau.py rename to holidays/entities/iso3166/palau.py diff --git a/holidays/countries/panama.py b/holidays/entities/iso3166/panama.py similarity index 100% rename from holidays/countries/panama.py rename to holidays/entities/iso3166/panama.py diff --git a/holidays/countries/papua_new_guinea.py b/holidays/entities/iso3166/papua_new_guinea.py similarity index 100% rename from holidays/countries/papua_new_guinea.py rename to holidays/entities/iso3166/papua_new_guinea.py diff --git a/holidays/countries/paraguay.py b/holidays/entities/iso3166/paraguay.py similarity index 100% rename from holidays/countries/paraguay.py rename to holidays/entities/iso3166/paraguay.py diff --git a/holidays/countries/peru.py b/holidays/entities/iso3166/peru.py similarity index 100% rename from holidays/countries/peru.py rename to holidays/entities/iso3166/peru.py diff --git a/holidays/countries/philippines.py b/holidays/entities/iso3166/philippines.py similarity index 100% rename from holidays/countries/philippines.py rename to holidays/entities/iso3166/philippines.py diff --git a/holidays/countries/poland.py b/holidays/entities/iso3166/poland.py similarity index 100% rename from holidays/countries/poland.py rename to holidays/entities/iso3166/poland.py diff --git a/holidays/countries/portugal.py b/holidays/entities/iso3166/portugal.py similarity index 100% rename from holidays/countries/portugal.py rename to holidays/entities/iso3166/portugal.py diff --git a/holidays/countries/puerto_rico.py b/holidays/entities/iso3166/puerto_rico.py similarity index 95% rename from holidays/countries/puerto_rico.py rename to holidays/entities/iso3166/puerto_rico.py index 94b0f53ea..c1694d4ff 100644 --- a/holidays/countries/puerto_rico.py +++ b/holidays/entities/iso3166/puerto_rico.py @@ -11,7 +11,7 @@ # License: MIT (see LICENSE file) from holidays.constants import PUBLIC, UNOFFICIAL -from holidays.countries.united_states import US +from holidays.entities.iso3166.united_states import US class HolidaysPR(US): diff --git a/holidays/countries/romania.py b/holidays/entities/iso3166/romania.py similarity index 100% rename from holidays/countries/romania.py rename to holidays/entities/iso3166/romania.py diff --git a/holidays/countries/russia.py b/holidays/entities/iso3166/russia.py similarity index 100% rename from holidays/countries/russia.py rename to holidays/entities/iso3166/russia.py diff --git a/holidays/countries/san_marino.py b/holidays/entities/iso3166/san_marino.py similarity index 100% rename from holidays/countries/san_marino.py rename to holidays/entities/iso3166/san_marino.py diff --git a/holidays/countries/saudi_arabia.py b/holidays/entities/iso3166/saudi_arabia.py similarity index 100% rename from holidays/countries/saudi_arabia.py rename to holidays/entities/iso3166/saudi_arabia.py diff --git a/holidays/countries/serbia.py b/holidays/entities/iso3166/serbia.py similarity index 100% rename from holidays/countries/serbia.py rename to holidays/entities/iso3166/serbia.py diff --git a/holidays/countries/seychelles.py b/holidays/entities/iso3166/seychelles.py similarity index 100% rename from holidays/countries/seychelles.py rename to holidays/entities/iso3166/seychelles.py diff --git a/holidays/countries/singapore.py b/holidays/entities/iso3166/singapore.py similarity index 100% rename from holidays/countries/singapore.py rename to holidays/entities/iso3166/singapore.py diff --git a/holidays/countries/slovakia.py b/holidays/entities/iso3166/slovakia.py similarity index 100% rename from holidays/countries/slovakia.py rename to holidays/entities/iso3166/slovakia.py diff --git a/holidays/countries/slovenia.py b/holidays/entities/iso3166/slovenia.py similarity index 100% rename from holidays/countries/slovenia.py rename to holidays/entities/iso3166/slovenia.py diff --git a/holidays/countries/south_africa.py b/holidays/entities/iso3166/south_africa.py similarity index 100% rename from holidays/countries/south_africa.py rename to holidays/entities/iso3166/south_africa.py diff --git a/holidays/countries/south_korea.py b/holidays/entities/iso3166/south_korea.py similarity index 100% rename from holidays/countries/south_korea.py rename to holidays/entities/iso3166/south_korea.py diff --git a/holidays/countries/spain.py b/holidays/entities/iso3166/spain.py similarity index 100% rename from holidays/countries/spain.py rename to holidays/entities/iso3166/spain.py diff --git a/holidays/countries/sweden.py b/holidays/entities/iso3166/sweden.py similarity index 100% rename from holidays/countries/sweden.py rename to holidays/entities/iso3166/sweden.py diff --git a/holidays/countries/switzerland.py b/holidays/entities/iso3166/switzerland.py similarity index 100% rename from holidays/countries/switzerland.py rename to holidays/entities/iso3166/switzerland.py diff --git a/holidays/countries/taiwan.py b/holidays/entities/iso3166/taiwan.py similarity index 100% rename from holidays/countries/taiwan.py rename to holidays/entities/iso3166/taiwan.py diff --git a/holidays/countries/tanzania.py b/holidays/entities/iso3166/tanzania.py similarity index 100% rename from holidays/countries/tanzania.py rename to holidays/entities/iso3166/tanzania.py diff --git a/holidays/countries/thailand.py b/holidays/entities/iso3166/thailand.py similarity index 100% rename from holidays/countries/thailand.py rename to holidays/entities/iso3166/thailand.py diff --git a/holidays/countries/timor_leste.py b/holidays/entities/iso3166/timor_leste.py similarity index 100% rename from holidays/countries/timor_leste.py rename to holidays/entities/iso3166/timor_leste.py diff --git a/holidays/countries/tonga.py b/holidays/entities/iso3166/tonga.py similarity index 100% rename from holidays/countries/tonga.py rename to holidays/entities/iso3166/tonga.py diff --git a/holidays/countries/tunisia.py b/holidays/entities/iso3166/tunisia.py similarity index 100% rename from holidays/countries/tunisia.py rename to holidays/entities/iso3166/tunisia.py diff --git a/holidays/countries/turkey.py b/holidays/entities/iso3166/turkey.py similarity index 100% rename from holidays/countries/turkey.py rename to holidays/entities/iso3166/turkey.py diff --git a/holidays/countries/ukraine.py b/holidays/entities/iso3166/ukraine.py similarity index 100% rename from holidays/countries/ukraine.py rename to holidays/entities/iso3166/ukraine.py diff --git a/holidays/countries/united_arab_emirates.py b/holidays/entities/iso3166/united_arab_emirates.py similarity index 100% rename from holidays/countries/united_arab_emirates.py rename to holidays/entities/iso3166/united_arab_emirates.py diff --git a/holidays/countries/united_kingdom.py b/holidays/entities/iso3166/united_kingdom.py similarity index 100% rename from holidays/countries/united_kingdom.py rename to holidays/entities/iso3166/united_kingdom.py diff --git a/holidays/countries/united_states.py b/holidays/entities/iso3166/united_states.py similarity index 100% rename from holidays/countries/united_states.py rename to holidays/entities/iso3166/united_states.py diff --git a/holidays/countries/united_states_minor_outlying_islands.py b/holidays/entities/iso3166/united_states_minor_outlying_islands.py similarity index 95% rename from holidays/countries/united_states_minor_outlying_islands.py rename to holidays/entities/iso3166/united_states_minor_outlying_islands.py index e24cf2b8f..db8a806a1 100644 --- a/holidays/countries/united_states_minor_outlying_islands.py +++ b/holidays/entities/iso3166/united_states_minor_outlying_islands.py @@ -11,7 +11,7 @@ # License: MIT (see LICENSE file) from holidays.constants import PUBLIC, UNOFFICIAL -from holidays.countries.united_states import US +from holidays.entities.iso3166.united_states import US class HolidaysUM(US): diff --git a/holidays/countries/united_states_virgin_islands.py b/holidays/entities/iso3166/united_states_virgin_islands.py similarity index 95% rename from holidays/countries/united_states_virgin_islands.py rename to holidays/entities/iso3166/united_states_virgin_islands.py index 9733d332f..b0b976000 100644 --- a/holidays/countries/united_states_virgin_islands.py +++ b/holidays/entities/iso3166/united_states_virgin_islands.py @@ -11,7 +11,7 @@ # License: MIT (see LICENSE file) from holidays.constants import PUBLIC, UNOFFICIAL -from holidays.countries.united_states import US +from holidays.entities.iso3166.united_states import US class HolidaysVI(US): diff --git a/holidays/countries/uruguay.py b/holidays/entities/iso3166/uruguay.py similarity index 100% rename from holidays/countries/uruguay.py rename to holidays/entities/iso3166/uruguay.py diff --git a/holidays/countries/uzbekistan.py b/holidays/entities/iso3166/uzbekistan.py similarity index 100% rename from holidays/countries/uzbekistan.py rename to holidays/entities/iso3166/uzbekistan.py diff --git a/holidays/countries/vanuatu.py b/holidays/entities/iso3166/vanuatu.py similarity index 100% rename from holidays/countries/vanuatu.py rename to holidays/entities/iso3166/vanuatu.py diff --git a/holidays/countries/vatican_city.py b/holidays/entities/iso3166/vatican_city.py similarity index 100% rename from holidays/countries/vatican_city.py rename to holidays/entities/iso3166/vatican_city.py diff --git a/holidays/countries/venezuela.py b/holidays/entities/iso3166/venezuela.py similarity index 100% rename from holidays/countries/venezuela.py rename to holidays/entities/iso3166/venezuela.py diff --git a/holidays/countries/vietnam.py b/holidays/entities/iso3166/vietnam.py similarity index 100% rename from holidays/countries/vietnam.py rename to holidays/entities/iso3166/vietnam.py diff --git a/holidays/countries/zambia.py b/holidays/entities/iso3166/zambia.py similarity index 100% rename from holidays/countries/zambia.py rename to holidays/entities/iso3166/zambia.py diff --git a/holidays/countries/zimbabwe.py b/holidays/entities/iso3166/zimbabwe.py similarity index 100% rename from holidays/countries/zimbabwe.py rename to holidays/entities/iso3166/zimbabwe.py diff --git a/holidays/holiday_base.py b/holidays/holiday_base.py index fc5dd1c75..d69df80c4 100644 --- a/holidays/holiday_base.py +++ b/holidays/holiday_base.py @@ -639,7 +639,7 @@ def __repr__(self) -> str: parts = [] if hasattr(self, "market"): - parts.append(f"holidays.financial_holidays({self.market!r}") + parts.append(f"holidays.entities.iso10383_holidays({self.market!r}") parts.append(")") elif hasattr(self, "country"): parts.append(f"holidays.country_holidays({self.country!r}") diff --git a/holidays/registry.py b/holidays/registry.py index 0bb9efc25..a695f5df1 100644 --- a/holidays/registry.py +++ b/holidays/registry.py @@ -198,8 +198,8 @@ def __init__(self, path: str, *args, **kwargs) -> None: "This is a python-holidays entity loader class. " "For entity inheritance purposes please import a class you " "want to derive from directly: e.g., " - "`from holidays.countries import Entity` or " - "`from holidays.financial import Entity`." + "`from holidays.entities.iso3166 import Entity` or " + "`from holidays.entities.financial import Entity`." ) entity_path = path.split(".") @@ -273,11 +273,11 @@ def get_financial_codes(include_aliases: bool = True) -> Iterable[str]: @staticmethod def load(prefix: str, scope: Dict) -> None: """Load country or financial entities.""" - entity_mapping = COUNTRIES if prefix == "countries" else FINANCIAL + entity_mapping = COUNTRIES if prefix == "iso3166" else FINANCIAL for module, entities in entity_mapping.items(): scope.update( { - entity: EntityLoader(f"holidays.{prefix}.{module}.{entity}") + entity: EntityLoader(f"holidays.entities.{prefix}.{module}.{entity}") for entity in entities } ) diff --git a/pyproject.toml b/pyproject.toml index cf38dc56e..91cdf11f4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,7 +64,7 @@ select = ["E4", "E7", "E9", "F", "T"] max-string-length = 99 [[tool.mypy.overrides]] -module = "holidays.countries.*" +module = "holidays.entities.*" disable_error_code = ["override"] [[tool.mypy.overrides]] diff --git a/tests/financial/__init__.py b/tests/entities/__init__.py similarity index 100% rename from tests/financial/__init__.py rename to tests/entities/__init__.py diff --git a/tests/entities/iso10383/__init__.py b/tests/entities/iso10383/__init__.py new file mode 100644 index 000000000..4e11569da --- /dev/null +++ b/tests/entities/iso10383/__init__.py @@ -0,0 +1,11 @@ +# holidays +# -------- +# A fast, efficient Python library for generating country, province and state +# specific sets of holidays on the fly. It aims to make determining whether a +# specific date is a holiday as fast and flexible as possible. +# +# Authors: Vacanza Team and individual contributors (see AUTHORS file) +# dr-prodigy (c) 2017-2023 +# ryanss (c) 2014-2017 +# Website: https://github.com/vacanza/python-holidays +# License: MIT (see LICENSE file) diff --git a/tests/financial/test_european_central_bank.py b/tests/entities/iso10383/test_european_central_bank.py similarity index 96% rename from tests/financial/test_european_central_bank.py rename to tests/entities/iso10383/test_european_central_bank.py index dccdbbd15..acc49fcd9 100644 --- a/tests/financial/test_european_central_bank.py +++ b/tests/entities/iso10383/test_european_central_bank.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.financial.european_central_bank import EuropeanCentralBank, ECB, TAR +from holidays.entities.iso10383.european_central_bank import EuropeanCentralBank, ECB, TAR from tests.common import CommonFinancialTests diff --git a/tests/financial/test_ice_futures_europe.py b/tests/entities/iso10383/test_ice_futures_europe.py similarity index 95% rename from tests/financial/test_ice_futures_europe.py rename to tests/entities/iso10383/test_ice_futures_europe.py index 987ea3f2f..1a9149404 100644 --- a/tests/financial/test_ice_futures_europe.py +++ b/tests/entities/iso10383/test_ice_futures_europe.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.financial.ice_futures_europe import ICEFuturesEurope, IFEU +from holidays.entities.iso10383.ice_futures_europe import ICEFuturesEurope, IFEU from tests.common import CommonFinancialTests diff --git a/tests/financial/test_ny_stock_exchange.py b/tests/entities/iso10383/test_ny_stock_exchange.py similarity index 99% rename from tests/financial/test_ny_stock_exchange.py rename to tests/entities/iso10383/test_ny_stock_exchange.py index ea4c754d9..b26365ccb 100644 --- a/tests/financial/test_ny_stock_exchange.py +++ b/tests/entities/iso10383/test_ny_stock_exchange.py @@ -31,7 +31,7 @@ SAT, SUN, ) -from holidays.financial.ny_stock_exchange import NewYorkStockExchange, NYSE, XNYS +from holidays.entities.iso10383.ny_stock_exchange import NewYorkStockExchange, NYSE, XNYS from tests.common import CommonFinancialTests diff --git a/tests/entities/iso3166/__init__.py b/tests/entities/iso3166/__init__.py new file mode 100644 index 000000000..4e11569da --- /dev/null +++ b/tests/entities/iso3166/__init__.py @@ -0,0 +1,11 @@ +# holidays +# -------- +# A fast, efficient Python library for generating country, province and state +# specific sets of holidays on the fly. It aims to make determining whether a +# specific date is a holiday as fast and flexible as possible. +# +# Authors: Vacanza Team and individual contributors (see AUTHORS file) +# dr-prodigy (c) 2017-2023 +# ryanss (c) 2014-2017 +# Website: https://github.com/vacanza/python-holidays +# License: MIT (see LICENSE file) diff --git a/tests/countries/test_albania.py b/tests/entities/iso3166/test_albania.py similarity index 99% rename from tests/countries/test_albania.py rename to tests/entities/iso3166/test_albania.py index 0e44fab39..7fce55da8 100644 --- a/tests/countries/test_albania.py +++ b/tests/entities/iso3166/test_albania.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.albania import Albania, AL, ALB +from holidays.entities.iso3166.albania import Albania, AL, ALB from tests.common import CommonCountryTests diff --git a/tests/countries/test_algeria.py b/tests/entities/iso3166/test_algeria.py similarity index 98% rename from tests/countries/test_algeria.py rename to tests/entities/iso3166/test_algeria.py index 782b64dd5..ae490f387 100644 --- a/tests/countries/test_algeria.py +++ b/tests/entities/iso3166/test_algeria.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.algeria import Algeria, DZ, DZA +from holidays.entities.iso3166.algeria import Algeria, DZ, DZA from tests.common import CommonCountryTests diff --git a/tests/countries/test_american_samoa.py b/tests/entities/iso3166/test_american_samoa.py similarity index 95% rename from tests/countries/test_american_samoa.py rename to tests/entities/iso3166/test_american_samoa.py index 21e571331..0f121718b 100644 --- a/tests/countries/test_american_samoa.py +++ b/tests/entities/iso3166/test_american_samoa.py @@ -15,7 +15,7 @@ from holidays.calendars.gregorian import DEC from holidays.constants import UNOFFICIAL -from holidays.countries.american_samoa import HolidaysAS, AS, ASM +from holidays.entities.iso3166.american_samoa import HolidaysAS, AS, ASM from tests.common import CommonCountryTests diff --git a/tests/countries/test_andorra.py b/tests/entities/iso3166/test_andorra.py similarity index 98% rename from tests/countries/test_andorra.py rename to tests/entities/iso3166/test_andorra.py index c5b8bec85..470edbffc 100644 --- a/tests/countries/test_andorra.py +++ b/tests/entities/iso3166/test_andorra.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.andorra import Andorra, AD, AND +from holidays.entities.iso3166.andorra import Andorra, AD, AND from tests.common import CommonCountryTests diff --git a/tests/countries/test_angola.py b/tests/entities/iso3166/test_angola.py similarity index 99% rename from tests/countries/test_angola.py rename to tests/entities/iso3166/test_angola.py index 1267c13d5..7e7304db4 100644 --- a/tests/countries/test_angola.py +++ b/tests/entities/iso3166/test_angola.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.angola import Angola, AO, AGO +from holidays.entities.iso3166.angola import Angola, AO, AGO from tests.common import CommonCountryTests diff --git a/tests/countries/test_argentina.py b/tests/entities/iso3166/test_argentina.py similarity index 99% rename from tests/countries/test_argentina.py rename to tests/entities/iso3166/test_argentina.py index a762077ed..1e8d71cab 100644 --- a/tests/countries/test_argentina.py +++ b/tests/entities/iso3166/test_argentina.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.argentina import Argentina, AR, ARG +from holidays.entities.iso3166.argentina import Argentina, AR, ARG from tests.common import CommonCountryTests diff --git a/tests/countries/test_armenia.py b/tests/entities/iso3166/test_armenia.py similarity index 98% rename from tests/countries/test_armenia.py rename to tests/entities/iso3166/test_armenia.py index a6d67a380..3ab9b40df 100644 --- a/tests/countries/test_armenia.py +++ b/tests/entities/iso3166/test_armenia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.armenia import Armenia, AM, ARM +from holidays.entities.iso3166.armenia import Armenia, AM, ARM from tests.common import CommonCountryTests diff --git a/tests/countries/test_aruba.py b/tests/entities/iso3166/test_aruba.py similarity index 99% rename from tests/countries/test_aruba.py rename to tests/entities/iso3166/test_aruba.py index 4a99cae2e..fbd1e0a60 100644 --- a/tests/countries/test_aruba.py +++ b/tests/entities/iso3166/test_aruba.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.aruba import Aruba, AW, ABW +from holidays.entities.iso3166.aruba import Aruba, AW, ABW from tests.common import CommonCountryTests diff --git a/tests/countries/test_australia.py b/tests/entities/iso3166/test_australia.py similarity index 99% rename from tests/countries/test_australia.py rename to tests/entities/iso3166/test_australia.py index 6f683b80a..91cb149f2 100644 --- a/tests/countries/test_australia.py +++ b/tests/entities/iso3166/test_australia.py @@ -15,7 +15,7 @@ from holidays.calendars.gregorian import JAN, MAR, APR, MAY, JUN, AUG, SEP, OCT, NOV, DEC from holidays.constants import BANK, HALF_DAY, PUBLIC -from holidays.countries.australia import Australia, AU, AUS +from holidays.entities.iso3166.australia import Australia, AU, AUS from tests.common import CommonCountryTests diff --git a/tests/countries/test_austria.py b/tests/entities/iso3166/test_austria.py similarity index 99% rename from tests/countries/test_austria.py rename to tests/entities/iso3166/test_austria.py index 8adb9fcc5..1c6c13c91 100644 --- a/tests/countries/test_austria.py +++ b/tests/entities/iso3166/test_austria.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import BANK -from holidays.countries.austria import Austria, AT, AUT +from holidays.entities.iso3166.austria import Austria, AT, AUT from tests.common import CommonCountryTests diff --git a/tests/countries/test_azerbaijan.py b/tests/entities/iso3166/test_azerbaijan.py similarity index 99% rename from tests/countries/test_azerbaijan.py rename to tests/entities/iso3166/test_azerbaijan.py index 13030f39a..3d4860879 100644 --- a/tests/countries/test_azerbaijan.py +++ b/tests/entities/iso3166/test_azerbaijan.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import PUBLIC, WORKDAY -from holidays.countries.azerbaijan import Azerbaijan, AZ, AZE +from holidays.entities.iso3166.azerbaijan import Azerbaijan, AZ, AZE from tests.common import CommonCountryTests diff --git a/tests/countries/test_bahamas.py b/tests/entities/iso3166/test_bahamas.py similarity index 99% rename from tests/countries/test_bahamas.py rename to tests/entities/iso3166/test_bahamas.py index 6c9bec5a1..87dd5f480 100644 --- a/tests/countries/test_bahamas.py +++ b/tests/entities/iso3166/test_bahamas.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.bahamas import Bahamas, BS, BHS +from holidays.entities.iso3166.bahamas import Bahamas, BS, BHS from tests.common import CommonCountryTests diff --git a/tests/countries/test_bahrain.py b/tests/entities/iso3166/test_bahrain.py similarity index 98% rename from tests/countries/test_bahrain.py rename to tests/entities/iso3166/test_bahrain.py index 1dd02a668..14cbc95c3 100644 --- a/tests/countries/test_bahrain.py +++ b/tests/entities/iso3166/test_bahrain.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.bahrain import Bahrain, BH, BAH +from holidays.entities.iso3166.bahrain import Bahrain, BH, BAH from tests.common import CommonCountryTests diff --git a/tests/countries/test_bangladesh.py b/tests/entities/iso3166/test_bangladesh.py similarity index 94% rename from tests/countries/test_bangladesh.py rename to tests/entities/iso3166/test_bangladesh.py index 03ef290cb..0c086c210 100644 --- a/tests/countries/test_bangladesh.py +++ b/tests/entities/iso3166/test_bangladesh.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.bangladesh import Bangladesh, BD, BGD +from holidays.entities.iso3166.bangladesh import Bangladesh, BD, BGD from tests.common import CommonCountryTests diff --git a/tests/countries/test_barbados.py b/tests/entities/iso3166/test_barbados.py similarity index 99% rename from tests/countries/test_barbados.py rename to tests/entities/iso3166/test_barbados.py index 49f1c8d56..479426275 100644 --- a/tests/countries/test_barbados.py +++ b/tests/entities/iso3166/test_barbados.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.barbados import Barbados, BB, BRB +from holidays.entities.iso3166.barbados import Barbados, BB, BRB from tests.common import CommonCountryTests diff --git a/tests/countries/test_belarus.py b/tests/entities/iso3166/test_belarus.py similarity index 98% rename from tests/countries/test_belarus.py rename to tests/entities/iso3166/test_belarus.py index 7f7c5ead3..5cebe8a77 100644 --- a/tests/countries/test_belarus.py +++ b/tests/entities/iso3166/test_belarus.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.belarus import Belarus, BY, BLR +from holidays.entities.iso3166.belarus import Belarus, BY, BLR from tests.common import CommonCountryTests diff --git a/tests/countries/test_belgium.py b/tests/entities/iso3166/test_belgium.py similarity index 99% rename from tests/countries/test_belgium.py rename to tests/entities/iso3166/test_belgium.py index 4f4766a3a..e40d5b2c3 100644 --- a/tests/countries/test_belgium.py +++ b/tests/entities/iso3166/test_belgium.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import BANK -from holidays.countries.belgium import Belgium, BE, BEL +from holidays.entities.iso3166.belgium import Belgium, BE, BEL from tests.common import CommonCountryTests diff --git a/tests/countries/test_belize.py b/tests/entities/iso3166/test_belize.py similarity index 99% rename from tests/countries/test_belize.py rename to tests/entities/iso3166/test_belize.py index 0297a0f3d..ba4597cef 100644 --- a/tests/countries/test_belize.py +++ b/tests/entities/iso3166/test_belize.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.belize import Belize, BZ, BLZ +from holidays.entities.iso3166.belize import Belize, BZ, BLZ from tests.common import CommonCountryTests diff --git a/tests/countries/test_bolivia.py b/tests/entities/iso3166/test_bolivia.py similarity index 99% rename from tests/countries/test_bolivia.py rename to tests/entities/iso3166/test_bolivia.py index f748d3cff..2275a962e 100644 --- a/tests/countries/test_bolivia.py +++ b/tests/entities/iso3166/test_bolivia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.bolivia import Bolivia, BO, BOL +from holidays.entities.iso3166.bolivia import Bolivia, BO, BOL from tests.common import CommonCountryTests diff --git a/tests/countries/test_bosnia_and_herzegovina.py b/tests/entities/iso3166/test_bosnia_and_herzegovina.py similarity index 99% rename from tests/countries/test_bosnia_and_herzegovina.py rename to tests/entities/iso3166/test_bosnia_and_herzegovina.py index b99d10ad8..634b59dd2 100644 --- a/tests/countries/test_bosnia_and_herzegovina.py +++ b/tests/entities/iso3166/test_bosnia_and_herzegovina.py @@ -13,7 +13,7 @@ import warnings from unittest import TestCase -from holidays.countries.bosnia_and_herzegovina import BosniaAndHerzegovina, BA, BIH +from holidays.entities.iso3166.bosnia_and_herzegovina import BosniaAndHerzegovina, BA, BIH from tests.common import CommonCountryTests diff --git a/tests/countries/test_botswana.py b/tests/entities/iso3166/test_botswana.py similarity index 98% rename from tests/countries/test_botswana.py rename to tests/entities/iso3166/test_botswana.py index 0eb418e8e..e4ea8dd78 100644 --- a/tests/countries/test_botswana.py +++ b/tests/entities/iso3166/test_botswana.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.botswana import Botswana, BW, BWA +from holidays.entities.iso3166.botswana import Botswana, BW, BWA from tests.common import CommonCountryTests diff --git a/tests/countries/test_brazil.py b/tests/entities/iso3166/test_brazil.py similarity index 99% rename from tests/countries/test_brazil.py rename to tests/entities/iso3166/test_brazil.py index 9db1db9c5..fa25afa00 100644 --- a/tests/countries/test_brazil.py +++ b/tests/entities/iso3166/test_brazil.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import OPTIONAL, PUBLIC -from holidays.countries.brazil import Brazil, BR, BRA +from holidays.entities.iso3166.brazil import Brazil, BR, BRA from tests.common import CommonCountryTests diff --git a/tests/countries/test_brunei.py b/tests/entities/iso3166/test_brunei.py similarity index 99% rename from tests/countries/test_brunei.py rename to tests/entities/iso3166/test_brunei.py index 16b61d180..e647b8c88 100644 --- a/tests/countries/test_brunei.py +++ b/tests/entities/iso3166/test_brunei.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.brunei import Brunei, BN, BRN +from holidays.entities.iso3166.brunei import Brunei, BN, BRN from tests.common import CommonCountryTests diff --git a/tests/countries/test_bulgaria.py b/tests/entities/iso3166/test_bulgaria.py similarity index 99% rename from tests/countries/test_bulgaria.py rename to tests/entities/iso3166/test_bulgaria.py index 2dc0a06d1..a234078f1 100644 --- a/tests/countries/test_bulgaria.py +++ b/tests/entities/iso3166/test_bulgaria.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import PUBLIC, SCHOOL -from holidays.countries.bulgaria import Bulgaria, BG, BLG +from holidays.entities.iso3166.bulgaria import Bulgaria, BG, BLG from tests.common import CommonCountryTests diff --git a/tests/countries/test_burkina_faso.py b/tests/entities/iso3166/test_burkina_faso.py similarity index 97% rename from tests/countries/test_burkina_faso.py rename to tests/entities/iso3166/test_burkina_faso.py index abd57df10..7684df8f8 100644 --- a/tests/countries/test_burkina_faso.py +++ b/tests/entities/iso3166/test_burkina_faso.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.burkina_faso import BurkinaFaso, BF, BFA +from holidays.entities.iso3166.burkina_faso import BurkinaFaso, BF, BFA from tests.common import CommonCountryTests diff --git a/tests/countries/test_burundi.py b/tests/entities/iso3166/test_burundi.py similarity index 98% rename from tests/countries/test_burundi.py rename to tests/entities/iso3166/test_burundi.py index c36e67f02..3e59cd3ab 100644 --- a/tests/countries/test_burundi.py +++ b/tests/entities/iso3166/test_burundi.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.burundi import Burundi, BI, BDI +from holidays.entities.iso3166.burundi import Burundi, BI, BDI from tests.common import CommonCountryTests diff --git a/tests/countries/test_cambodia.py b/tests/entities/iso3166/test_cambodia.py similarity index 99% rename from tests/countries/test_cambodia.py rename to tests/entities/iso3166/test_cambodia.py index 70132f6fd..c8ae61828 100644 --- a/tests/countries/test_cambodia.py +++ b/tests/entities/iso3166/test_cambodia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.cambodia import Cambodia, KH, KHM +from holidays.entities.iso3166.cambodia import Cambodia, KH, KHM from tests.common import CommonCountryTests diff --git a/tests/countries/test_cameroon.py b/tests/entities/iso3166/test_cameroon.py similarity index 98% rename from tests/countries/test_cameroon.py rename to tests/entities/iso3166/test_cameroon.py index f7e516b4c..10ab9e09d 100644 --- a/tests/countries/test_cameroon.py +++ b/tests/entities/iso3166/test_cameroon.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.cameroon import Cameroon, CM, CMR +from holidays.entities.iso3166.cameroon import Cameroon, CM, CMR from tests.common import CommonCountryTests diff --git a/tests/countries/test_canada.py b/tests/entities/iso3166/test_canada.py similarity index 99% rename from tests/countries/test_canada.py rename to tests/entities/iso3166/test_canada.py index acc4645f4..46bec26c1 100644 --- a/tests/countries/test_canada.py +++ b/tests/entities/iso3166/test_canada.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import GOVERNMENT, OPTIONAL -from holidays.countries.canada import Canada, CA, CAN +from holidays.entities.iso3166.canada import Canada, CA, CAN from tests.common import CommonCountryTests diff --git a/tests/countries/test_chad.py b/tests/entities/iso3166/test_chad.py similarity index 97% rename from tests/countries/test_chad.py rename to tests/entities/iso3166/test_chad.py index 9e32ebfc0..8135665ea 100644 --- a/tests/countries/test_chad.py +++ b/tests/entities/iso3166/test_chad.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.chad import Chad, TD, TCD +from holidays.entities.iso3166.chad import Chad, TD, TCD from tests.common import CommonCountryTests diff --git a/tests/countries/test_chile.py b/tests/entities/iso3166/test_chile.py similarity index 99% rename from tests/countries/test_chile.py rename to tests/entities/iso3166/test_chile.py index 26128aaa8..157a5dd8f 100644 --- a/tests/countries/test_chile.py +++ b/tests/entities/iso3166/test_chile.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.chile import Chile, CL, CHL +from holidays.entities.iso3166.chile import Chile, CL, CHL from tests.common import CommonCountryTests diff --git a/tests/countries/test_china.py b/tests/entities/iso3166/test_china.py similarity index 99% rename from tests/countries/test_china.py rename to tests/entities/iso3166/test_china.py index 2f2d212b5..fdef057ef 100644 --- a/tests/countries/test_china.py +++ b/tests/entities/iso3166/test_china.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import HALF_DAY, PUBLIC -from holidays.countries.china import China, CN, CHN +from holidays.entities.iso3166.china import China, CN, CHN from tests.common import CommonCountryTests diff --git a/tests/countries/test_colombia.py b/tests/entities/iso3166/test_colombia.py similarity index 99% rename from tests/countries/test_colombia.py rename to tests/entities/iso3166/test_colombia.py index a566f12a2..f9ec9e5d9 100644 --- a/tests/countries/test_colombia.py +++ b/tests/entities/iso3166/test_colombia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.colombia import Colombia, CO, COL +from holidays.entities.iso3166.colombia import Colombia, CO, COL from tests.common import CommonCountryTests diff --git a/tests/countries/test_costa_rica.py b/tests/entities/iso3166/test_costa_rica.py similarity index 99% rename from tests/countries/test_costa_rica.py rename to tests/entities/iso3166/test_costa_rica.py index 6464ba045..68498be30 100644 --- a/tests/countries/test_costa_rica.py +++ b/tests/entities/iso3166/test_costa_rica.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import OPTIONAL -from holidays.countries.costa_rica import CostaRica, CR, CRI +from holidays.entities.iso3166.costa_rica import CostaRica, CR, CRI from tests.common import CommonCountryTests diff --git a/tests/countries/test_croatia.py b/tests/entities/iso3166/test_croatia.py similarity index 99% rename from tests/countries/test_croatia.py rename to tests/entities/iso3166/test_croatia.py index 9a80da039..3cd2e7cfe 100644 --- a/tests/countries/test_croatia.py +++ b/tests/entities/iso3166/test_croatia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.croatia import Croatia, HR, HRV +from holidays.entities.iso3166.croatia import Croatia, HR, HRV from tests.common import CommonCountryTests diff --git a/tests/countries/test_cuba.py b/tests/entities/iso3166/test_cuba.py similarity index 99% rename from tests/countries/test_cuba.py rename to tests/entities/iso3166/test_cuba.py index 6a9925138..fac0eb724 100644 --- a/tests/countries/test_cuba.py +++ b/tests/entities/iso3166/test_cuba.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.cuba import Cuba, CU, CUB +from holidays.entities.iso3166.cuba import Cuba, CU, CUB from tests.common import CommonCountryTests diff --git a/tests/countries/test_curacao.py b/tests/entities/iso3166/test_curacao.py similarity index 99% rename from tests/countries/test_curacao.py rename to tests/entities/iso3166/test_curacao.py index 09fb145cc..80910c1ff 100644 --- a/tests/countries/test_curacao.py +++ b/tests/entities/iso3166/test_curacao.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.curacao import Curacao, CW, CUW +from holidays.entities.iso3166.curacao import Curacao, CW, CUW from tests.common import CommonCountryTests diff --git a/tests/countries/test_cyprus.py b/tests/entities/iso3166/test_cyprus.py similarity index 99% rename from tests/countries/test_cyprus.py rename to tests/entities/iso3166/test_cyprus.py index dec6258f3..433519f54 100644 --- a/tests/countries/test_cyprus.py +++ b/tests/entities/iso3166/test_cyprus.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import BANK, OPTIONAL, PUBLIC -from holidays.countries.cyprus import Cyprus, CY, CYP +from holidays.entities.iso3166.cyprus import Cyprus, CY, CYP from tests.common import CommonCountryTests diff --git a/tests/countries/test_czechia.py b/tests/entities/iso3166/test_czechia.py similarity index 99% rename from tests/countries/test_czechia.py rename to tests/entities/iso3166/test_czechia.py index 08c96069e..68b4f6227 100644 --- a/tests/countries/test_czechia.py +++ b/tests/entities/iso3166/test_czechia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.czechia import Czechia, CZ, CZE +from holidays.entities.iso3166.czechia import Czechia, CZ, CZE from tests.common import CommonCountryTests diff --git a/tests/countries/test_denmark.py b/tests/entities/iso3166/test_denmark.py similarity index 98% rename from tests/countries/test_denmark.py rename to tests/entities/iso3166/test_denmark.py index eeb04c6ef..d7f384411 100644 --- a/tests/countries/test_denmark.py +++ b/tests/entities/iso3166/test_denmark.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import OPTIONAL -from holidays.countries.denmark import Denmark, DK, DNK +from holidays.entities.iso3166.denmark import Denmark, DK, DNK from tests.common import CommonCountryTests diff --git a/tests/countries/test_djibouti.py b/tests/entities/iso3166/test_djibouti.py similarity index 98% rename from tests/countries/test_djibouti.py rename to tests/entities/iso3166/test_djibouti.py index 189c7e136..e47850b1f 100644 --- a/tests/countries/test_djibouti.py +++ b/tests/entities/iso3166/test_djibouti.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.djibouti import Djibouti, DJ, DJI +from holidays.entities.iso3166.djibouti import Djibouti, DJ, DJI from tests.common import CommonCountryTests diff --git a/tests/countries/test_dominican_republic.py b/tests/entities/iso3166/test_dominican_republic.py similarity index 98% rename from tests/countries/test_dominican_republic.py rename to tests/entities/iso3166/test_dominican_republic.py index 8d9b6db78..2716471fd 100644 --- a/tests/countries/test_dominican_republic.py +++ b/tests/entities/iso3166/test_dominican_republic.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.dominican_republic import DominicanRepublic, DO, DOM +from holidays.entities.iso3166.dominican_republic import DominicanRepublic, DO, DOM from tests.common import CommonCountryTests diff --git a/tests/countries/test_ecuador.py b/tests/entities/iso3166/test_ecuador.py similarity index 99% rename from tests/countries/test_ecuador.py rename to tests/entities/iso3166/test_ecuador.py index dec5c7ee9..5072ee6c8 100644 --- a/tests/countries/test_ecuador.py +++ b/tests/entities/iso3166/test_ecuador.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.ecuador import Ecuador, EC, ECU +from holidays.entities.iso3166.ecuador import Ecuador, EC, ECU from tests.common import CommonCountryTests diff --git a/tests/countries/test_egypt.py b/tests/entities/iso3166/test_egypt.py similarity index 98% rename from tests/countries/test_egypt.py rename to tests/entities/iso3166/test_egypt.py index eb26d3420..d6c78e020 100644 --- a/tests/countries/test_egypt.py +++ b/tests/entities/iso3166/test_egypt.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.egypt import Egypt, EG, EGY +from holidays.entities.iso3166.egypt import Egypt, EG, EGY from tests.common import CommonCountryTests diff --git a/tests/countries/test_el_salvador.py b/tests/entities/iso3166/test_el_salvador.py similarity index 97% rename from tests/countries/test_el_salvador.py rename to tests/entities/iso3166/test_el_salvador.py index 422323597..212d93fa2 100644 --- a/tests/countries/test_el_salvador.py +++ b/tests/entities/iso3166/test_el_salvador.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.el_salvador import ElSalvador, SV, SLV +from holidays.entities.iso3166.el_salvador import ElSalvador, SV, SLV from tests.common import CommonCountryTests diff --git a/tests/countries/test_estonia.py b/tests/entities/iso3166/test_estonia.py similarity index 98% rename from tests/countries/test_estonia.py rename to tests/entities/iso3166/test_estonia.py index 86255acdc..e466d9846 100644 --- a/tests/countries/test_estonia.py +++ b/tests/entities/iso3166/test_estonia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.estonia import Estonia, EE, EST +from holidays.entities.iso3166.estonia import Estonia, EE, EST from tests.common import CommonCountryTests diff --git a/tests/countries/test_eswatini.py b/tests/entities/iso3166/test_eswatini.py similarity index 98% rename from tests/countries/test_eswatini.py rename to tests/entities/iso3166/test_eswatini.py index a2ad218ae..95c76159a 100644 --- a/tests/countries/test_eswatini.py +++ b/tests/entities/iso3166/test_eswatini.py @@ -14,7 +14,7 @@ from unittest import TestCase import holidays -from holidays.countries.eswatini import Eswatini, SZ, SZW +from holidays.entities.iso3166.eswatini import Eswatini, SZ, SZW from tests.common import CommonCountryTests diff --git a/tests/countries/test_ethiopia.py b/tests/entities/iso3166/test_ethiopia.py similarity index 99% rename from tests/countries/test_ethiopia.py rename to tests/entities/iso3166/test_ethiopia.py index 5e9551afb..f1e9b7713 100644 --- a/tests/countries/test_ethiopia.py +++ b/tests/entities/iso3166/test_ethiopia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.ethiopia import Ethiopia, ET, ETH +from holidays.entities.iso3166.ethiopia import Ethiopia, ET, ETH from tests.common import CommonCountryTests diff --git a/tests/countries/test_finland.py b/tests/entities/iso3166/test_finland.py similarity index 99% rename from tests/countries/test_finland.py rename to tests/entities/iso3166/test_finland.py index 0d7149110..d00edf001 100644 --- a/tests/countries/test_finland.py +++ b/tests/entities/iso3166/test_finland.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.finland import Finland, FI, FIN +from holidays.entities.iso3166.finland import Finland, FI, FIN from tests.common import CommonCountryTests diff --git a/tests/countries/test_france.py b/tests/entities/iso3166/test_france.py similarity index 99% rename from tests/countries/test_france.py rename to tests/entities/iso3166/test_france.py index c43c955ad..c3a662b31 100644 --- a/tests/countries/test_france.py +++ b/tests/entities/iso3166/test_france.py @@ -13,7 +13,7 @@ import warnings from unittest import TestCase -from holidays.countries.france import France, FR, FRA +from holidays.entities.iso3166.france import France, FR, FRA from tests.common import CommonCountryTests diff --git a/tests/countries/test_gabon.py b/tests/entities/iso3166/test_gabon.py similarity index 97% rename from tests/countries/test_gabon.py rename to tests/entities/iso3166/test_gabon.py index 45a5a4936..494344f00 100644 --- a/tests/countries/test_gabon.py +++ b/tests/entities/iso3166/test_gabon.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.gabon import Gabon, GA, GAB +from holidays.entities.iso3166.gabon import Gabon, GA, GAB from tests.common import CommonCountryTests diff --git a/tests/countries/test_georgia.py b/tests/entities/iso3166/test_georgia.py similarity index 98% rename from tests/countries/test_georgia.py rename to tests/entities/iso3166/test_georgia.py index 087eeccd9..42ec2c9e4 100644 --- a/tests/countries/test_georgia.py +++ b/tests/entities/iso3166/test_georgia.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import GOVERNMENT -from holidays.countries.georgia import Georgia, GE, GEO +from holidays.entities.iso3166.georgia import Georgia, GE, GEO from tests.common import CommonCountryTests diff --git a/tests/countries/test_germany.py b/tests/entities/iso3166/test_germany.py similarity index 99% rename from tests/countries/test_germany.py rename to tests/entities/iso3166/test_germany.py index 07633d52a..9c1c2ef0f 100644 --- a/tests/countries/test_germany.py +++ b/tests/entities/iso3166/test_germany.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.germany import Germany, DE, DEU +from holidays.entities.iso3166.germany import Germany, DE, DEU from tests.common import CommonCountryTests diff --git a/tests/countries/test_ghana.py b/tests/entities/iso3166/test_ghana.py similarity index 98% rename from tests/countries/test_ghana.py rename to tests/entities/iso3166/test_ghana.py index 6bc6e2a88..4cb0eba57 100644 --- a/tests/countries/test_ghana.py +++ b/tests/entities/iso3166/test_ghana.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.ghana import Ghana, GH, GHA +from holidays.entities.iso3166.ghana import Ghana, GH, GHA from tests.common import CommonCountryTests diff --git a/tests/countries/test_greece.py b/tests/entities/iso3166/test_greece.py similarity index 99% rename from tests/countries/test_greece.py rename to tests/entities/iso3166/test_greece.py index e690e22c9..c7e30d161 100644 --- a/tests/countries/test_greece.py +++ b/tests/entities/iso3166/test_greece.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import HALF_DAY -from holidays.countries.greece import Greece, GR, GRC +from holidays.entities.iso3166.greece import Greece, GR, GRC from tests.common import CommonCountryTests diff --git a/tests/countries/test_greenland.py b/tests/entities/iso3166/test_greenland.py similarity index 98% rename from tests/countries/test_greenland.py rename to tests/entities/iso3166/test_greenland.py index d6178c0dc..91311f407 100644 --- a/tests/countries/test_greenland.py +++ b/tests/entities/iso3166/test_greenland.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import OPTIONAL -from holidays.countries.greenland import Greenland, GL, GRL +from holidays.entities.iso3166.greenland import Greenland, GL, GRL from tests.common import CommonCountryTests diff --git a/tests/countries/test_guam.py b/tests/entities/iso3166/test_guam.py similarity index 95% rename from tests/countries/test_guam.py rename to tests/entities/iso3166/test_guam.py index 7d4548b1a..8c4a9dc05 100644 --- a/tests/countries/test_guam.py +++ b/tests/entities/iso3166/test_guam.py @@ -15,7 +15,7 @@ from holidays.calendars.gregorian import MAR from holidays.constants import UNOFFICIAL -from holidays.countries.guam import HolidaysGU, GU, GUM +from holidays.entities.iso3166.guam import HolidaysGU, GU, GUM from tests.common import CommonCountryTests diff --git a/tests/countries/test_guatemala.py b/tests/entities/iso3166/test_guatemala.py similarity index 98% rename from tests/countries/test_guatemala.py rename to tests/entities/iso3166/test_guatemala.py index 91ecdc126..0ae40b1d0 100644 --- a/tests/countries/test_guatemala.py +++ b/tests/entities/iso3166/test_guatemala.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.guatemala import Guatemala, GT, GUA +from holidays.entities.iso3166.guatemala import Guatemala, GT, GUA from tests.common import CommonCountryTests diff --git a/tests/countries/test_honduras.py b/tests/entities/iso3166/test_honduras.py similarity index 98% rename from tests/countries/test_honduras.py rename to tests/entities/iso3166/test_honduras.py index 8efd21b16..7506f8460 100644 --- a/tests/countries/test_honduras.py +++ b/tests/entities/iso3166/test_honduras.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.honduras import Honduras, HN, HND +from holidays.entities.iso3166.honduras import Honduras, HN, HND from tests.common import CommonCountryTests diff --git a/tests/countries/test_hongkong.py b/tests/entities/iso3166/test_hongkong.py similarity index 99% rename from tests/countries/test_hongkong.py rename to tests/entities/iso3166/test_hongkong.py index 58c08fbc5..263c57592 100644 --- a/tests/countries/test_hongkong.py +++ b/tests/entities/iso3166/test_hongkong.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import OPTIONAL -from holidays.countries.hongkong import HongKong, HK, HKG, CHRISTMAS, WINTER_SOLSTICE +from holidays.entities.iso3166.hongkong import HongKong, HK, HKG, CHRISTMAS, WINTER_SOLSTICE from tests.common import CommonCountryTests diff --git a/tests/countries/test_hungary.py b/tests/entities/iso3166/test_hungary.py similarity index 99% rename from tests/countries/test_hungary.py rename to tests/entities/iso3166/test_hungary.py index 17b61eae9..782380116 100644 --- a/tests/countries/test_hungary.py +++ b/tests/entities/iso3166/test_hungary.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.hungary import Hungary, HU, HUN +from holidays.entities.iso3166.hungary import Hungary, HU, HUN from tests.common import CommonCountryTests diff --git a/tests/countries/test_iceland.py b/tests/entities/iso3166/test_iceland.py similarity index 98% rename from tests/countries/test_iceland.py rename to tests/entities/iso3166/test_iceland.py index 046b3ead3..7c910680a 100644 --- a/tests/countries/test_iceland.py +++ b/tests/entities/iso3166/test_iceland.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.iceland import Iceland, IS, ISL +from holidays.entities.iso3166.iceland import Iceland, IS, ISL from tests.common import CommonCountryTests diff --git a/tests/countries/test_india.py b/tests/entities/iso3166/test_india.py similarity index 98% rename from tests/countries/test_india.py rename to tests/entities/iso3166/test_india.py index 163f0d177..04cbea8a9 100644 --- a/tests/countries/test_india.py +++ b/tests/entities/iso3166/test_india.py @@ -13,7 +13,7 @@ import warnings from unittest import TestCase -from holidays.countries.india import India, IN, IND +from holidays.entities.iso3166.india import India, IN, IND from tests.common import CommonCountryTests diff --git a/tests/countries/test_indonesia.py b/tests/entities/iso3166/test_indonesia.py similarity index 99% rename from tests/countries/test_indonesia.py rename to tests/entities/iso3166/test_indonesia.py index 86828b7ad..237c174bd 100644 --- a/tests/countries/test_indonesia.py +++ b/tests/entities/iso3166/test_indonesia.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import GOVERNMENT -from holidays.countries.indonesia import Indonesia, ID, IDN +from holidays.entities.iso3166.indonesia import Indonesia, ID, IDN from tests.common import CommonCountryTests diff --git a/tests/countries/test_iran.py b/tests/entities/iso3166/test_iran.py similarity index 99% rename from tests/countries/test_iran.py rename to tests/entities/iso3166/test_iran.py index eccbc08fa..699b5b6df 100644 --- a/tests/countries/test_iran.py +++ b/tests/entities/iso3166/test_iran.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.iran import Iran, IR, IRN +from holidays.entities.iso3166.iran import Iran, IR, IRN from tests.common import CommonCountryTests diff --git a/tests/countries/test_ireland.py b/tests/entities/iso3166/test_ireland.py similarity index 98% rename from tests/countries/test_ireland.py rename to tests/entities/iso3166/test_ireland.py index 492a2db72..3906439e0 100644 --- a/tests/countries/test_ireland.py +++ b/tests/entities/iso3166/test_ireland.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.ireland import Ireland, IE, IRL +from holidays.entities.iso3166.ireland import Ireland, IE, IRL from tests.common import CommonCountryTests diff --git a/tests/countries/test_isle_of_man.py b/tests/entities/iso3166/test_isle_of_man.py similarity index 97% rename from tests/countries/test_isle_of_man.py rename to tests/entities/iso3166/test_isle_of_man.py index 91b95c481..e0a43c7e1 100644 --- a/tests/countries/test_isle_of_man.py +++ b/tests/entities/iso3166/test_isle_of_man.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.isle_of_man import IsleOfMan, IM, IMN +from holidays.entities.iso3166.isle_of_man import IsleOfMan, IM, IMN from tests.common import CommonCountryTests diff --git a/tests/countries/test_israel.py b/tests/entities/iso3166/test_israel.py similarity index 99% rename from tests/countries/test_israel.py rename to tests/entities/iso3166/test_israel.py index cc0b18e0a..106b70f70 100644 --- a/tests/countries/test_israel.py +++ b/tests/entities/iso3166/test_israel.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import OPTIONAL, SCHOOL -from holidays.countries.israel import Israel, IL, ISR +from holidays.entities.iso3166.israel import Israel, IL, ISR from tests.common import CommonCountryTests diff --git a/tests/countries/test_italy.py b/tests/entities/iso3166/test_italy.py similarity index 99% rename from tests/countries/test_italy.py rename to tests/entities/iso3166/test_italy.py index 89d25006c..a5b035183 100644 --- a/tests/countries/test_italy.py +++ b/tests/entities/iso3166/test_italy.py @@ -13,7 +13,7 @@ import warnings from unittest import TestCase -from holidays.countries.italy import Italy, IT, ITA +from holidays.entities.iso3166.italy import Italy, IT, ITA from tests.common import CommonCountryTests diff --git a/tests/countries/test_jamaica.py b/tests/entities/iso3166/test_jamaica.py similarity index 98% rename from tests/countries/test_jamaica.py rename to tests/entities/iso3166/test_jamaica.py index 79186b2b7..a6319ae48 100644 --- a/tests/countries/test_jamaica.py +++ b/tests/entities/iso3166/test_jamaica.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.jamaica import Jamaica, JM, JAM +from holidays.entities.iso3166.jamaica import Jamaica, JM, JAM from tests.common import CommonCountryTests diff --git a/tests/countries/test_japan.py b/tests/entities/iso3166/test_japan.py similarity index 99% rename from tests/countries/test_japan.py rename to tests/entities/iso3166/test_japan.py index 7ba75c27f..fefa636fa 100644 --- a/tests/countries/test_japan.py +++ b/tests/entities/iso3166/test_japan.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import BANK -from holidays.countries.japan import Japan, JP, JPN +from holidays.entities.iso3166.japan import Japan, JP, JPN from tests.common import CommonCountryTests diff --git a/tests/countries/test_jersey.py b/tests/entities/iso3166/test_jersey.py similarity index 99% rename from tests/countries/test_jersey.py rename to tests/entities/iso3166/test_jersey.py index 58708cc86..ab9c3550f 100644 --- a/tests/countries/test_jersey.py +++ b/tests/entities/iso3166/test_jersey.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.jersey import Jersey, JE, JEY +from holidays.entities.iso3166.jersey import Jersey, JE, JEY from tests.common import CommonCountryTests diff --git a/tests/countries/test_jordan.py b/tests/entities/iso3166/test_jordan.py similarity index 98% rename from tests/countries/test_jordan.py rename to tests/entities/iso3166/test_jordan.py index 7a3ab15ba..eaac66dd1 100644 --- a/tests/countries/test_jordan.py +++ b/tests/entities/iso3166/test_jordan.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.jordan import Jordan, JO, JOR +from holidays.entities.iso3166.jordan import Jordan, JO, JOR from tests.common import CommonCountryTests diff --git a/tests/countries/test_kazakhstan.py b/tests/entities/iso3166/test_kazakhstan.py similarity index 98% rename from tests/countries/test_kazakhstan.py rename to tests/entities/iso3166/test_kazakhstan.py index d9e714686..aade25c1e 100644 --- a/tests/countries/test_kazakhstan.py +++ b/tests/entities/iso3166/test_kazakhstan.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.kazakhstan import Kazakhstan, KZ, KAZ +from holidays.entities.iso3166.kazakhstan import Kazakhstan, KZ, KAZ from tests.common import CommonCountryTests diff --git a/tests/countries/test_kenya.py b/tests/entities/iso3166/test_kenya.py similarity index 98% rename from tests/countries/test_kenya.py rename to tests/entities/iso3166/test_kenya.py index be94420a7..a4b1e8b9b 100644 --- a/tests/countries/test_kenya.py +++ b/tests/entities/iso3166/test_kenya.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.kenya import Kenya, KE, KEN +from holidays.entities.iso3166.kenya import Kenya, KE, KEN from tests.common import CommonCountryTests diff --git a/tests/countries/test_kuwait.py b/tests/entities/iso3166/test_kuwait.py similarity index 98% rename from tests/countries/test_kuwait.py rename to tests/entities/iso3166/test_kuwait.py index 0a8f61319..2339dddb1 100644 --- a/tests/countries/test_kuwait.py +++ b/tests/entities/iso3166/test_kuwait.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.kuwait import Kuwait, KW, KWT +from holidays.entities.iso3166.kuwait import Kuwait, KW, KWT from tests.common import CommonCountryTests diff --git a/tests/countries/test_kyrgyzstan.py b/tests/entities/iso3166/test_kyrgyzstan.py similarity index 97% rename from tests/countries/test_kyrgyzstan.py rename to tests/entities/iso3166/test_kyrgyzstan.py index f557abfe0..14c497364 100644 --- a/tests/countries/test_kyrgyzstan.py +++ b/tests/entities/iso3166/test_kyrgyzstan.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.kyrgyzstan import Kyrgyzstan, KG, KGZ +from holidays.entities.iso3166.kyrgyzstan import Kyrgyzstan, KG, KGZ from tests.common import CommonCountryTests diff --git a/tests/countries/test_laos.py b/tests/entities/iso3166/test_laos.py similarity index 99% rename from tests/countries/test_laos.py rename to tests/entities/iso3166/test_laos.py index 81062ce1b..407f3326b 100644 --- a/tests/countries/test_laos.py +++ b/tests/entities/iso3166/test_laos.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import BANK, PUBLIC, SCHOOL, WORKDAY -from holidays.countries.laos import Laos, LA, LAO +from holidays.entities.iso3166.laos import Laos, LA, LAO from tests.common import CommonCountryTests diff --git a/tests/countries/test_latvia.py b/tests/entities/iso3166/test_latvia.py similarity index 99% rename from tests/countries/test_latvia.py rename to tests/entities/iso3166/test_latvia.py index 01eecd61c..459b4a4fa 100644 --- a/tests/countries/test_latvia.py +++ b/tests/entities/iso3166/test_latvia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.latvia import Latvia, LV, LVA +from holidays.entities.iso3166.latvia import Latvia, LV, LVA from tests.common import CommonCountryTests diff --git a/tests/countries/test_lesotho.py b/tests/entities/iso3166/test_lesotho.py similarity index 97% rename from tests/countries/test_lesotho.py rename to tests/entities/iso3166/test_lesotho.py index 4ecca210d..64c9f33ae 100644 --- a/tests/countries/test_lesotho.py +++ b/tests/entities/iso3166/test_lesotho.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.lesotho import Lesotho, LS, LSO +from holidays.entities.iso3166.lesotho import Lesotho, LS, LSO from tests.common import CommonCountryTests diff --git a/tests/countries/test_liechtenstein.py b/tests/entities/iso3166/test_liechtenstein.py similarity index 99% rename from tests/countries/test_liechtenstein.py rename to tests/entities/iso3166/test_liechtenstein.py index 791153573..987269eda 100644 --- a/tests/countries/test_liechtenstein.py +++ b/tests/entities/iso3166/test_liechtenstein.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import BANK -from holidays.countries.liechtenstein import Liechtenstein, LI, LIE +from holidays.entities.iso3166.liechtenstein import Liechtenstein, LI, LIE from tests.common import CommonCountryTests diff --git a/tests/countries/test_lithuania.py b/tests/entities/iso3166/test_lithuania.py similarity index 99% rename from tests/countries/test_lithuania.py rename to tests/entities/iso3166/test_lithuania.py index a09a7adaf..327e981bc 100644 --- a/tests/countries/test_lithuania.py +++ b/tests/entities/iso3166/test_lithuania.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.lithuania import Lithuania, LT, LTU +from holidays.entities.iso3166.lithuania import Lithuania, LT, LTU from tests.common import CommonCountryTests diff --git a/tests/countries/test_luxembourg.py b/tests/entities/iso3166/test_luxembourg.py similarity index 98% rename from tests/countries/test_luxembourg.py rename to tests/entities/iso3166/test_luxembourg.py index d86321a6d..2c53c825e 100644 --- a/tests/countries/test_luxembourg.py +++ b/tests/entities/iso3166/test_luxembourg.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.luxembourg import Luxembourg, LU, LUX +from holidays.entities.iso3166.luxembourg import Luxembourg, LU, LUX from tests.common import CommonCountryTests diff --git a/tests/countries/test_madagascar.py b/tests/entities/iso3166/test_madagascar.py similarity index 99% rename from tests/countries/test_madagascar.py rename to tests/entities/iso3166/test_madagascar.py index e5c503013..5a7db6aef 100644 --- a/tests/countries/test_madagascar.py +++ b/tests/entities/iso3166/test_madagascar.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.madagascar import Madagascar, MG, MDG +from holidays.entities.iso3166.madagascar import Madagascar, MG, MDG from tests.common import CommonCountryTests diff --git a/tests/countries/test_malawi.py b/tests/entities/iso3166/test_malawi.py similarity index 98% rename from tests/countries/test_malawi.py rename to tests/entities/iso3166/test_malawi.py index bbbef0c95..ca6b7e333 100644 --- a/tests/countries/test_malawi.py +++ b/tests/entities/iso3166/test_malawi.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.malawi import Malawi, MW, MWI +from holidays.entities.iso3166.malawi import Malawi, MW, MWI from tests.common import CommonCountryTests diff --git a/tests/countries/test_malaysia.py b/tests/entities/iso3166/test_malaysia.py similarity index 99% rename from tests/countries/test_malaysia.py rename to tests/entities/iso3166/test_malaysia.py index 956842f1f..88fb3579d 100644 --- a/tests/countries/test_malaysia.py +++ b/tests/entities/iso3166/test_malaysia.py @@ -13,7 +13,7 @@ import warnings from unittest import TestCase -from holidays.countries.malaysia import Malaysia, MY, MYS +from holidays.entities.iso3166.malaysia import Malaysia, MY, MYS from tests.common import CommonCountryTests diff --git a/tests/countries/test_maldives.py b/tests/entities/iso3166/test_maldives.py similarity index 98% rename from tests/countries/test_maldives.py rename to tests/entities/iso3166/test_maldives.py index 2a688183c..374f7b2f7 100644 --- a/tests/countries/test_maldives.py +++ b/tests/entities/iso3166/test_maldives.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.maldives import Maldives, MDV, MV +from holidays.entities.iso3166.maldives import Maldives, MDV, MV from tests.common import CommonCountryTests diff --git a/tests/countries/test_malta.py b/tests/entities/iso3166/test_malta.py similarity index 98% rename from tests/countries/test_malta.py rename to tests/entities/iso3166/test_malta.py index cda5e1633..b0bf31279 100644 --- a/tests/countries/test_malta.py +++ b/tests/entities/iso3166/test_malta.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.malta import Malta, MT, MLT +from holidays.entities.iso3166.malta import Malta, MT, MLT from tests.common import CommonCountryTests diff --git a/tests/countries/test_marshall_islands.py b/tests/entities/iso3166/test_marshall_islands.py similarity index 98% rename from tests/countries/test_marshall_islands.py rename to tests/entities/iso3166/test_marshall_islands.py index f29f1df74..56a4e5bf3 100644 --- a/tests/countries/test_marshall_islands.py +++ b/tests/entities/iso3166/test_marshall_islands.py @@ -13,7 +13,7 @@ import warnings from unittest import TestCase -from holidays.countries.marshall_islands import HolidaysMH, MH, MHL +from holidays.entities.iso3166.marshall_islands import HolidaysMH, MH, MHL from tests.common import CommonCountryTests diff --git a/tests/countries/test_mexico.py b/tests/entities/iso3166/test_mexico.py similarity index 98% rename from tests/countries/test_mexico.py rename to tests/entities/iso3166/test_mexico.py index 3a9d1f209..d3ed76204 100644 --- a/tests/countries/test_mexico.py +++ b/tests/entities/iso3166/test_mexico.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.mexico import Mexico, MX, MEX +from holidays.entities.iso3166.mexico import Mexico, MX, MEX from tests.common import CommonCountryTests diff --git a/tests/countries/test_moldova.py b/tests/entities/iso3166/test_moldova.py similarity index 98% rename from tests/countries/test_moldova.py rename to tests/entities/iso3166/test_moldova.py index f2f212b77..95978b20b 100644 --- a/tests/countries/test_moldova.py +++ b/tests/entities/iso3166/test_moldova.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.moldova import Moldova, MD, MDA +from holidays.entities.iso3166.moldova import Moldova, MD, MDA from tests.common import CommonCountryTests diff --git a/tests/countries/test_monaco.py b/tests/entities/iso3166/test_monaco.py similarity index 98% rename from tests/countries/test_monaco.py rename to tests/entities/iso3166/test_monaco.py index 5d6cca63f..4f4e535cd 100644 --- a/tests/countries/test_monaco.py +++ b/tests/entities/iso3166/test_monaco.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.monaco import Monaco, MC, MCO +from holidays.entities.iso3166.monaco import Monaco, MC, MCO from tests.common import CommonCountryTests diff --git a/tests/countries/test_montenegro.py b/tests/entities/iso3166/test_montenegro.py similarity index 97% rename from tests/countries/test_montenegro.py rename to tests/entities/iso3166/test_montenegro.py index cac423a5a..786e9a66c 100644 --- a/tests/countries/test_montenegro.py +++ b/tests/entities/iso3166/test_montenegro.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.montenegro import Montenegro, ME, MNE +from holidays.entities.iso3166.montenegro import Montenegro, ME, MNE from tests.common import CommonCountryTests diff --git a/tests/countries/test_morocco.py b/tests/entities/iso3166/test_morocco.py similarity index 98% rename from tests/countries/test_morocco.py rename to tests/entities/iso3166/test_morocco.py index db7c29c1a..f4136893f 100644 --- a/tests/countries/test_morocco.py +++ b/tests/entities/iso3166/test_morocco.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.morocco import Morocco, MA, MOR +from holidays.entities.iso3166.morocco import Morocco, MA, MOR from tests.common import CommonCountryTests diff --git a/tests/countries/test_mozambique.py b/tests/entities/iso3166/test_mozambique.py similarity index 98% rename from tests/countries/test_mozambique.py rename to tests/entities/iso3166/test_mozambique.py index a909280eb..8aadecf91 100644 --- a/tests/countries/test_mozambique.py +++ b/tests/entities/iso3166/test_mozambique.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.mozambique import Mozambique, MZ, MOZ +from holidays.entities.iso3166.mozambique import Mozambique, MZ, MOZ from tests.common import CommonCountryTests diff --git a/tests/countries/test_namibia.py b/tests/entities/iso3166/test_namibia.py similarity index 97% rename from tests/countries/test_namibia.py rename to tests/entities/iso3166/test_namibia.py index 14a615217..0193bf433 100644 --- a/tests/countries/test_namibia.py +++ b/tests/entities/iso3166/test_namibia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.namibia import Namibia, NA, NAM +from holidays.entities.iso3166.namibia import Namibia, NA, NAM from tests.common import CommonCountryTests diff --git a/tests/countries/test_netherlands.py b/tests/entities/iso3166/test_netherlands.py similarity index 99% rename from tests/countries/test_netherlands.py rename to tests/entities/iso3166/test_netherlands.py index 378319cd7..d383b00ba 100644 --- a/tests/countries/test_netherlands.py +++ b/tests/entities/iso3166/test_netherlands.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import OPTIONAL -from holidays.countries.netherlands import Netherlands, NL, NLD +from holidays.entities.iso3166.netherlands import Netherlands, NL, NLD from tests.common import CommonCountryTests diff --git a/tests/countries/test_new_zealand.py b/tests/entities/iso3166/test_new_zealand.py similarity index 99% rename from tests/countries/test_new_zealand.py rename to tests/entities/iso3166/test_new_zealand.py index 7d61dd3cc..d4bf4d8eb 100644 --- a/tests/countries/test_new_zealand.py +++ b/tests/entities/iso3166/test_new_zealand.py @@ -13,7 +13,7 @@ import warnings from unittest import TestCase -from holidays.countries.new_zealand import NewZealand, NZ, NZL +from holidays.entities.iso3166.new_zealand import NewZealand, NZ, NZL from tests.common import CommonCountryTests diff --git a/tests/countries/test_nicaragua.py b/tests/entities/iso3166/test_nicaragua.py similarity index 98% rename from tests/countries/test_nicaragua.py rename to tests/entities/iso3166/test_nicaragua.py index 7dbb4191b..87008572b 100644 --- a/tests/countries/test_nicaragua.py +++ b/tests/entities/iso3166/test_nicaragua.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.nicaragua import Nicaragua, NI, NIC +from holidays.entities.iso3166.nicaragua import Nicaragua, NI, NIC from tests.common import CommonCountryTests diff --git a/tests/countries/test_nigeria.py b/tests/entities/iso3166/test_nigeria.py similarity index 98% rename from tests/countries/test_nigeria.py rename to tests/entities/iso3166/test_nigeria.py index e3e96b73a..42e55c224 100644 --- a/tests/countries/test_nigeria.py +++ b/tests/entities/iso3166/test_nigeria.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.nigeria import Nigeria, NG, NGA +from holidays.entities.iso3166.nigeria import Nigeria, NG, NGA from tests.common import CommonCountryTests diff --git a/tests/countries/test_north_macedonia.py b/tests/entities/iso3166/test_north_macedonia.py similarity index 95% rename from tests/countries/test_north_macedonia.py rename to tests/entities/iso3166/test_north_macedonia.py index 2030dd4e6..668bb83f8 100644 --- a/tests/countries/test_north_macedonia.py +++ b/tests/entities/iso3166/test_north_macedonia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.north_macedonia import NorthMacedonia, MK, MKD +from holidays.entities.iso3166.north_macedonia import NorthMacedonia, MK, MKD from tests.common import CommonCountryTests diff --git a/tests/countries/test_northern_mariana_islands.py b/tests/entities/iso3166/test_northern_mariana_islands.py similarity index 94% rename from tests/countries/test_northern_mariana_islands.py rename to tests/entities/iso3166/test_northern_mariana_islands.py index b7f9e65ed..425f84876 100644 --- a/tests/countries/test_northern_mariana_islands.py +++ b/tests/entities/iso3166/test_northern_mariana_islands.py @@ -15,7 +15,7 @@ from holidays.calendars.gregorian import MAR from holidays.constants import UNOFFICIAL -from holidays.countries.northern_mariana_islands import HolidaysMP, MP, MNP +from holidays.entities.iso3166.northern_mariana_islands import HolidaysMP, MP, MNP from tests.common import CommonCountryTests diff --git a/tests/countries/test_norway.py b/tests/entities/iso3166/test_norway.py similarity index 98% rename from tests/countries/test_norway.py rename to tests/entities/iso3166/test_norway.py index ec56c1b52..5a4ef124f 100644 --- a/tests/countries/test_norway.py +++ b/tests/entities/iso3166/test_norway.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.norway import Norway, NO, NOR +from holidays.entities.iso3166.norway import Norway, NO, NOR from tests.common import CommonCountryTests, SundayHolidays diff --git a/tests/countries/test_pakistan.py b/tests/entities/iso3166/test_pakistan.py similarity index 99% rename from tests/countries/test_pakistan.py rename to tests/entities/iso3166/test_pakistan.py index f6021992a..f3eb92d87 100644 --- a/tests/countries/test_pakistan.py +++ b/tests/entities/iso3166/test_pakistan.py @@ -14,7 +14,7 @@ from unittest import TestCase from holidays.calendars.gregorian import _timedelta -from holidays.countries.pakistan import Pakistan, PK, PAK +from holidays.entities.iso3166.pakistan import Pakistan, PK, PAK from tests.common import CommonCountryTests diff --git a/tests/countries/test_palau.py b/tests/entities/iso3166/test_palau.py similarity index 99% rename from tests/countries/test_palau.py rename to tests/entities/iso3166/test_palau.py index bed8f7c55..531673b32 100644 --- a/tests/countries/test_palau.py +++ b/tests/entities/iso3166/test_palau.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import ARMED_FORCES, HALF_DAY, PUBLIC -from holidays.countries.palau import Palau, PW, PLW +from holidays.entities.iso3166.palau import Palau, PW, PLW from tests.common import CommonCountryTests diff --git a/tests/countries/test_panama.py b/tests/entities/iso3166/test_panama.py similarity index 98% rename from tests/countries/test_panama.py rename to tests/entities/iso3166/test_panama.py index 12642157b..0a3db497f 100644 --- a/tests/countries/test_panama.py +++ b/tests/entities/iso3166/test_panama.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.panama import Panama, PA, PAN +from holidays.entities.iso3166.panama import Panama, PA, PAN from tests.common import CommonCountryTests diff --git a/tests/countries/test_papua_new_guinea.py b/tests/entities/iso3166/test_papua_new_guinea.py similarity index 99% rename from tests/countries/test_papua_new_guinea.py rename to tests/entities/iso3166/test_papua_new_guinea.py index 81a14aa2b..0e27c44cf 100644 --- a/tests/countries/test_papua_new_guinea.py +++ b/tests/entities/iso3166/test_papua_new_guinea.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.papua_new_guinea import PapuaNewGuinea, PG, PNG +from holidays.entities.iso3166.papua_new_guinea import PapuaNewGuinea, PG, PNG from tests.common import CommonCountryTests diff --git a/tests/countries/test_paraguay.py b/tests/entities/iso3166/test_paraguay.py similarity index 99% rename from tests/countries/test_paraguay.py rename to tests/entities/iso3166/test_paraguay.py index 58da6b270..308b0d3f3 100644 --- a/tests/countries/test_paraguay.py +++ b/tests/entities/iso3166/test_paraguay.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import GOVERNMENT -from holidays.countries.paraguay import Paraguay, PY, PRY +from holidays.entities.iso3166.paraguay import Paraguay, PY, PRY from tests.common import CommonCountryTests diff --git a/tests/countries/test_peru.py b/tests/entities/iso3166/test_peru.py similarity index 98% rename from tests/countries/test_peru.py rename to tests/entities/iso3166/test_peru.py index 4242b3520..a4d2f9eaa 100644 --- a/tests/countries/test_peru.py +++ b/tests/entities/iso3166/test_peru.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.peru import Peru, PE, PER +from holidays.entities.iso3166.peru import Peru, PE, PER from tests.common import CommonCountryTests diff --git a/tests/countries/test_philippines.py b/tests/entities/iso3166/test_philippines.py similarity index 96% rename from tests/countries/test_philippines.py rename to tests/entities/iso3166/test_philippines.py index cdad47e37..ec81ecaaa 100644 --- a/tests/countries/test_philippines.py +++ b/tests/entities/iso3166/test_philippines.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.philippines import Philippines, PH, PHL +from holidays.entities.iso3166.philippines import Philippines, PH, PHL from tests.common import CommonCountryTests diff --git a/tests/countries/test_poland.py b/tests/entities/iso3166/test_poland.py similarity index 99% rename from tests/countries/test_poland.py rename to tests/entities/iso3166/test_poland.py index e2bff3e07..bc2f39054 100644 --- a/tests/countries/test_poland.py +++ b/tests/entities/iso3166/test_poland.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.poland import Poland, PL, POL +from holidays.entities.iso3166.poland import Poland, PL, POL from tests.common import CommonCountryTests diff --git a/tests/countries/test_portugal.py b/tests/entities/iso3166/test_portugal.py similarity index 99% rename from tests/countries/test_portugal.py rename to tests/entities/iso3166/test_portugal.py index 823e6fd2c..25574d3ff 100644 --- a/tests/countries/test_portugal.py +++ b/tests/entities/iso3166/test_portugal.py @@ -14,7 +14,7 @@ from unittest import TestCase from holidays.constants import OPTIONAL, PUBLIC -from holidays.countries.portugal import Portugal, PT, PRT +from holidays.entities.iso3166.portugal import Portugal, PT, PRT from tests.common import CommonCountryTests diff --git a/tests/countries/test_puerto_rico.py b/tests/entities/iso3166/test_puerto_rico.py similarity index 95% rename from tests/countries/test_puerto_rico.py rename to tests/entities/iso3166/test_puerto_rico.py index d78e5a819..1d5004537 100644 --- a/tests/countries/test_puerto_rico.py +++ b/tests/entities/iso3166/test_puerto_rico.py @@ -15,7 +15,7 @@ from holidays.calendars.gregorian import NOV from holidays.constants import UNOFFICIAL -from holidays.countries.puerto_rico import HolidaysPR, PR, PRI +from holidays.entities.iso3166.puerto_rico import HolidaysPR, PR, PRI from tests.common import CommonCountryTests diff --git a/tests/countries/test_romania.py b/tests/entities/iso3166/test_romania.py similarity index 99% rename from tests/countries/test_romania.py rename to tests/entities/iso3166/test_romania.py index 6c462c46b..f74cb7a76 100644 --- a/tests/countries/test_romania.py +++ b/tests/entities/iso3166/test_romania.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.romania import Romania, RO, ROU +from holidays.entities.iso3166.romania import Romania, RO, ROU from tests.common import CommonCountryTests diff --git a/tests/countries/test_russia.py b/tests/entities/iso3166/test_russia.py similarity index 99% rename from tests/countries/test_russia.py rename to tests/entities/iso3166/test_russia.py index 31666ff5d..6c39a2aac 100644 --- a/tests/countries/test_russia.py +++ b/tests/entities/iso3166/test_russia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.russia import Russia, RU, RUS +from holidays.entities.iso3166.russia import Russia, RU, RUS from tests.common import CommonCountryTests diff --git a/tests/countries/test_san_marino.py b/tests/entities/iso3166/test_san_marino.py similarity index 97% rename from tests/countries/test_san_marino.py rename to tests/entities/iso3166/test_san_marino.py index bf2a87f7b..6a39d0c56 100644 --- a/tests/countries/test_san_marino.py +++ b/tests/entities/iso3166/test_san_marino.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.san_marino import SanMarino, SM, SMR +from holidays.entities.iso3166.san_marino import SanMarino, SM, SMR from tests.common import CommonCountryTests diff --git a/tests/countries/test_saudi_arabia.py b/tests/entities/iso3166/test_saudi_arabia.py similarity index 99% rename from tests/countries/test_saudi_arabia.py rename to tests/entities/iso3166/test_saudi_arabia.py index 498d5f77f..b9dddd0d0 100644 --- a/tests/countries/test_saudi_arabia.py +++ b/tests/entities/iso3166/test_saudi_arabia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.saudi_arabia import SaudiArabia, SA, SAU +from holidays.entities.iso3166.saudi_arabia import SaudiArabia, SA, SAU from tests.common import CommonCountryTests diff --git a/tests/countries/test_serbia.py b/tests/entities/iso3166/test_serbia.py similarity index 98% rename from tests/countries/test_serbia.py rename to tests/entities/iso3166/test_serbia.py index fdff73b26..12532442f 100644 --- a/tests/countries/test_serbia.py +++ b/tests/entities/iso3166/test_serbia.py @@ -13,7 +13,7 @@ from datetime import date from unittest import TestCase -from holidays.countries.serbia import Serbia, RS, SRB +from holidays.entities.iso3166.serbia import Serbia, RS, SRB from tests.common import CommonCountryTests diff --git a/tests/countries/test_seychelles.py b/tests/entities/iso3166/test_seychelles.py similarity index 99% rename from tests/countries/test_seychelles.py rename to tests/entities/iso3166/test_seychelles.py index 52d8df59e..888195cd6 100644 --- a/tests/countries/test_seychelles.py +++ b/tests/entities/iso3166/test_seychelles.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.seychelles import Seychelles, SC, SYC +from holidays.entities.iso3166.seychelles import Seychelles, SC, SYC from tests.common import CommonCountryTests diff --git a/tests/countries/test_singapore.py b/tests/entities/iso3166/test_singapore.py similarity index 99% rename from tests/countries/test_singapore.py rename to tests/entities/iso3166/test_singapore.py index b89dbf926..d0ba14b75 100644 --- a/tests/countries/test_singapore.py +++ b/tests/entities/iso3166/test_singapore.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.singapore import Singapore, SG, SGP +from holidays.entities.iso3166.singapore import Singapore, SG, SGP from tests.common import CommonCountryTests diff --git a/tests/countries/test_slovakia.py b/tests/entities/iso3166/test_slovakia.py similarity index 99% rename from tests/countries/test_slovakia.py rename to tests/entities/iso3166/test_slovakia.py index ef8272e92..5176b11a8 100644 --- a/tests/countries/test_slovakia.py +++ b/tests/entities/iso3166/test_slovakia.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import WORKDAY -from holidays.countries.slovakia import Slovakia, SK, SVK +from holidays.entities.iso3166.slovakia import Slovakia, SK, SVK from tests.common import CommonCountryTests diff --git a/tests/countries/test_slovenia.py b/tests/entities/iso3166/test_slovenia.py similarity index 98% rename from tests/countries/test_slovenia.py rename to tests/entities/iso3166/test_slovenia.py index a3a3e5219..af9ef9883 100644 --- a/tests/countries/test_slovenia.py +++ b/tests/entities/iso3166/test_slovenia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.slovenia import Slovenia, SI, SVN +from holidays.entities.iso3166.slovenia import Slovenia, SI, SVN from tests.common import CommonCountryTests diff --git a/tests/countries/test_south_africa.py b/tests/entities/iso3166/test_south_africa.py similarity index 99% rename from tests/countries/test_south_africa.py rename to tests/entities/iso3166/test_south_africa.py index e9d592b3a..5eb01edba 100644 --- a/tests/countries/test_south_africa.py +++ b/tests/entities/iso3166/test_south_africa.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.south_africa import SouthAfrica, ZA, ZAF +from holidays.entities.iso3166.south_africa import SouthAfrica, ZA, ZAF from tests.common import CommonCountryTests diff --git a/tests/countries/test_south_korea.py b/tests/entities/iso3166/test_south_korea.py similarity index 99% rename from tests/countries/test_south_korea.py rename to tests/entities/iso3166/test_south_korea.py index 3143bb1af..9094880a1 100644 --- a/tests/countries/test_south_korea.py +++ b/tests/entities/iso3166/test_south_korea.py @@ -14,7 +14,7 @@ from unittest import TestCase from holidays.constants import BANK, PUBLIC -from holidays.countries.south_korea import SouthKorea, KR, KOR, Korea +from holidays.entities.iso3166.south_korea import SouthKorea, KR, KOR, Korea from tests.common import CommonCountryTests diff --git a/tests/countries/test_spain.py b/tests/entities/iso3166/test_spain.py similarity index 99% rename from tests/countries/test_spain.py rename to tests/entities/iso3166/test_spain.py index 6be81ce94..b6bc6faab 100644 --- a/tests/countries/test_spain.py +++ b/tests/entities/iso3166/test_spain.py @@ -14,7 +14,7 @@ from unittest import TestCase from holidays.calendars.gregorian import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC -from holidays.countries.spain import Spain, ES, ESP +from holidays.entities.iso3166.spain import Spain, ES, ESP from tests.common import CommonCountryTests diff --git a/tests/countries/test_sweden.py b/tests/entities/iso3166/test_sweden.py similarity index 99% rename from tests/countries/test_sweden.py rename to tests/entities/iso3166/test_sweden.py index 4013b0dec..240ed754e 100644 --- a/tests/countries/test_sweden.py +++ b/tests/entities/iso3166/test_sweden.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.sweden import Sweden, SE, SWE +from holidays.entities.iso3166.sweden import Sweden, SE, SWE from tests.common import CommonCountryTests, SundayHolidays diff --git a/tests/countries/test_switzerland.py b/tests/entities/iso3166/test_switzerland.py similarity index 99% rename from tests/countries/test_switzerland.py rename to tests/entities/iso3166/test_switzerland.py index e2f842e93..93c3150ae 100644 --- a/tests/countries/test_switzerland.py +++ b/tests/entities/iso3166/test_switzerland.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import HALF_DAY, OPTIONAL, PUBLIC -from holidays.countries.switzerland import Switzerland, CH, CHE +from holidays.entities.iso3166.switzerland import Switzerland, CH, CHE from tests.common import CommonCountryTests diff --git a/tests/countries/test_taiwan.py b/tests/entities/iso3166/test_taiwan.py similarity index 99% rename from tests/countries/test_taiwan.py rename to tests/entities/iso3166/test_taiwan.py index 8ffb08490..7b39d8c74 100644 --- a/tests/countries/test_taiwan.py +++ b/tests/entities/iso3166/test_taiwan.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.taiwan import Taiwan, TW, TWN +from holidays.entities.iso3166.taiwan import Taiwan, TW, TWN from tests.common import CommonCountryTests diff --git a/tests/countries/test_tanzania.py b/tests/entities/iso3166/test_tanzania.py similarity index 99% rename from tests/countries/test_tanzania.py rename to tests/entities/iso3166/test_tanzania.py index 238c10557..df2aaeaeb 100644 --- a/tests/countries/test_tanzania.py +++ b/tests/entities/iso3166/test_tanzania.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import BANK, PUBLIC -from holidays.countries.tanzania import Tanzania, TZ, TZA +from holidays.entities.iso3166.tanzania import Tanzania, TZ, TZA from tests.common import CommonCountryTests diff --git a/tests/countries/test_thailand.py b/tests/entities/iso3166/test_thailand.py similarity index 99% rename from tests/countries/test_thailand.py rename to tests/entities/iso3166/test_thailand.py index 51f154c98..79ce56f6d 100644 --- a/tests/countries/test_thailand.py +++ b/tests/entities/iso3166/test_thailand.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import ARMED_FORCES, BANK, GOVERNMENT, PUBLIC, SCHOOL, WORKDAY -from holidays.countries.thailand import Thailand, TH, THA +from holidays.entities.iso3166.thailand import Thailand, TH, THA from tests.common import CommonCountryTests diff --git a/tests/countries/test_timor_leste.py b/tests/entities/iso3166/test_timor_leste.py similarity index 99% rename from tests/countries/test_timor_leste.py rename to tests/entities/iso3166/test_timor_leste.py index a4dcaf3a3..21375ba48 100644 --- a/tests/countries/test_timor_leste.py +++ b/tests/entities/iso3166/test_timor_leste.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import GOVERNMENT, PUBLIC, WORKDAY -from holidays.countries.timor_leste import TimorLeste, TL, TLS +from holidays.entities.iso3166.timor_leste import TimorLeste, TL, TLS from tests.common import CommonCountryTests diff --git a/tests/countries/test_tonga.py b/tests/entities/iso3166/test_tonga.py similarity index 99% rename from tests/countries/test_tonga.py rename to tests/entities/iso3166/test_tonga.py index d5cdcef88..bbc201e2f 100644 --- a/tests/countries/test_tonga.py +++ b/tests/entities/iso3166/test_tonga.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.tonga import Tonga, TO, TON +from holidays.entities.iso3166.tonga import Tonga, TO, TON from tests.common import CommonCountryTests diff --git a/tests/countries/test_tunisia.py b/tests/entities/iso3166/test_tunisia.py similarity index 98% rename from tests/countries/test_tunisia.py rename to tests/entities/iso3166/test_tunisia.py index d21b0b0e2..2a6a9c2cf 100644 --- a/tests/countries/test_tunisia.py +++ b/tests/entities/iso3166/test_tunisia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.tunisia import Tunisia, TN, TUN +from holidays.entities.iso3166.tunisia import Tunisia, TN, TUN from tests.common import CommonCountryTests diff --git a/tests/countries/test_turkey.py b/tests/entities/iso3166/test_turkey.py similarity index 99% rename from tests/countries/test_turkey.py rename to tests/entities/iso3166/test_turkey.py index cdd11a390..54c2cd6c0 100644 --- a/tests/countries/test_turkey.py +++ b/tests/entities/iso3166/test_turkey.py @@ -15,7 +15,7 @@ from holidays.calendars.gregorian import _timedelta from holidays.constants import HALF_DAY, PUBLIC -from holidays.countries.turkey import Turkey, TR, TUR +from holidays.entities.iso3166.turkey import Turkey, TR, TUR from tests.common import CommonCountryTests diff --git a/tests/countries/test_ukraine.py b/tests/entities/iso3166/test_ukraine.py similarity index 99% rename from tests/countries/test_ukraine.py rename to tests/entities/iso3166/test_ukraine.py index ecc4100fd..fbdd85f45 100644 --- a/tests/countries/test_ukraine.py +++ b/tests/entities/iso3166/test_ukraine.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.ukraine import Ukraine, UA, UKR +from holidays.entities.iso3166.ukraine import Ukraine, UA, UKR from tests.common import CommonCountryTests diff --git a/tests/countries/test_united_arab_emirates.py b/tests/entities/iso3166/test_united_arab_emirates.py similarity index 98% rename from tests/countries/test_united_arab_emirates.py rename to tests/entities/iso3166/test_united_arab_emirates.py index b6f5bac8a..1b96d8758 100644 --- a/tests/countries/test_united_arab_emirates.py +++ b/tests/entities/iso3166/test_united_arab_emirates.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.united_arab_emirates import UnitedArabEmirates, AE, ARE +from holidays.entities.iso3166.united_arab_emirates import UnitedArabEmirates, AE, ARE from tests.common import CommonCountryTests diff --git a/tests/countries/test_united_kingdom.py b/tests/entities/iso3166/test_united_kingdom.py similarity index 99% rename from tests/countries/test_united_kingdom.py rename to tests/entities/iso3166/test_united_kingdom.py index 80bc0b06d..859a21727 100644 --- a/tests/countries/test_united_kingdom.py +++ b/tests/entities/iso3166/test_united_kingdom.py @@ -13,7 +13,7 @@ import warnings from unittest import TestCase -from holidays.countries.united_kingdom import UnitedKingdom, UK, GB, GBR +from holidays.entities.iso3166.united_kingdom import UnitedKingdom, UK, GB, GBR from tests.common import CommonCountryTests diff --git a/tests/countries/test_united_states.py b/tests/entities/iso3166/test_united_states.py similarity index 99% rename from tests/countries/test_united_states.py rename to tests/entities/iso3166/test_united_states.py index a62eccae4..33e1d61ad 100644 --- a/tests/countries/test_united_states.py +++ b/tests/entities/iso3166/test_united_states.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import UNOFFICIAL -from holidays.countries.united_states import UnitedStates, US, USA +from holidays.entities.iso3166.united_states import UnitedStates, US, USA from tests.common import CommonCountryTests diff --git a/tests/countries/test_united_states_minor_outlying_islands.py b/tests/entities/iso3166/test_united_states_minor_outlying_islands.py similarity index 92% rename from tests/countries/test_united_states_minor_outlying_islands.py rename to tests/entities/iso3166/test_united_states_minor_outlying_islands.py index f22c9efba..1bb6c9374 100644 --- a/tests/countries/test_united_states_minor_outlying_islands.py +++ b/tests/entities/iso3166/test_united_states_minor_outlying_islands.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import UNOFFICIAL -from holidays.countries.united_states_minor_outlying_islands import HolidaysUM, UM, UMI +from holidays.entities.iso3166.united_states_minor_outlying_islands import HolidaysUM, UM, UMI from tests.common import CommonCountryTests diff --git a/tests/countries/test_united_states_virgin_islands.py b/tests/entities/iso3166/test_united_states_virgin_islands.py similarity index 94% rename from tests/countries/test_united_states_virgin_islands.py rename to tests/entities/iso3166/test_united_states_virgin_islands.py index 93fdf1a1b..92d2b6cb3 100644 --- a/tests/countries/test_united_states_virgin_islands.py +++ b/tests/entities/iso3166/test_united_states_virgin_islands.py @@ -15,7 +15,7 @@ from holidays.calendars.gregorian import MAR from holidays.constants import UNOFFICIAL -from holidays.countries.united_states_virgin_islands import HolidaysVI, VI, VIR +from holidays.entities.iso3166.united_states_virgin_islands import HolidaysVI, VI, VIR from tests.common import CommonCountryTests diff --git a/tests/countries/test_uruguay.py b/tests/entities/iso3166/test_uruguay.py similarity index 99% rename from tests/countries/test_uruguay.py rename to tests/entities/iso3166/test_uruguay.py index af895f18a..5f6919803 100644 --- a/tests/countries/test_uruguay.py +++ b/tests/entities/iso3166/test_uruguay.py @@ -13,7 +13,7 @@ from unittest import TestCase from holidays.constants import BANK, PUBLIC -from holidays.countries.uruguay import Uruguay, UY, URY +from holidays.entities.iso3166.uruguay import Uruguay, UY, URY from tests.common import CommonCountryTests diff --git a/tests/countries/test_uzbekistan.py b/tests/entities/iso3166/test_uzbekistan.py similarity index 99% rename from tests/countries/test_uzbekistan.py rename to tests/entities/iso3166/test_uzbekistan.py index ab9c44f76..df880baa5 100644 --- a/tests/countries/test_uzbekistan.py +++ b/tests/entities/iso3166/test_uzbekistan.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.uzbekistan import Uzbekistan, UZ, UZB +from holidays.entities.iso3166.uzbekistan import Uzbekistan, UZ, UZB from tests.common import CommonCountryTests diff --git a/tests/countries/test_vanuatu.py b/tests/entities/iso3166/test_vanuatu.py similarity index 99% rename from tests/countries/test_vanuatu.py rename to tests/entities/iso3166/test_vanuatu.py index c76f8c45b..2df3e578b 100644 --- a/tests/countries/test_vanuatu.py +++ b/tests/entities/iso3166/test_vanuatu.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.vanuatu import Vanuatu, VU, VTU +from holidays.entities.iso3166.vanuatu import Vanuatu, VU, VTU from tests.common import CommonCountryTests diff --git a/tests/countries/test_vatican_city.py b/tests/entities/iso3166/test_vatican_city.py similarity index 98% rename from tests/countries/test_vatican_city.py rename to tests/entities/iso3166/test_vatican_city.py index 1e026603a..4f9331233 100644 --- a/tests/countries/test_vatican_city.py +++ b/tests/entities/iso3166/test_vatican_city.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.vatican_city import VaticanCity, VA, VAT +from holidays.entities.iso3166.vatican_city import VaticanCity, VA, VAT from tests.common import CommonCountryTests diff --git a/tests/countries/test_venezuela.py b/tests/entities/iso3166/test_venezuela.py similarity index 99% rename from tests/countries/test_venezuela.py rename to tests/entities/iso3166/test_venezuela.py index 53722cee3..de35eb787 100644 --- a/tests/countries/test_venezuela.py +++ b/tests/entities/iso3166/test_venezuela.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.venezuela import Venezuela, VE, VEN +from holidays.entities.iso3166.venezuela import Venezuela, VE, VEN from tests.common import CommonCountryTests diff --git a/tests/countries/test_vietnam.py b/tests/entities/iso3166/test_vietnam.py similarity index 98% rename from tests/countries/test_vietnam.py rename to tests/entities/iso3166/test_vietnam.py index e8fe354fd..b3d635a16 100644 --- a/tests/countries/test_vietnam.py +++ b/tests/entities/iso3166/test_vietnam.py @@ -14,7 +14,7 @@ from unittest import TestCase from holidays.calendars.gregorian import _timedelta -from holidays.countries.vietnam import Vietnam, VN, VNM +from holidays.entities.iso3166.vietnam import Vietnam, VN, VNM from tests.common import CommonCountryTests diff --git a/tests/countries/test_zambia.py b/tests/entities/iso3166/test_zambia.py similarity index 98% rename from tests/countries/test_zambia.py rename to tests/entities/iso3166/test_zambia.py index cb29ff15f..cafa73baa 100644 --- a/tests/countries/test_zambia.py +++ b/tests/entities/iso3166/test_zambia.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.zambia import Zambia, ZM, ZMB +from holidays.entities.iso3166.zambia import Zambia, ZM, ZMB from tests.common import CommonCountryTests diff --git a/tests/countries/test_zimbabwe.py b/tests/entities/iso3166/test_zimbabwe.py similarity index 98% rename from tests/countries/test_zimbabwe.py rename to tests/entities/iso3166/test_zimbabwe.py index 0f27cd7b4..ad12c68f1 100644 --- a/tests/countries/test_zimbabwe.py +++ b/tests/entities/iso3166/test_zimbabwe.py @@ -12,7 +12,7 @@ from unittest import TestCase -from holidays.countries.zimbabwe import Zimbabwe, ZW, ZWE +from holidays.entities.iso3166.zimbabwe import Zimbabwe, ZW, ZWE from tests.common import CommonCountryTests diff --git a/tests/test_docs.py b/tests/test_docs.py index 99a30b291..4eb849fba 100644 --- a/tests/test_docs.py +++ b/tests/test_docs.py @@ -28,7 +28,10 @@ def setUpClass(cls): def test_supported_countries_count(self): actual_country_count = len(list_supported_countries(include_aliases=False)) readme_country_count = int( - re.findall(r"We currently support (\d+) country codes.", self.readme_content)[0] + re.findall( + r"We currently support (\d+) ISO 3166 entity codes.", + self.readme_content, + )[0] ) self.assertEqual( readme_country_count, @@ -55,7 +58,7 @@ def test_supported_countries_table(self): table_content = [ line.strip() for line in re.findall( - r"Supported Categories(.*)Available Financial Markets", + r"Supported Categories(.*)Available ISO 10383 Entities", self.readme_content, re.DOTALL, )[0].split("\n") diff --git a/tests/test_holiday_base.py b/tests/test_holiday_base.py index 95973e225..cade136db 100644 --- a/tests/test_holiday_base.py +++ b/tests/test_holiday_base.py @@ -847,7 +847,7 @@ def test_country(self): ) def test_market(self): - self.assertEqual(repr(MarketStub1()), "holidays.financial_holidays('MS1')") + self.assertEqual(repr(MarketStub1()), "holidays.entities.iso10383_holidays('MS1')") class TestSerialization(unittest.TestCase): diff --git a/tests/test_registry.py b/tests/test_registry.py index 4e206a4b6..5608ef97c 100644 --- a/tests/test_registry.py +++ b/tests/test_registry.py @@ -18,7 +18,8 @@ import pytest import holidays -from holidays import countries, financial, registry +from holidays import registry +from holidays.entities import iso3166, iso10383 from tests.common import PYTHON_LATEST_SUPPORTED_VERSION, PYTHON_VERSION @@ -32,9 +33,9 @@ def test_countries_imports(self): loader_entities = set() for module, entities in registry.COUNTRIES.items(): - module = importlib.import_module(f"holidays.countries.{module}") + module = importlib.import_module(f"holidays.entities.iso3166.{module}") for entity in entities: - countries_cls = getattr(countries, entity) + countries_cls = getattr(iso3166, entity) loader_cls = getattr(holidays, entity) module_cls = getattr(module, entity) @@ -49,7 +50,7 @@ def test_countries_imports(self): loader_entities.add(loader_cls.__name__) countries_entities = set( - entity[0] for entity in inspect.getmembers(countries, inspect.isclass) + entity[0] for entity in inspect.getmembers(iso3166, inspect.isclass) ) self.assertEqual( countries_entities, @@ -60,10 +61,10 @@ def test_countries_imports(self): def test_country_str(self): self.assertEqual( - str(registry.EntityLoader("holidays.countries.united_states.US")), - "A lazy loader for . " + str(registry.EntityLoader("holidays.entities.iso3166.united_states.US")), + "A lazy loader for . " "For inheritance please use the " - "'holidays.countries.united_states.US' class directly.", + "'holidays.entities.iso3166.united_states.US' class directly.", ) @pytest.mark.skipif( @@ -73,9 +74,9 @@ def test_country_str(self): def test_financial_imports(self): loader_entities = set() for module, entities in registry.FINANCIAL.items(): - module = importlib.import_module(f"holidays.financial.{module}") + module = importlib.import_module(f"holidays.entities.iso10383.{module}") for entity in entities: - financial_cls = getattr(financial, entity) + financial_cls = getattr(iso10383, entity) loader_cls = getattr(holidays, entity) module_cls = getattr(module, entity) @@ -90,7 +91,7 @@ def test_financial_imports(self): loader_entities.add(loader_cls.__name__) financial_entities = set( - entity[0] for entity in inspect.getmembers(financial, inspect.isclass) + entity[0] for entity in inspect.getmembers(iso10383, inspect.isclass) ) self.assertEqual( financial_entities, @@ -101,11 +102,11 @@ def test_financial_imports(self): def test_financial_str(self): self.assertEqual( - str(registry.EntityLoader("holidays.financial.ny_stock_exchange.NYSE")), + str(registry.EntityLoader("holidays.entities.iso10383.ny_stock_exchange.NYSE")), "A lazy loader for " - ". " + ". " "For inheritance please use the " - "'holidays.financial.ny_stock_exchange.NYSE' class directly.", + "'holidays.entities.iso10383.ny_stock_exchange.NYSE' class directly.", ) def test_inheritance(self): @@ -121,8 +122,8 @@ class SubClass(parent): create_instance(cls) for cls in ( - holidays.countries.UnitedStates, - holidays.countries.US, - holidays.countries.USA, + holidays.entities.iso3166.UnitedStates, + holidays.entities.iso3166.US, + holidays.entities.iso3166.USA, ): - self.assertIsInstance(create_instance(cls), holidays.countries.UnitedStates) + self.assertIsInstance(create_instance(cls), holidays.entities.iso3166.UnitedStates) diff --git a/tests/test_utils.py b/tests/test_utils.py index b8bd92818..0991bd979 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -213,7 +213,9 @@ def test_list_supported_countries(self): self.assertIsInstance(us_subdivisions, list) countries_files = [ - path for path in Path("holidays/countries").glob("*.py") if path.stem != "__init__" + path + for path in Path("holidays/entities/iso3166").glob("*.py") + if path.stem != "__init__" ] self.assertEqual( len(countries_files), @@ -231,7 +233,9 @@ def test_list_supported_financial(self): self.assertIsInstance(nyse, list) financial_files = [ - path for path in Path("holidays/financial").glob("*.py") if path.stem != "__init__" + path + for path in Path("holidays/entities/iso10383").glob("*.py") + if path.stem != "__init__" ] self.assertEqual( len(financial_files), diff --git a/tests/third_party/test_numpy.py b/tests/third_party/test_numpy.py index 8b90f590e..b7c9c0217 100644 --- a/tests/third_party/test_numpy.py +++ b/tests/third_party/test_numpy.py @@ -15,9 +15,9 @@ import pytest -from holidays.countries.cambodia import Cambodia -from holidays.countries.thailand import Thailand -from holidays.countries.ukraine import Ukraine +from holidays.entities.iso3166.cambodia import Cambodia +from holidays.entities.iso3166.thailand import Thailand +from holidays.entities.iso3166.ukraine import Ukraine class TestNumpy(TestCase):