From 53b4382f6b777ae86d9ecada2b022533705a0348 Mon Sep 17 00:00:00 2001 From: Rob Buckley <20515024+robbuckley@users.noreply.github.com> Date: Fri, 14 Jun 2019 21:57:36 +0100 Subject: [PATCH 1/3] BLD: fix build error for PyPy (#26536) --- setup.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 4579bbfa59797..210b3949093db 100755 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ import pkg_resources import platform -from distutils.sysconfig import get_config_var +from distutils.sysconfig import get_config_vars import sys import shutil from distutils.version import LooseVersion @@ -442,19 +442,19 @@ def run(self): if debugging_symbols_requested: extra_compile_args.append('-g') -# For mac, ensure extensions are built for macos 10.9 when compiling on a -# 10.9 system or above, overriding distuitls behaviour which is to target -# the version that python was built for. This may be overridden by setting -# MACOSX_DEPLOYMENT_TARGET before calling setup.py +# For mac, ensure extensions are built for at least macOS 10.9 when compiling +# on a 10.9 system or above, overriding CPython distuitls behaviour which is +# to target the version that python was built for. This may be overridden by +# setting MACOSX_DEPLOYMENT_TARGET before calling setup.py if is_platform_mac(): if 'MACOSX_DEPLOYMENT_TARGET' not in os.environ: - current_system = LooseVersion(platform.mac_ver()[0]) - python_target = LooseVersion( - get_config_var('MACOSX_DEPLOYMENT_TARGET')) - if python_target < '10.9' and current_system >= '10.9': + current_system = platform.mac_ver()[0] + python_target = \ + get_config_vars().get('MACOSX_DEPLOYMENT_TARGET', current_system) + if LooseVersion(python_target) < '10.9' and \ + LooseVersion(current_system) >= '10.9': os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.9' - # enable coverage by building cython files by setting the environment variable # "PANDAS_CYTHON_COVERAGE" (with a Truthy value) or by running build_ext # with `--with-cython-coverage`enabled From 32024098f70137f7abdfd6f2f7479f236ab944b7 Mon Sep 17 00:00:00 2001 From: Rob Buckley <20515024+robbuckley@users.noreply.github.com> Date: Sun, 16 Jun 2019 21:06:36 +0100 Subject: [PATCH 2/3] fix line-splitting style --- setup.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 210b3949093db..389e8553eb3a3 100755 --- a/setup.py +++ b/setup.py @@ -442,17 +442,17 @@ def run(self): if debugging_symbols_requested: extra_compile_args.append('-g') -# For mac, ensure extensions are built for at least macOS 10.9 when compiling -# on a 10.9 system or above, overriding CPython distuitls behaviour which is -# to target the version that python was built for. This may be overridden by -# setting MACOSX_DEPLOYMENT_TARGET before calling setup.py +# Build for at least macOS 10.9 when compiling on a 10.9 system or above, +# overriding CPython distuitls behaviour which is to target the version that +# python was built for. This may be overridden by setting +# MACOSX_DEPLOYMENT_TARGET before calling setup.py if is_platform_mac(): if 'MACOSX_DEPLOYMENT_TARGET' not in os.environ: current_system = platform.mac_ver()[0] - python_target = \ - get_config_vars().get('MACOSX_DEPLOYMENT_TARGET', current_system) - if LooseVersion(python_target) < '10.9' and \ - LooseVersion(current_system) >= '10.9': + python_target = get_config_vars().get('MACOSX_DEPLOYMENT_TARGET', + current_system) + if (LooseVersion(python_target) < '10.9' and + LooseVersion(current_system) >= '10.9'): os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.9' # enable coverage by building cython files by setting the environment variable From 1398e304d4abaf8fa8373593860ea7b13ab77859 Mon Sep 17 00:00:00 2001 From: Rob Buckley <20515024+robbuckley@users.noreply.github.com> Date: Sun, 16 Jun 2019 21:18:00 +0100 Subject: [PATCH 3/3] whatsnew entry --- doc/source/whatsnew/v0.25.0.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/source/whatsnew/v0.25.0.rst b/doc/source/whatsnew/v0.25.0.rst index 207d16afd350f..27d0460dfd93c 100644 --- a/doc/source/whatsnew/v0.25.0.rst +++ b/doc/source/whatsnew/v0.25.0.rst @@ -736,6 +736,11 @@ Sparse - Bug in :class:`SparseDataFrame` when adding a column in which the length of values does not match length of index, ``AssertionError`` is raised instead of raising ``ValueError`` (:issue:`25484`) - Introduce a better error message in :meth:`Series.sparse.from_coo` so it returns a ``TypeError`` for inputs that are not coo matrices (:issue:`26554`) +Build Changes +^^^^^^^^^^^^^ + +- Fix install error with PyPy on macOS (:issue:`26536`) + Other ^^^^^