Trac #30899: igraph, python-igraph: Update to 0.8.3

(from #30611) Released Oct 8, 2020. https://igraph.org/ the previous update was in #27597, where we also disabled blas/lapack inteface; perhaps it can make a comeback here. This ticket also adds package `texttable` version 1.6.3, a dependency of `python_igraph`. ---- source tarballs: see `checksums.ini` URL: https://trac.sagemath.org/30899 Reported by: mkoeppe Ticket author(s): David Coudert, Dima Pasechnik Reviewer(s): Dima Pasechnik, Matthias Koeppe
sagemath · Nov 22, 2020 · 3a662d4 · 3a662d4
2 parents 5b01884 + 938d704
commit 3a662d4
Show file tree

Hide file tree

Showing 23 changed files with 77 additions and 18 deletions.
diff --git a/build/pkgs/igraph/checksums.ini b/build/pkgs/igraph/checksums.ini
@@ -1,4 +1,5 @@
 tarball=igraph-VERSION.tar.gz
-sha1=0ee15880b8f753c3e1ed40f59e3a57b03da2771e
-md5=a4d5801653ce64630dea864230927258
-cksum=786980360
+sha1=754908e45b31883107b802470779310cbb7c64d4
+md5=b063648d9a0a8de11b3fa886837f1819
+cksum=3580664179
+upstream_url=https://github.com/igraph/igraph/releases/download/VERSION/igraph-VERSION.tar.gz
diff --git a/build/pkgs/igraph/dependencies b/build/pkgs/igraph/dependencies
@@ -1,4 +1,4 @@
-$(MP_LIBRARY) glpk
+$(MP_LIBRARY) glpk $(BLAS)
 
 ----------
 All lines of this file are ignored except the first.

diff --git a/build/pkgs/igraph/distros/arch.txt b/build/pkgs/igraph/distros/arch.txt
@@ -0,0 +1 @@
+igraph
diff --git a/build/pkgs/igraph/distros/conda.txt b/build/pkgs/igraph/distros/conda.txt
@@ -0,0 +1 @@
+igraph
diff --git a/build/pkgs/igraph/distros/debian.txt b/build/pkgs/igraph/distros/debian.txt
@@ -0,0 +1 @@
+libigraph-dev
diff --git a/build/pkgs/igraph/distros/fedora.txt b/build/pkgs/igraph/distros/fedora.txt
@@ -0,0 +1 @@
+igraph igraph-devel
diff --git a/build/pkgs/igraph/distros/freebsd.txt b/build/pkgs/igraph/distros/freebsd.txt
@@ -0,0 +1 @@
+math/igraph
diff --git a/build/pkgs/igraph/distros/gentoo.txt b/build/pkgs/igraph/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-libs/igraph
diff --git a/build/pkgs/igraph/distros/homebrew.txt b/build/pkgs/igraph/distros/homebrew.txt
@@ -0,0 +1 @@
+igraph
diff --git a/build/pkgs/igraph/package-version.txt b/build/pkgs/igraph/package-version.txt
@@ -1 +1 @@
-0.7.1999.p0
+0.8.3
diff --git a/build/pkgs/igraph/spkg-configure.m4 b/build/pkgs/igraph/spkg-configure.m4
@@ -0,0 +1,8 @@
+SAGE_SPKG_CONFIGURE([igraph], [
+SAGE_SPKG_DEPCHECK([glpk atlas openblas gmp mpir], [
+    dnl check for igraph with pkg-config
+    PKG_CHECK_MODULES([IGRAPH], [igraph >= 0.8.3], [], [
+        sage_spkg_install_igraph=yes])
+    ])
+])
+
diff --git a/build/pkgs/igraph/spkg-install.in b/build/pkgs/igraph/spkg-install.in
@@ -1,10 +1,11 @@
-if gcc -lxml2 2>&1 | grep -q 'cannot find -lxml2'; then
+if `pkg-config --modversion libxml-2.0`; then
     echo "
 You need libxml2 to run igraph. On Ubuntu and Debian Linux, installing the build-essential and the libxml2-dev packages is sufficient."
     exit 1
 fi
 
+export CFLAGS="$CFLAGS -Wno-strict-prototypes -Wno-implicit-function-declaration"
 cd src
-sdh_configure --with-external-glpk
+sdh_configure --with-external-blas --with-external-lapack --with-external-glpk
 sdh_make
 sdh_make_install -j1
diff --git a/build/pkgs/python_igraph/checksums.ini b/build/pkgs/python_igraph/checksums.ini
@@ -1,4 +1,5 @@
-tarball=python_igraph-VERSION.tar.gz
-sha1=543d2d10986474c8394d60d2e344299d6ca00bdd
-md5=02b58ecc78d9f70074e2320cb4641983
-cksum=1980817637
+tarball=python-igraph-VERSION.tar.gz
+sha1=c54c5f5b533979f93172b75e422508973e6a4f54
+md5=dcc3b722a9772b43a769940815c501f7
+cksum=794576917
+upstream_url=https://github.com/igraph/python-igraph/releases/download/VERSION/python-igraph-VERSION.tar.gz
diff --git a/build/pkgs/python_igraph/dependencies b/build/pkgs/python_igraph/dependencies
@@ -1,4 +1,4 @@
-igraph $(PYTHON) | $(PYTHON_TOOLCHAIN)
+igraph texttable $(PYTHON) | $(PYTHON_TOOLCHAIN)
 
 ----------
 All lines of this file are ignored except the first.

diff --git a/build/pkgs/python_igraph/package-version.txt b/build/pkgs/python_igraph/package-version.txt
@@ -1 +1 @@
-0.7.1999
+0.8.3
diff --git a/build/pkgs/python_igraph/spkg-install.in b/build/pkgs/python_igraph/spkg-install.in
@@ -1,8 +1,6 @@
 cd src
 
-sdh_pip_install .
+sage-python23 setup.py bdist_wheel \
+       --use-pkg-config || sdh_die "Error building wheel for python_igraph"
 
-if [ $? -ne 0 ]; then
-    echo >&2 "Error installing python_igraph."
-    exit 1
-fi
+sdh_store_and_pip_install_wheel .
diff --git a/build/pkgs/texttable/SPKG.rst b/build/pkgs/texttable/SPKG.rst
@@ -0,0 +1,28 @@
+
+texttable
+=============
+
+Description
+-----------
+
+Python module for creating simple ASCII tables
+
+License
+-------
+
+MIT License (MIT)
+
+
+Upstream Contact
+----------------
+
+https://github.com/foutaise/texttable/
+
+Dependencies
+------------
+
+-  python
+
+
+Special Update/Build Instructions
+---------------------------------
diff --git a/build/pkgs/texttable/checksums.ini b/build/pkgs/texttable/checksums.ini
@@ -0,0 +1,5 @@
+tarball=texttable-VERSION.tar.gz
+sha1=0b345a86669730f204804916e439820d06321223
+md5=68e6b31d36f5c20221da7d5db3eca772
+cksum=3865027881
+upstream_url=https://pypi.io/packages/source/t/texttable/texttable-VERSION.tar.gz
diff --git a/build/pkgs/texttable/dependencies b/build/pkgs/texttable/dependencies
@@ -0,0 +1,4 @@
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
diff --git a/build/pkgs/texttable/package-version.txt b/build/pkgs/texttable/package-version.txt
@@ -0,0 +1 @@
+1.6.3
diff --git a/build/pkgs/texttable/spkg-check.in b/build/pkgs/texttable/spkg-check.in
@@ -0,0 +1,2 @@
+cd src
+sage-python23 setup.py
diff --git a/build/pkgs/texttable/spkg-install.in b/build/pkgs/texttable/spkg-install.in
@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .
diff --git a/build/pkgs/texttable/type b/build/pkgs/texttable/type
@@ -0,0 +1 @@
+optional