From c1786e76dc659ffc3e925863d45fafcb150cf18c Mon Sep 17 00:00:00 2001 From: Keith Bourgoin Date: Thu, 27 May 2021 11:01:37 -0400 Subject: [PATCH 1/3] arm64 requires 1.20.0 or above --- setup.cfg | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 308d321..ad41459 100644 --- a/setup.cfg +++ b/setup.cfg @@ -39,12 +39,16 @@ install_requires = numpy==1.13.3; python_version=='3.5' and platform_machine!='aarch64' and platform_system!='AIX' numpy==1.13.3; python_version=='3.6' and platform_machine!='aarch64' and platform_system!='AIX' and platform_python_implementation != 'PyPy' numpy==1.14.5; python_version=='3.7' and platform_machine!='aarch64' and platform_system!='AIX' and platform_python_implementation != 'PyPy' - numpy==1.17.3; python_version=='3.8' and platform_machine!='aarch64' and platform_python_implementation != 'PyPy' - numpy==1.19.3; python_version=='3.9' and platform_python_implementation != 'PyPy' + numpy==1.17.3; python_version=='3.8' and platform_machine!='arm64'and platform_machine!='aarch64' and platform_python_implementation != 'PyPy' + numpy==1.19.3; python_version=='3.9' and platform_machine!='arm64'and platform_python_implementation != 'PyPy' numpy==1.19.0; python_version=='3.6' and platform_python_implementation=='PyPy' numpy==1.20.0; python_version=='3.7' and platform_python_implementation=='PyPy' + # arm64 supports Python 3.8 and above requires numpy>=1.20.0 + numpy==1.20.0; python_version=='3.8' and platform_machine=='arm64' + numpy==1.20.0; python_version=='3.9' and platform_machine=='arm64' + # For Python versions which aren't yet officially supported, # we specify an unpinned Numpy which allows source distributions # to be used and allows wheels to be used as soon as they From c239b6ccec837b04a84708aa7a913baac248ac0e Mon Sep 17 00:00:00 2001 From: Keith Bourgoin Date: Fri, 28 May 2021 10:35:53 -0400 Subject: [PATCH 2/3] Make this more specific and rearrange things. --- setup.cfg | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.cfg b/setup.cfg index ad41459..7eac8ba 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,20 +35,20 @@ install_requires = numpy==1.19.2; python_version=='3.7' and platform_machine=='aarch64' numpy==1.19.2; python_version=='3.8' and platform_machine=='aarch64' + # arm64 on Darwin supports Python 3.8 and above requires numpy>=1.20.0 + numpy==1.20.0; python_version=='3.8' and platform_machine=='arm64' + numpy==1.20.0; python_version=='3.9' and platform_machine=='arm64' + # default numpy requirements numpy==1.13.3; python_version=='3.5' and platform_machine!='aarch64' and platform_system!='AIX' numpy==1.13.3; python_version=='3.6' and platform_machine!='aarch64' and platform_system!='AIX' and platform_python_implementation != 'PyPy' numpy==1.14.5; python_version=='3.7' and platform_machine!='aarch64' and platform_system!='AIX' and platform_python_implementation != 'PyPy' - numpy==1.17.3; python_version=='3.8' and platform_machine!='arm64'and platform_machine!='aarch64' and platform_python_implementation != 'PyPy' - numpy==1.19.3; python_version=='3.9' and platform_machine!='arm64'and platform_python_implementation != 'PyPy' + numpy==1.17.3; python_version=='3.8' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_machine!='aarch64' and platform_python_implementation != 'PyPy' + numpy==1.19.3; python_version=='3.9' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_python_implementation != 'PyPy' numpy==1.19.0; python_version=='3.6' and platform_python_implementation=='PyPy' numpy==1.20.0; python_version=='3.7' and platform_python_implementation=='PyPy' - # arm64 supports Python 3.8 and above requires numpy>=1.20.0 - numpy==1.20.0; python_version=='3.8' and platform_machine=='arm64' - numpy==1.20.0; python_version=='3.9' and platform_machine=='arm64' - # For Python versions which aren't yet officially supported, # we specify an unpinned Numpy which allows source distributions # to be used and allows wheels to be used as soon as they From 784655864c734fb53ca8199040d56d7d94695937 Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Sat, 29 May 2021 20:00:34 +0200 Subject: [PATCH 3/3] Add platform_system=='Darwin' to the macOS M1 cases --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 7eac8ba..840860f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,8 +36,8 @@ install_requires = numpy==1.19.2; python_version=='3.8' and platform_machine=='aarch64' # arm64 on Darwin supports Python 3.8 and above requires numpy>=1.20.0 - numpy==1.20.0; python_version=='3.8' and platform_machine=='arm64' - numpy==1.20.0; python_version=='3.9' and platform_machine=='arm64' + numpy==1.20.0; python_version=='3.8' and platform_machine=='arm64' and platform_system=='Darwin' + numpy==1.20.0; python_version=='3.9' and platform_machine=='arm64' and platform_system=='Darwin' # default numpy requirements numpy==1.13.3; python_version=='3.5' and platform_machine!='aarch64' and platform_system!='AIX'