Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
mkoeppe committed Jul 10, 2022
2 parents 6e09d4d + 2534f5a commit fd31566
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 20 deletions.
6 changes: 3 additions & 3 deletions build/pkgs/gast/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=gast-VERSION.tar.gz
sha1=99491544f561ef76523e6f29a621ce633fc7a1c1
md5=eb2489df0c85ae198e4740e5711c7299
cksum=307283150
sha1=a84811eedebc5bca94b4eae978aab5f2c805b106
md5=fdff900805e03e9dd76d377eb4cbaed7
cksum=387443419
upstream_url=https://pypi.io/packages/source/g/gast/gast-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/gast/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.2
0.5.3
6 changes: 3 additions & 3 deletions build/pkgs/networkx/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=networkx-VERSION.tar.gz
sha1=659f640c03fe52c98fa7a1d03fe3a6f6bbce2015
md5=407eb28c54e08725559754ca7ab185e0
cksum=3378468789
sha1=757ea87972243f1dab99687cd94ed51377efa34b
md5=91fdb77298a54c6e7cfb2d5305d23d23
cksum=2430190254
upstream_url=https://pypi.io/packages/source/n/networkx/networkx-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/networkx/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.3
2.8.4
6 changes: 3 additions & 3 deletions build/pkgs/numpy/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=numpy-VERSION.zip
sha1=91a1faeb617601453ebf6e2855e5ce6bf94d3588
md5=b3c4477a027d5b6fba5e1065064fd076
cksum=1917168823
sha1=3ac08064b2ec8db8fe4870c2545c9d154f46bb30
md5=b44849506fbb54cdef9dbb435b2b1987
cksum=735479084
upstream_url=https://pypi.io/packages/source/n/numpy/numpy-VERSION.zip
2 changes: 1 addition & 1 deletion build/pkgs/numpy/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.4
1.22.4
31 changes: 31 additions & 0 deletions build/pkgs/numpy/patches/21891.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From c7894260aaf36c447dd091bf622c7c2bcdb15a28 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
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
10 changes: 10 additions & 0 deletions build/pkgs/numpy/spkg-install.in
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@ else
export NUMPY_FCONFIG
fi

# Trac #32423: Fix 32-bit builds on x86_64
ARCH=$($CC -dumpmachine 2>/dev/null || echo unknown)
case "$ARCH" in
*x86_64*)
;;
*)
export NPY_DISABLE_SVML=1
;;
esac

################################################

# Trac #33138: numpy is a PEP 517 package, so the crucial "--build-option"s would be ignored.
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/pybind11/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=pybind11-VERSION.tar.gz
sha1=2f15bd2037e91adc14fa1d648e6091acd114ed97
md5=2fb29e67a2158f80d2038ba619847629
cksum=2184277382
sha1=cee2f3c7879783bb5f021c7db332f8a290fe3763
md5=c232928479f398693bface2731387691
cksum=3770559962
upstream_url=https://pypi.io/packages/source/p/pybind11/pybind11-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/pybind11/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8.1
2.9.2
6 changes: 3 additions & 3 deletions build/pkgs/scipy/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=scipy-VERSION.tar.gz
sha1=4667454b1ee5195b8c104a68e15ab7f9aa0570fd
md5=daae4fedcd479738e54fd7035445be89
cksum=2230241814
sha1=6dfee9fe5f021409b4d294b0a7d9da05b810d207
md5=df5ce79288fc457238aeef18e8f70dfc
cksum=3909760197
upstream_url=https://pypi.io/packages/source/s/scipy/scipy-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/scipy/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.3
1.8.1

0 comments on commit fd31566

Please sign in to comment.