From f4c9e0a7561b450333de62fd4d4c54c7595cbdbc Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Wed, 8 Feb 2023 19:27:18 +0000 Subject: [PATCH 01/17] require tzdata on windows --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e5d6f420915ef..fe2f965f2f8b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,8 @@ dependencies = [ "numpy>=1.21.0; python_version>='3.10'", "numpy>=1.23.2; python_version>='3.11'", "python-dateutil>=2.8.2", - "pytz>=2020.1" + "pytz>=2020.1", + "tzdata; platform_system=='Windows'" ] classifiers = [ 'Development Status :: 5 - Production/Stable', From 3a9cc7ddcd3b4777ebad1e8c373504d6ebb8cf60 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Thu, 9 Feb 2023 10:58:38 +0000 Subject: [PATCH 02/17] put minimum version? --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fe2f965f2f8b1..cb198491edf0f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "numpy>=1.23.2; python_version>='3.11'", "python-dateutil>=2.8.2", "pytz>=2020.1", - "tzdata; platform_system=='Windows'" + "tzdata>=2022.1; platform_system=='Windows'" ] classifiers = [ 'Development Status :: 5 - Production/Stable', From a0ac092100c2ea1aac21aebd31128979cdf84622 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Thu, 9 Feb 2023 11:22:33 +0000 Subject: [PATCH 03/17] try installing with pip in conda envs --- ci/deps/actions-310.yaml | 3 +++ ci/deps/actions-311.yaml | 3 +++ ci/deps/actions-38-downstream_compat.yaml | 3 +++ ci/deps/actions-38-minimum_versions.yaml | 1 + ci/deps/actions-38.yaml | 3 +++ ci/deps/actions-39.yaml | 3 +++ 6 files changed, 16 insertions(+) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 25032ed1c76b0..202c0be7367b1 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -55,3 +55,6 @@ dependencies: - xlrd - xlsxwriter - zstandard + + - pip: + - tzdata>=2022.1 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index aef97c232e940..1f56977c72d49 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -55,3 +55,6 @@ dependencies: - xlrd - xlsxwriter - zstandard + + - pip: + - tzdata>=2022.1 diff --git a/ci/deps/actions-38-downstream_compat.yaml b/ci/deps/actions-38-downstream_compat.yaml index 1de392a9cc277..8c0f830338ffc 100644 --- a/ci/deps/actions-38-downstream_compat.yaml +++ b/ci/deps/actions-38-downstream_compat.yaml @@ -69,3 +69,6 @@ dependencies: - pandas-gbq - pyyaml - py + + - pip: + - tzdata>=2022.1 diff --git a/ci/deps/actions-38-minimum_versions.yaml b/ci/deps/actions-38-minimum_versions.yaml index 7652b6347ad4f..c5f488a5f5ab3 100644 --- a/ci/deps/actions-38-minimum_versions.yaml +++ b/ci/deps/actions-38-minimum_versions.yaml @@ -61,3 +61,4 @@ dependencies: - pip: - pyqt5==5.15.1 + - tzdata>=2022.1 diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index 803b0bdbff793..d93ec2037ebad 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -54,3 +54,6 @@ dependencies: - xlrd - xlsxwriter - zstandard + + - pip: + - tzdata>=2022.1 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 5ce5681aa9e21..141031fac590c 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -55,3 +55,6 @@ dependencies: - xlrd - xlsxwriter - zstandard + + - pip: + - tzdata>=2022.1 From 5a1983d26bf74c1550304ee95277c99f6c721331 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Thu, 9 Feb 2023 11:41:47 +0000 Subject: [PATCH 04/17] fixup ci check --- .pre-commit-config.yaml | 1 + ci/deps/actions-38-minimum_versions.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 39c1f2b3a6c85..9fa20b1ca5c04 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -398,6 +398,7 @@ repos: language: python files: ^(ci/deps/actions-.*-minimum_versions\.yaml|pandas/compat/_optional\.py)$ additional_dependencies: [tomli] + pass_filenames: false - id: validate-errors-locations name: Validate errors locations description: Validate errors are in appropriate locations. diff --git a/ci/deps/actions-38-minimum_versions.yaml b/ci/deps/actions-38-minimum_versions.yaml index c5f488a5f5ab3..9d4be0e22550b 100644 --- a/ci/deps/actions-38-minimum_versions.yaml +++ b/ci/deps/actions-38-minimum_versions.yaml @@ -61,4 +61,4 @@ dependencies: - pip: - pyqt5==5.15.1 - - tzdata>=2022.1 + - tzdata==2022.1 From cafb5cc22585f2720995b336dbd1d836fed79dc5 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Thu, 9 Feb 2023 13:28:15 +0000 Subject: [PATCH 05/17] whatsnew --- doc/source/whatsnew/v2.0.0.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/source/whatsnew/v2.0.0.rst b/doc/source/whatsnew/v2.0.0.rst index bea7dd0a1ed6d..54e064ead0ee3 100644 --- a/doc/source/whatsnew/v2.0.0.rst +++ b/doc/source/whatsnew/v2.0.0.rst @@ -663,6 +663,8 @@ If installed, we now require: +-------------------+-----------------+----------+---------+ | python-dateutil | 2.8.2 | X | X | +-------------------+-----------------+----------+---------+ +| tzdata | 2022.1 |on Windows| X | ++-------------------+-----------------+----------+---------+ For `optional libraries `_ the general recommendation is to use the latest version. The following table lists the lowest version per library that is currently being tested throughout the development of pandas. From c19dca9b8cd342290132b7eb8258cf6a08a9050d Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Fri, 3 Mar 2023 11:11:57 +0000 Subject: [PATCH 06/17] add tzdata to yaml files --- ci/deps/actions-310-numpydev.yaml | 1 + ci/deps/actions-310.yaml | 1 + ci/deps/actions-311.yaml | 2 +- ci/deps/actions-38-downstream_compat.yaml | 1 + ci/deps/actions-38-minimum_versions.yaml | 2 +- ci/deps/actions-38.yaml | 1 + ci/deps/actions-39.yaml | 2 +- ci/deps/actions-pypy-38.yaml | 1 + 8 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ci/deps/actions-310-numpydev.yaml b/ci/deps/actions-310-numpydev.yaml index 1a461319685d2..da49894588f4a 100644 --- a/ci/deps/actions-310-numpydev.yaml +++ b/ci/deps/actions-310-numpydev.yaml @@ -18,6 +18,7 @@ dependencies: - python-dateutil - pytz - pip + - tzdata>=2022a - pip: - "cython" - "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple" diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 53a10ed10e4ff..e590076812ade 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -19,6 +19,7 @@ dependencies: - python-dateutil - numpy - pytz + - tzdata>=2022a # optional dependencies - beautifulsoup4>=4.9.3 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 9b4652db0446c..f166e55d1e2b5 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -19,6 +19,7 @@ dependencies: - python-dateutil - numpy - pytz + - tzdata>=2022a # optional dependencies - beautifulsoup4>=4.9.3 @@ -49,7 +50,6 @@ dependencies: - scipy>=1.7.1 - sqlalchemy>=1.4.16 - tabulate>=0.8.9 - - tzdata>=2022a - xarray>=0.21.0 - xlrd>=2.0.1 - xlsxwriter>=1.4.3 diff --git a/ci/deps/actions-38-downstream_compat.yaml b/ci/deps/actions-38-downstream_compat.yaml index 85bc05c4bf65c..4583690f35dfa 100644 --- a/ci/deps/actions-38-downstream_compat.yaml +++ b/ci/deps/actions-38-downstream_compat.yaml @@ -20,6 +20,7 @@ dependencies: - python-dateutil - numpy - pytz + - tzdata>=2022a # optional dependencies - beautifulsoup4>=4.9.3 diff --git a/ci/deps/actions-38-minimum_versions.yaml b/ci/deps/actions-38-minimum_versions.yaml index e5c32dad04c01..d210d8a2b9d1a 100644 --- a/ci/deps/actions-38-minimum_versions.yaml +++ b/ci/deps/actions-38-minimum_versions.yaml @@ -21,6 +21,7 @@ dependencies: - python-dateutil=2.8.2 - numpy=1.20.3 - pytz=2020.1 + - tzdata=2022a # optional dependencies - beautifulsoup4=4.9.3 @@ -52,7 +53,6 @@ dependencies: - scipy=1.7.1 - sqlalchemy=1.4.16 - tabulate=0.8.9 - - tzdata=2022a - xarray=0.21.0 - xlrd=2.0.1 - xlsxwriter=1.4.3 diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index c65f194830417..c970bbedba042 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -19,6 +19,7 @@ dependencies: - python-dateutil - numpy - pytz + - tzdata>=2022a # optional dependencies - beautifulsoup4>=4.9.3 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 0a5039126e49f..4bd7f9c353256 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -19,6 +19,7 @@ dependencies: - python-dateutil - numpy - pytz + - tzdata>=2022a # optional dependencies - beautifulsoup4>=4.9.3 @@ -49,7 +50,6 @@ dependencies: - scipy>=1.7.1 - sqlalchemy>=1.4.16 - tabulate>=0.8.9 - - tzdata>=2022a - xarray>=0.21.0 - xlrd>=2.0.1 - xlsxwriter>=1.4.3 diff --git a/ci/deps/actions-pypy-38.yaml b/ci/deps/actions-pypy-38.yaml index 36e1df6773f4c..72cd24d26f5bc 100644 --- a/ci/deps/actions-pypy-38.yaml +++ b/ci/deps/actions-pypy-38.yaml @@ -22,3 +22,4 @@ dependencies: - numpy - python-dateutil - pytz + - tzdata>=2022a From 1aaa8d06f50d8c7d8ef72e7626e67d990c3f0470 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Fri, 3 Mar 2023 11:58:36 +0000 Subject: [PATCH 07/17] add tzdata>=2022.1 to test_wheels_windows.bat --- ci/test_wheels_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test_wheels_windows.bat b/ci/test_wheels_windows.bat index 33de4fc5ad62d..6364169e53924 100644 --- a/ci/test_wheels_windows.bat +++ b/ci/test_wheels_windows.bat @@ -3,7 +3,7 @@ pd.test(extra_args=['-m not clipboard and not single_cpu and not slow and not ne pd.test(extra_args=['-m not clipboard and single_cpu and not slow and not network and not db']) python --version -pip install pytz six numpy python-dateutil +pip install pytz six numpy python-dateutil tzdata>=2022.1 pip install hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 pip install --find-links=pandas/dist --no-index pandas python -c "%test_command%" From fa3f2bc560379d44682e6f090ff06766aaf5545a Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Fri, 3 Mar 2023 14:21:27 +0000 Subject: [PATCH 08/17] try using OR statement --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9d216c47e621e..0030826abf99b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "numpy>=1.23.2; python_version>='3.11'", "python-dateutil>=2.8.2", "pytz>=2020.1", - "tzdata>=2022.1; platform_system=='Windows'" + "tzdata>=2022a|>=2022.1; platform_system=='Windows'" ] classifiers = [ 'Development Status :: 5 - Production/Stable', From b3c006eb25672e52f943e59082635f7f68a77209 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Fri, 3 Mar 2023 14:35:28 +0000 Subject: [PATCH 09/17] try another syntax --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0030826abf99b..bc960636755ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "numpy>=1.23.2; python_version>='3.11'", "python-dateutil>=2.8.2", "pytz>=2020.1", - "tzdata>=2022a|>=2022.1; platform_system=='Windows'" + "tzdata>=2022a,>=2022.1; platform_system=='Windows'" ] classifiers = [ 'Development Status :: 5 - Production/Stable', From 3a561bed6b19e54521462df17a8765e4d4d84f74 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Fri, 3 Mar 2023 14:55:34 +0000 Subject: [PATCH 10/17] try using the pypi install --- ci/deps/actions-310-numpydev.yaml | 3 ++- ci/deps/actions-310.yaml | 4 ++-- ci/deps/actions-311.yaml | 4 +++- ci/deps/actions-38-downstream_compat.yaml | 3 ++- ci/deps/actions-38-minimum_versions.yaml | 1 - ci/deps/actions-38.yaml | 3 ++- ci/deps/actions-39.yaml | 4 +++- ci/deps/actions-pypy-38.yaml | 3 ++- doc/source/getting_started/install.rst | 2 +- doc/source/whatsnew/v1.5.0.rst | 2 +- environment.yml | 2 +- pyproject.toml | 2 +- requirements-dev.txt | 2 +- scripts/validate_min_versions_in_sync.py | 1 - 14 files changed, 21 insertions(+), 15 deletions(-) diff --git a/ci/deps/actions-310-numpydev.yaml b/ci/deps/actions-310-numpydev.yaml index da49894588f4a..a500ad4a6f852 100644 --- a/ci/deps/actions-310-numpydev.yaml +++ b/ci/deps/actions-310-numpydev.yaml @@ -18,10 +18,11 @@ dependencies: - python-dateutil - pytz - pip - - tzdata>=2022a + - pip: - "cython" - "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple" - "--pre" - "numpy" - "scipy" + - "tzdata>=2022.1" diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index e590076812ade..0ee6f830f104d 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -19,7 +19,6 @@ dependencies: - python-dateutil - numpy - pytz - - tzdata>=2022a # optional dependencies - beautifulsoup4>=4.9.3 @@ -50,8 +49,9 @@ dependencies: - scipy>=1.7.1 - sqlalchemy>=1.4.16 - tabulate>=0.8.9 - - tzdata>=2022a - xarray>=0.21.0 - xlrd>=2.0.1 - xlsxwriter>=1.4.3 - zstandard>=0.15.2 + - pip: + - tzdata>=2022.1 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index f166e55d1e2b5..fa08bdf438dff 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -19,7 +19,6 @@ dependencies: - python-dateutil - numpy - pytz - - tzdata>=2022a # optional dependencies - beautifulsoup4>=4.9.3 @@ -54,3 +53,6 @@ dependencies: - xlrd>=2.0.1 - xlsxwriter>=1.4.3 - zstandard>=0.15.2 + + - pip: + - tzdata>=2022.1 diff --git a/ci/deps/actions-38-downstream_compat.yaml b/ci/deps/actions-38-downstream_compat.yaml index 4583690f35dfa..951f19f3e404c 100644 --- a/ci/deps/actions-38-downstream_compat.yaml +++ b/ci/deps/actions-38-downstream_compat.yaml @@ -20,7 +20,6 @@ dependencies: - python-dateutil - numpy - pytz - - tzdata>=2022a # optional dependencies - beautifulsoup4>=4.9.3 @@ -69,3 +68,5 @@ dependencies: - pandas-gbq>=0.15.0 - pyyaml - py + - pip: + - tzdata>=2022.1 diff --git a/ci/deps/actions-38-minimum_versions.yaml b/ci/deps/actions-38-minimum_versions.yaml index d210d8a2b9d1a..8305bfebef7a1 100644 --- a/ci/deps/actions-38-minimum_versions.yaml +++ b/ci/deps/actions-38-minimum_versions.yaml @@ -21,7 +21,6 @@ dependencies: - python-dateutil=2.8.2 - numpy=1.20.3 - pytz=2020.1 - - tzdata=2022a # optional dependencies - beautifulsoup4=4.9.3 diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index c970bbedba042..0cb273de417ae 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -19,7 +19,6 @@ dependencies: - python-dateutil - numpy - pytz - - tzdata>=2022a # optional dependencies - beautifulsoup4>=4.9.3 @@ -54,3 +53,5 @@ dependencies: - xlrd>=2.0.1 - xlsxwriter>=1.4.3 - zstandard>=0.15.2 + - pip: + - tzdata>=2022.1 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 4bd7f9c353256..4b0575d8a3afd 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -19,7 +19,6 @@ dependencies: - python-dateutil - numpy - pytz - - tzdata>=2022a # optional dependencies - beautifulsoup4>=4.9.3 @@ -54,3 +53,6 @@ dependencies: - xlrd>=2.0.1 - xlsxwriter>=1.4.3 - zstandard>=0.15.2 + + - pip: + - tzdata>=2022.1 diff --git a/ci/deps/actions-pypy-38.yaml b/ci/deps/actions-pypy-38.yaml index 72cd24d26f5bc..edade9eff1055 100644 --- a/ci/deps/actions-pypy-38.yaml +++ b/ci/deps/actions-pypy-38.yaml @@ -22,4 +22,5 @@ dependencies: - numpy - python-dateutil - pytz - - tzdata>=2022a + - pip: + - tzdata>=2022.1 diff --git a/doc/source/getting_started/install.rst b/doc/source/getting_started/install.rst index 28a57720a89a5..48864a70e73a2 100644 --- a/doc/source/getting_started/install.rst +++ b/doc/source/getting_started/install.rst @@ -317,7 +317,7 @@ Installable with ``pip install "pandas[timezone]"`` Dependency Minimum Version pip extra Notes ========================= ========================= =============== ============================================================= tzdata 2022.1(pypi)/ timezone Allows the use of ``zoneinfo`` timezones with pandas. - 2022a(for system tzdata) **Note**: You only need to install the pypi package if your + 2022.1(for system tzdata) **Note**: You only need to install the pypi package if your system does not already provide the IANA tz database. However, the minimum tzdata version still applies, even if it is not enforced through an error. diff --git a/doc/source/whatsnew/v1.5.0.rst b/doc/source/whatsnew/v1.5.0.rst index badf3f0f68627..8baa903476a56 100644 --- a/doc/source/whatsnew/v1.5.0.rst +++ b/doc/source/whatsnew/v1.5.0.rst @@ -657,7 +657,7 @@ Optional libraries below the lowest tested version may still work, but are not c +-----------------+-----------------+---------+ | tabulate |0.8.9 | X | +-----------------+-----------------+---------+ -| tzdata |2022a | | +| tzdata |2022.1 | | +-----------------+-----------------+---------+ | xarray |0.19.0 | X | +-----------------+-----------------+---------+ diff --git a/environment.yml b/environment.yml index 2a36247b23eb3..bcfe6ba1bd424 100644 --- a/environment.yml +++ b/environment.yml @@ -52,7 +52,6 @@ dependencies: - scipy>=1.7.1 - sqlalchemy>=1.4.16 - tabulate>=0.8.9 - - tzdata>=2022a - xarray>=0.21.0 - xlrd>=2.0.1 - xlsxwriter>=1.4.3 @@ -118,3 +117,4 @@ dependencies: - pip: - sphinx-toggleprompt + - tzdata>=2022.1 diff --git a/pyproject.toml b/pyproject.toml index bc960636755ca..9d216c47e621e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "numpy>=1.23.2; python_version>='3.11'", "python-dateutil>=2.8.2", "pytz>=2020.1", - "tzdata>=2022a,>=2022.1; platform_system=='Windows'" + "tzdata>=2022.1; platform_system=='Windows'" ] classifiers = [ 'Development Status :: 5 - Production/Stable', diff --git a/requirements-dev.txt b/requirements-dev.txt index 74a55c289fbe0..759841cd8bc95 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -41,7 +41,6 @@ s3fs>=2021.08.0 scipy>=1.7.1 SQLAlchemy>=1.4.16 tabulate>=0.8.9 -tzdata>=2022.1 xarray>=0.21.0 xlrd>=2.0.1 xlsxwriter>=1.4.3 @@ -87,4 +86,5 @@ pyyaml requests pygments sphinx-toggleprompt +tzdata>=2022.1 setuptools>=61.0.0 diff --git a/scripts/validate_min_versions_in_sync.py b/scripts/validate_min_versions_in_sync.py index 3c12f17fe72cf..22ecd960498ef 100755 --- a/scripts/validate_min_versions_in_sync.py +++ b/scripts/validate_min_versions_in_sync.py @@ -39,7 +39,6 @@ EXCLUDE_DEPS = {"tzdata", "blosc"} EXCLUSION_LIST = { "python=3.8[build=*_pypy]": None, - "tzdata": None, "pyarrow": None, } # pandas package is not available From e18aebee19c0c2c53638f4f62c309bec84f926fd Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Fri, 10 Mar 2023 09:39:30 +0000 Subject: [PATCH 11/17] try marking windows in yaml --- ci/deps/actions-310-numpydev.yaml | 2 +- ci/deps/actions-310.yaml | 3 ++- ci/deps/actions-311.yaml | 2 +- ci/deps/actions-38-downstream_compat.yaml | 3 ++- ci/deps/actions-38-minimum_versions.yaml | 1 + ci/deps/actions-38.yaml | 3 ++- ci/deps/actions-39.yaml | 2 +- ci/deps/actions-pypy-38.yaml | 3 ++- doc/source/whatsnew/v1.5.0.rst | 2 +- pyproject.toml | 4 ++-- 10 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ci/deps/actions-310-numpydev.yaml b/ci/deps/actions-310-numpydev.yaml index a500ad4a6f852..5637dd3434795 100644 --- a/ci/deps/actions-310-numpydev.yaml +++ b/ci/deps/actions-310-numpydev.yaml @@ -25,4 +25,4 @@ dependencies: - "--pre" - "numpy" - "scipy" - - "tzdata>=2022.1" + - "tzdata>=2022.1; platform_system=='Windows'" diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 0ee6f830f104d..07a5089d1be19 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -53,5 +53,6 @@ dependencies: - xlrd>=2.0.1 - xlsxwriter>=1.4.3 - zstandard>=0.15.2 + - pip: - - tzdata>=2022.1 + - tzdata>=2022.1; platform_system=="Windows" diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index fa08bdf438dff..04dc4909d6ea2 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -55,4 +55,4 @@ dependencies: - zstandard>=0.15.2 - pip: - - tzdata>=2022.1 + - tzdata>=2022.1; platform_system=="Windows" diff --git a/ci/deps/actions-38-downstream_compat.yaml b/ci/deps/actions-38-downstream_compat.yaml index 951f19f3e404c..f45e920b71239 100644 --- a/ci/deps/actions-38-downstream_compat.yaml +++ b/ci/deps/actions-38-downstream_compat.yaml @@ -68,5 +68,6 @@ dependencies: - pandas-gbq>=0.15.0 - pyyaml - py + - pip: - - tzdata>=2022.1 + - tzdata>=2022.1; platform_system=="Windows" diff --git a/ci/deps/actions-38-minimum_versions.yaml b/ci/deps/actions-38-minimum_versions.yaml index 8305bfebef7a1..226e82ceea26d 100644 --- a/ci/deps/actions-38-minimum_versions.yaml +++ b/ci/deps/actions-38-minimum_versions.yaml @@ -59,3 +59,4 @@ dependencies: - pip: - pyqt5==5.15.1 + - tzdata>=2022.1; platform_system=="Windows" diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index 0cb273de417ae..146d62734d1f3 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -53,5 +53,6 @@ dependencies: - xlrd>=2.0.1 - xlsxwriter>=1.4.3 - zstandard>=0.15.2 + - pip: - - tzdata>=2022.1 + - tzdata>=2022.1; platform_system=="Windows" diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 4b0575d8a3afd..745966eaf20d6 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -55,4 +55,4 @@ dependencies: - zstandard>=0.15.2 - pip: - - tzdata>=2022.1 + - tzdata>=2022.1; platform_system=="Windows" diff --git a/ci/deps/actions-pypy-38.yaml b/ci/deps/actions-pypy-38.yaml index edade9eff1055..03504572f8937 100644 --- a/ci/deps/actions-pypy-38.yaml +++ b/ci/deps/actions-pypy-38.yaml @@ -22,5 +22,6 @@ dependencies: - numpy - python-dateutil - pytz + - pip: - - tzdata>=2022.1 + - tzdata>=2022.1; platform_system=="Windows" diff --git a/doc/source/whatsnew/v1.5.0.rst b/doc/source/whatsnew/v1.5.0.rst index 8baa903476a56..badf3f0f68627 100644 --- a/doc/source/whatsnew/v1.5.0.rst +++ b/doc/source/whatsnew/v1.5.0.rst @@ -657,7 +657,7 @@ Optional libraries below the lowest tested version may still work, but are not c +-----------------+-----------------+---------+ | tabulate |0.8.9 | X | +-----------------+-----------------+---------+ -| tzdata |2022.1 | | +| tzdata |2022a | | +-----------------+-----------------+---------+ | xarray |0.19.0 | X | +-----------------+-----------------+---------+ diff --git a/pyproject.toml b/pyproject.toml index 70805650f95bf..0cc5d660559c3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ matplotlib = "pandas:plotting._matplotlib" [project.optional-dependencies] test = ['hypothesis>=6.34.2', 'pytest>=7.0.0', 'pytest-xdist>=2.2.0', 'pytest-asyncio>=0.17.0'] performance = ['bottleneck>=1.3.2', 'numba>=0.53.1', 'numexpr>=2.7.1'] -timezone = ['tzdata>=2022.1'] +timezone = ['tzdata>=2022.1; platform_system=="Windows"'] computation = ['scipy>=1.7.1', 'xarray>=0.21.0'] fss = ['fsspec>=2021.07.0'] aws = ['s3fs>=2021.08.0'] @@ -113,7 +113,7 @@ all = ['beautifulsoup4>=4.9.3', 'SQLAlchemy>=1.4.16', 'tables>=3.6.1', 'tabulate>=0.8.9', - 'tzdata>=2022.1', + 'tzdata>=2022.1; platform_system=="Windows"', 'xarray>=0.21.0', 'xlrd>=2.0.1', 'xlsxwriter>=1.4.3', From 0f7891ed4c77f1a892ded5422d0e276e7f10f532 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Fri, 10 Mar 2023 11:59:17 +0000 Subject: [PATCH 12/17] fixup validation script --- ci/deps/actions-38-minimum_versions.yaml | 2 +- scripts/validate_min_versions_in_sync.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ci/deps/actions-38-minimum_versions.yaml b/ci/deps/actions-38-minimum_versions.yaml index 226e82ceea26d..8b1d5c5a9327f 100644 --- a/ci/deps/actions-38-minimum_versions.yaml +++ b/ci/deps/actions-38-minimum_versions.yaml @@ -59,4 +59,4 @@ dependencies: - pip: - pyqt5==5.15.1 - - tzdata>=2022.1; platform_system=="Windows" + - tzdata==2022.1; platform_system=="Windows" diff --git a/scripts/validate_min_versions_in_sync.py b/scripts/validate_min_versions_in_sync.py index 22ecd960498ef..9edce3a00a502 100755 --- a/scripts/validate_min_versions_in_sync.py +++ b/scripts/validate_min_versions_in_sync.py @@ -227,10 +227,9 @@ def get_versions_from_ci(content: list[str]) -> tuple[dict[str, str], dict[str, continue elif seen_required and line.strip(): if "==" in line: - package, version = line.strip().split("==") - + package, version = line.strip().split("==", maxsplit=1) else: - package, version = line.strip().split("=") + package, version = line.strip().split("=", maxsplit=1) package = package[2:] if package in EXCLUDE_DEPS: continue From 249f345f78babebc6270c1134f8f437bf533635b Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Fri, 10 Mar 2023 12:09:59 +0000 Subject: [PATCH 13/17] clarify what tzdata is neeeded for, remove it as optional --- doc/source/whatsnew/v2.0.0.rst | 4 +++- pyproject.toml | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/whatsnew/v2.0.0.rst b/doc/source/whatsnew/v2.0.0.rst index 20355b9bb5b7b..0a84bfd11e97d 100644 --- a/doc/source/whatsnew/v2.0.0.rst +++ b/doc/source/whatsnew/v2.0.0.rst @@ -660,7 +660,9 @@ If installed, we now require: +-------------------+-----------------+----------+---------+ | python-dateutil | 2.8.2 | X | X | +-------------------+-----------------+----------+---------+ -| tzdata | 2022.1 |on Windows| X | +| | |on Windows| | +| tzdata | 2022.1 |for | X | +| | |timezones | | +-------------------+-----------------+----------+---------+ For `optional libraries `_ the general recommendation is to use the latest version. diff --git a/pyproject.toml b/pyproject.toml index 0cc5d660559c3..f3903bfa4514a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,6 @@ matplotlib = "pandas:plotting._matplotlib" [project.optional-dependencies] test = ['hypothesis>=6.34.2', 'pytest>=7.0.0', 'pytest-xdist>=2.2.0', 'pytest-asyncio>=0.17.0'] performance = ['bottleneck>=1.3.2', 'numba>=0.53.1', 'numexpr>=2.7.1'] -timezone = ['tzdata>=2022.1; platform_system=="Windows"'] computation = ['scipy>=1.7.1', 'xarray>=0.21.0'] fss = ['fsspec>=2021.07.0'] aws = ['s3fs>=2021.08.0'] @@ -113,7 +112,6 @@ all = ['beautifulsoup4>=4.9.3', 'SQLAlchemy>=1.4.16', 'tables>=3.6.1', 'tabulate>=0.8.9', - 'tzdata>=2022.1; platform_system=="Windows"', 'xarray>=0.21.0', 'xlrd>=2.0.1', 'xlsxwriter>=1.4.3', From 4b054da685ce5e0c4671b002c77ee4fc391e8b2a Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Fri, 10 Mar 2023 12:11:36 +0000 Subject: [PATCH 14/17] remove optional section on timezones --- doc/source/getting_started/install.rst | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/doc/source/getting_started/install.rst b/doc/source/getting_started/install.rst index 48864a70e73a2..f34676edd26dc 100644 --- a/doc/source/getting_started/install.rst +++ b/doc/source/getting_started/install.rst @@ -308,25 +308,6 @@ Dependency Minimum Version pip ext `numba `__ 0.53.1 performance Alternative execution engine for operations that accept ``engine="numba"`` using a JIT compiler that translates Python functions to optimized machine code using the LLVM compiler. ===================================================== ================== ================== =================================================================================================================================================================================== -Timezones -^^^^^^^^^ - -Installable with ``pip install "pandas[timezone]"`` - -========================= ========================= =============== ============================================================= -Dependency Minimum Version pip extra Notes -========================= ========================= =============== ============================================================= -tzdata 2022.1(pypi)/ timezone Allows the use of ``zoneinfo`` timezones with pandas. - 2022.1(for system tzdata) **Note**: You only need to install the pypi package if your - system does not already provide the IANA tz database. - However, the minimum tzdata version still applies, even if it - is not enforced through an error. - - If you would like to keep your system tzdata version updated, - it is recommended to use the ``tzdata`` package from - conda-forge. -========================= ========================= =============== ============================================================= - Visualization ^^^^^^^^^^^^^ From 51d44f4688f4a0895ae8041a302f6e20822372c1 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Tue, 14 Mar 2023 09:32:46 +0000 Subject: [PATCH 15/17] require tzdata everywhere --- ci/deps/actions-310-numpydev.yaml | 2 +- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-311.yaml | 2 +- ci/deps/actions-38-downstream_compat.yaml | 2 +- ci/deps/actions-38-minimum_versions.yaml | 2 +- ci/deps/actions-38.yaml | 2 +- ci/deps/actions-39.yaml | 2 +- ci/deps/actions-pypy-38.yaml | 2 +- doc/source/whatsnew/v2.0.0.rst | 4 +--- pyproject.toml | 2 +- 10 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ci/deps/actions-310-numpydev.yaml b/ci/deps/actions-310-numpydev.yaml index 5637dd3434795..a500ad4a6f852 100644 --- a/ci/deps/actions-310-numpydev.yaml +++ b/ci/deps/actions-310-numpydev.yaml @@ -25,4 +25,4 @@ dependencies: - "--pre" - "numpy" - "scipy" - - "tzdata>=2022.1; platform_system=='Windows'" + - "tzdata>=2022.1" diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 07a5089d1be19..f40b555593f6b 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -55,4 +55,4 @@ dependencies: - zstandard>=0.15.2 - pip: - - tzdata>=2022.1; platform_system=="Windows" + - tzdata>=2022.1 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 04dc4909d6ea2..fa08bdf438dff 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -55,4 +55,4 @@ dependencies: - zstandard>=0.15.2 - pip: - - tzdata>=2022.1; platform_system=="Windows" + - tzdata>=2022.1 diff --git a/ci/deps/actions-38-downstream_compat.yaml b/ci/deps/actions-38-downstream_compat.yaml index f45e920b71239..a9265bd84ee87 100644 --- a/ci/deps/actions-38-downstream_compat.yaml +++ b/ci/deps/actions-38-downstream_compat.yaml @@ -70,4 +70,4 @@ dependencies: - py - pip: - - tzdata>=2022.1; platform_system=="Windows" + - tzdata>=2022.1 diff --git a/ci/deps/actions-38-minimum_versions.yaml b/ci/deps/actions-38-minimum_versions.yaml index 8b1d5c5a9327f..2eb2ade8a2934 100644 --- a/ci/deps/actions-38-minimum_versions.yaml +++ b/ci/deps/actions-38-minimum_versions.yaml @@ -59,4 +59,4 @@ dependencies: - pip: - pyqt5==5.15.1 - - tzdata==2022.1; platform_system=="Windows" + - tzdata==2022.1 diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index 146d62734d1f3..27872514447a5 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -55,4 +55,4 @@ dependencies: - zstandard>=0.15.2 - pip: - - tzdata>=2022.1; platform_system=="Windows" + - tzdata>=2022.1 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 745966eaf20d6..4b0575d8a3afd 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -55,4 +55,4 @@ dependencies: - zstandard>=0.15.2 - pip: - - tzdata>=2022.1; platform_system=="Windows" + - tzdata>=2022.1 diff --git a/ci/deps/actions-pypy-38.yaml b/ci/deps/actions-pypy-38.yaml index 03504572f8937..87b8344a25eb1 100644 --- a/ci/deps/actions-pypy-38.yaml +++ b/ci/deps/actions-pypy-38.yaml @@ -24,4 +24,4 @@ dependencies: - pytz - pip: - - tzdata>=2022.1; platform_system=="Windows" + - tzdata>=2022.1 diff --git a/doc/source/whatsnew/v2.0.0.rst b/doc/source/whatsnew/v2.0.0.rst index 0a84bfd11e97d..b00d62c50c099 100644 --- a/doc/source/whatsnew/v2.0.0.rst +++ b/doc/source/whatsnew/v2.0.0.rst @@ -660,9 +660,7 @@ If installed, we now require: +-------------------+-----------------+----------+---------+ | python-dateutil | 2.8.2 | X | X | +-------------------+-----------------+----------+---------+ -| | |on Windows| | -| tzdata | 2022.1 |for | X | -| | |timezones | | +| tzdata | 2022.1 | X | X | +-------------------+-----------------+----------+---------+ For `optional libraries `_ the general recommendation is to use the latest version. diff --git a/pyproject.toml b/pyproject.toml index f3903bfa4514a..38848c32e3ff4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "numpy>=1.23.2; python_version>='3.11'", "python-dateutil>=2.8.2", "pytz>=2020.1", - "tzdata>=2022.1; platform_system=='Windows'" + "tzdata>=2022.1" ] classifiers = [ 'Development Status :: 5 - Production/Stable', From 624e0e7939ae3fabf489eee69f7e166f46e53d8d Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Tue, 14 Mar 2023 10:05:36 +0000 Subject: [PATCH 16/17] remove timezone extra in package-checks --- .github/workflows/package-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-checks.yml b/.github/workflows/package-checks.yml index d5854b3fcad18..1ec26e7ecdeef 100644 --- a/.github/workflows/package-checks.yml +++ b/.github/workflows/package-checks.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - extra: ["test", "performance", "timezone", "computation", "fss", "aws", "gcp", "excel", "parquet", "feather", "hdf5", "spss", "postgresql", "mysql", "sql-other", "html", "xml", "plot", "output_formatting", "clipboard", "compression", "all"] + extra: ["test", "performance", "computation", "fss", "aws", "gcp", "excel", "parquet", "feather", "hdf5", "spss", "postgresql", "mysql", "sql-other", "html", "xml", "plot", "output_formatting", "clipboard", "compression", "all"] fail-fast: false name: Install Extras - ${{ matrix.extra }} concurrency: From 860338fedd15d2063140d2d27e52d5e54990b647 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Wed, 15 Mar 2023 11:32:22 +0000 Subject: [PATCH 17/17] remove final timezone extra reference --- doc/source/whatsnew/v2.0.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/whatsnew/v2.0.0.rst b/doc/source/whatsnew/v2.0.0.rst index 348a450d487e6..05a9ea4390277 100644 --- a/doc/source/whatsnew/v2.0.0.rst +++ b/doc/source/whatsnew/v2.0.0.rst @@ -25,7 +25,7 @@ When installing pandas using pip, sets of optional dependencies can also be inst pip install "pandas[performance, aws]>=2.0.0" The available extras, found in the :ref:`installation guide`, are -``[all, performance, computation, timezone, fss, aws, gcp, excel, parquet, feather, hdf5, spss, postgresql, mysql, +``[all, performance, computation, fss, aws, gcp, excel, parquet, feather, hdf5, spss, postgresql, mysql, sql-other, html, xml, plot, output_formatting, clipboard, compression, test]`` (:issue:`39164`). .. _whatsnew_200.enhancements.index_can_hold_numpy_numeric_dtypes: