From 2534f5a2ee5493d9a53216792f8204d0c86e7039 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 30 Jun 2022 13:30:03 -0700 Subject: [PATCH] build/pkgs/numpy/patches/21891.patch: New --- build/pkgs/numpy/patches/21891.patch | 31 ++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 build/pkgs/numpy/patches/21891.patch diff --git a/build/pkgs/numpy/patches/21891.patch b/build/pkgs/numpy/patches/21891.patch new file mode 100644 index 00000000000..095fa894ebb --- /dev/null +++ b/build/pkgs/numpy/patches/21891.patch @@ -0,0 +1,31 @@ +From c7894260aaf36c447dd091bf622c7c2bcdb15a28 Mon Sep 17 00:00:00 2001 +From: Matthias Koeppe +Date: Thu, 30 Jun 2022 13:18:46 -0700 +Subject: [PATCH] setup.py: Remove check for SETUPTOOLS_USE_DISTUTILS + +--- + setup.py | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/setup.py b/setup.py +index 353b6c09693..2bc70173eca 100755 +--- a/setup.py ++++ b/setup.py +@@ -85,17 +85,6 @@ + # so that it is in sys.modules + import numpy.distutils.command.sdist + import setuptools +-if int(setuptools.__version__.split('.')[0]) >= 60: +- # setuptools >= 60 switches to vendored distutils by default; this +- # may break the numpy build, so make sure the stdlib version is used +- try: +- setuptools_use_distutils = os.environ['SETUPTOOLS_USE_DISTUTILS'] +- except KeyError: +- os.environ['SETUPTOOLS_USE_DISTUTILS'] = "stdlib" +- else: +- if setuptools_use_distutils != "stdlib": +- raise RuntimeError("setuptools versions >= '60.0.0' require " +- "SETUPTOOLS_USE_DISTUTILS=stdlib in the environment") + + # Initialize cmdclass from versioneer + from numpy.distutils.core import numpy_cmdclass