From b6668dadfa70ed4391211e36e2f1e2cc36e69547 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:29:45 -0400 Subject: [PATCH 1/5] BLD: Final release prep --- doc/source/whatsnew/v2.2.2.rst | 2 +- doc/source/whatsnew/v2.2.3.rst | 23 ++++++++++++++++------- doc/source/whatsnew/v3.0.0.rst | 1 - scripts/cibw_before_build.sh | 8 ++++++++ 4 files changed, 25 insertions(+), 9 deletions(-) mode change 100644 => 100755 scripts/cibw_before_build.sh diff --git a/doc/source/whatsnew/v2.2.2.rst b/doc/source/whatsnew/v2.2.2.rst index 72a2f84c4aaee..fbe5e9b4febb5 100644 --- a/doc/source/whatsnew/v2.2.2.rst +++ b/doc/source/whatsnew/v2.2.2.rst @@ -56,4 +56,4 @@ Other Contributors ~~~~~~~~~~~~ -.. contributors:: v2.2.1..v2.2.2|HEAD +.. contributors:: v2.2.1..v2.2.2 diff --git a/doc/source/whatsnew/v2.2.3.rst b/doc/source/whatsnew/v2.2.3.rst index aa6e241e74b0a..1696a7b6449af 100644 --- a/doc/source/whatsnew/v2.2.3.rst +++ b/doc/source/whatsnew/v2.2.3.rst @@ -1,6 +1,6 @@ .. _whatsnew_223: -What's new in 2.2.3 (September XX, 2024) +What's new in 2.2.3 (September 20, 2024) ---------------------------------------- These are the changes in pandas 2.2.3. See :ref:`release` for a full changelog @@ -9,28 +9,37 @@ including other versions of pandas. {{ header }} .. --------------------------------------------------------------------------- -.. _whatsnew_223.regressions: -Fixed regressions -~~~~~~~~~~~~~~~~~ -- +.. _whatsnew_220.py13_compat: + +Pandas 2.2.3 is now compatible with Python 3.13 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Pandas 2.2.3 is the first version of pandas that is generally compatible with the upcoming +Python 3.13, and both wheels for free-threaded and normal Python 3.13 will be uploaded for +this release. + +As usual please report any bugs discovered to our `issue tracker `_ .. --------------------------------------------------------------------------- .. _whatsnew_223.bug_fixes: Bug fixes ~~~~~~~~~ -- +- Bug in :func:`eval` on :class:`complex` including division ``/`` discards imaginary part. (:issue:`21374`) +- Minor fixes for numpy 2.1 compatibility. (:issue:`59444`) .. --------------------------------------------------------------------------- .. _whatsnew_223.other: Other ~~~~~ -- +- Missing licenses for 3rd party dependencies were added back into the wheels. (:issue:`58632`) .. --------------------------------------------------------------------------- .. _whatsnew_223.contributors: Contributors ~~~~~~~~~~~~ + +.. contributors:: v2.2.2..v2.2.3|HEAD diff --git a/doc/source/whatsnew/v3.0.0.rst b/doc/source/whatsnew/v3.0.0.rst index 89a1c388b3ba1..c2a56afbc580e 100644 --- a/doc/source/whatsnew/v3.0.0.rst +++ b/doc/source/whatsnew/v3.0.0.rst @@ -693,7 +693,6 @@ Other ^^^^^ - Bug in :class:`DataFrame` when passing a ``dict`` with a NA scalar and ``columns`` that would always return ``np.nan`` (:issue:`57205`) - Bug in :func:`eval` on :class:`ExtensionArray` on including division ``/`` failed with a ``TypeError``. (:issue:`58748`) -- Bug in :func:`eval` on :class:`complex` including division ``/`` discards imaginary part. (:issue:`21374`) - Bug in :func:`eval` where the names of the :class:`Series` were not preserved when using ``engine="numexpr"``. (:issue:`10239`) - Bug in :func:`unique` on :class:`Index` not always returning :class:`Index` (:issue:`57043`) - Bug in :meth:`DataFrame.apply` where passing ``engine="numba"`` ignored ``args`` passed to the applied function (:issue:`58712`) diff --git a/scripts/cibw_before_build.sh b/scripts/cibw_before_build.sh old mode 100644 new mode 100755 index f3049b27ed5d1..9a36fc01586ba --- a/scripts/cibw_before_build.sh +++ b/scripts/cibw_before_build.sh @@ -1,3 +1,11 @@ +# Add 3rd party licenses, like numpy does + +PROJECT_DIR="${1:-$PWD}" + +for file in $PROJECT_DIR/LICENSES/*; do + cat $file >> $PROJECT_DIR/LICENSE +done + # TODO: Delete when there's PyPI NumPy/Cython releases the support Python 3.13. # If free-threading support is not included in those releases, this script will have # to whether this runs for a free-threaded build instead. From 963c86d415515b0cf6963cfd0c0746c95e303cfd Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:31:33 -0400 Subject: [PATCH 2/5] change back perms --- scripts/cibw_before_build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 scripts/cibw_before_build.sh diff --git a/scripts/cibw_before_build.sh b/scripts/cibw_before_build.sh old mode 100755 new mode 100644 From ef70754b283e2b67ef8dc0772e38c278fe44c61d Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:29:40 -0400 Subject: [PATCH 3/5] debug --- scripts/cibw_before_build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/cibw_before_build.sh b/scripts/cibw_before_build.sh index 9a36fc01586ba..f28b1ec41ed5f 100644 --- a/scripts/cibw_before_build.sh +++ b/scripts/cibw_before_build.sh @@ -2,6 +2,9 @@ PROJECT_DIR="${1:-$PWD}" +ls $PROJECT_DIR/LICENSES/* +ls . + for file in $PROJECT_DIR/LICENSES/*; do cat $file >> $PROJECT_DIR/LICENSE done From c3bb57f197154013efb293c1d8071bd6c5972bd1 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:41:02 -0400 Subject: [PATCH 4/5] try to fix license addition --- pyproject.toml | 2 +- scripts/cibw_before_build.sh | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5ffd9d9a5608c..d0fcdc4b21b33 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -156,7 +156,7 @@ test-command = """ pd.test(extra_args=["-m not clipboard and single_cpu and not slow and not network and not db", "--no-strict-data-files"]);' \ """ free-threaded-support = true -before-build = "bash {package}/scripts/cibw_before_build.sh" +before-build = "PACKAGE_DIR={package} bash {package}/scripts/cibw_before_build.sh" [tool.cibuildwheel.windows] before-build = "pip install delvewheel && bash {package}/scripts/cibw_before_build.sh" diff --git a/scripts/cibw_before_build.sh b/scripts/cibw_before_build.sh index d55ffb5ee3319..679b91e3280ec 100644 --- a/scripts/cibw_before_build.sh +++ b/scripts/cibw_before_build.sh @@ -1,12 +1,6 @@ # Add 3rd party licenses, like numpy does - -PROJECT_DIR="${1:-$PWD}" - -ls $PROJECT_DIR/LICENSES/* -ls . - -for file in $PROJECT_DIR/LICENSES/*; do - cat $file >> $PROJECT_DIR/LICENSE +for file in $PACKAGE_DIR/LICENSES/*; do + cat $file >> $PACKAGE_DIR/LICENSE done # TODO: Delete when there's a PyPI Cython release that supports free-threaded Python 3.13. From da46614b524f944364c153bd95e484ea2acb9062 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:44:21 -0400 Subject: [PATCH 5/5] silence stable version warning? --- doc/source/conf.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 77dd5d03d311c..ddbda0aa3bf65 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -254,7 +254,9 @@ "json_url": "https://pandas.pydata.org/versions.json", "version_match": switcher_version, }, - "show_version_warning_banner": True, + # This shows a warning for patch releases since the + # patch version doesn't compare as equal (e.g. 2.2.1 != 2.2.0 but it should be) + "show_version_warning_banner": False, "icon_links": [ { "name": "Mastodon",