From 8cb7557ca22917d46dba75161a9dd372fbcb43db Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 9 Jun 2020 09:28:50 -0500 Subject: [PATCH 1/4] BLD: pyproject.toml for Py38 Closes https://github.com/pandas-dev/pandas/issues/34666 --- doc/source/whatsnew/v1.1.0.rst | 1 + pyproject.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/source/whatsnew/v1.1.0.rst b/doc/source/whatsnew/v1.1.0.rst index 2243790a663df..c4797efc309be 100644 --- a/doc/source/whatsnew/v1.1.0.rst +++ b/doc/source/whatsnew/v1.1.0.rst @@ -1050,6 +1050,7 @@ Other - Bug in :meth:`DataFrame.plot.scatter` caused an error when plotting variable marker sizes (:issue:`32904`) - :class:`IntegerArray` now implements the ``sum`` operation (:issue:`33172`) - Bug in :class:`Tick` comparisons raising ``TypeError`` when comparing against timedelta-like objects (:issue:`34088`) +- Fixed building from source with Python 3.8 fetching the wrong version of NumPy (:issue:`34666`) - Bug in :class:`Tick` multiplication raising ``TypeError`` when multiplying by a float (:issue:`34486`) .. --------------------------------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index efeb24edbdeb1..ed66e116b988a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,6 +9,7 @@ requires = [ "numpy==1.15.4; python_version>='3.7' and platform_system!='AIX'", "numpy==1.16.0; python_version=='3.6' and platform_system=='AIX'", "numpy==1.16.0; python_version>='3.7' and platform_system=='AIX'", + "numpy==1.17.3; python_version>='3.8' and platform_system=='AIX'", ] [tool.black] From 8406965145a8f20fb4efedcacd9e376769052759 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 9 Jun 2020 09:47:25 -0500 Subject: [PATCH 2/4] move note --- doc/source/whatsnew/v1.0.5.rst | 3 ++- doc/source/whatsnew/v1.1.0.rst | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/whatsnew/v1.0.5.rst b/doc/source/whatsnew/v1.0.5.rst index 1edc7e1cad72f..5dbc911407784 100644 --- a/doc/source/whatsnew/v1.0.5.rst +++ b/doc/source/whatsnew/v1.0.5.rst @@ -22,7 +22,8 @@ Fixed regressions Bug fixes ~~~~~~~~~ -- + +- Fixed building from source with Python 3.8 fetching the wrong version of NumPy (:issue:`34666`) - Contributors diff --git a/doc/source/whatsnew/v1.1.0.rst b/doc/source/whatsnew/v1.1.0.rst index c4797efc309be..2243790a663df 100644 --- a/doc/source/whatsnew/v1.1.0.rst +++ b/doc/source/whatsnew/v1.1.0.rst @@ -1050,7 +1050,6 @@ Other - Bug in :meth:`DataFrame.plot.scatter` caused an error when plotting variable marker sizes (:issue:`32904`) - :class:`IntegerArray` now implements the ``sum`` operation (:issue:`33172`) - Bug in :class:`Tick` comparisons raising ``TypeError`` when comparing against timedelta-like objects (:issue:`34088`) -- Fixed building from source with Python 3.8 fetching the wrong version of NumPy (:issue:`34666`) - Bug in :class:`Tick` multiplication raising ``TypeError`` when multiplying by a float (:issue:`34486`) .. --------------------------------------------------------------------------- From 2f8686ef9382d6f492e02bc61024bffcb66ea7df Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 9 Jun 2020 09:48:37 -0500 Subject: [PATCH 3/4] add non-AIX --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index ed66e116b988a..6187ef1403fa6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,6 +7,7 @@ requires = [ "Cython>=0.29.16", # Note: sync with setup.py "numpy==1.15.4; python_version=='3.6' and platform_system!='AIX'", "numpy==1.15.4; python_version>='3.7' and platform_system!='AIX'", + "numpy==1.17.3; python_version>='3.8' and platform_system!='AIX'", "numpy==1.16.0; python_version=='3.6' and platform_system=='AIX'", "numpy==1.16.0; python_version>='3.7' and platform_system=='AIX'", "numpy==1.17.3; python_version>='3.8' and platform_system=='AIX'", From e0c98c8a6de4c19dca2c358b6b4f6451d1fe1c2b Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 9 Jun 2020 10:23:33 -0500 Subject: [PATCH 4/4] 3.7 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6187ef1403fa6..aaebcff8e4c1e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,10 +6,10 @@ requires = [ "wheel", "Cython>=0.29.16", # Note: sync with setup.py "numpy==1.15.4; python_version=='3.6' and platform_system!='AIX'", - "numpy==1.15.4; python_version>='3.7' and platform_system!='AIX'", + "numpy==1.15.4; python_version=='3.7' and platform_system!='AIX'", "numpy==1.17.3; python_version>='3.8' and platform_system!='AIX'", "numpy==1.16.0; python_version=='3.6' and platform_system=='AIX'", - "numpy==1.16.0; python_version>='3.7' and platform_system=='AIX'", + "numpy==1.16.0; python_version=='3.7' and platform_system=='AIX'", "numpy==1.17.3; python_version>='3.8' and platform_system=='AIX'", ]