1.0.0

2 files changed, 130 insertions, 82 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ffedfc44e5c..9e1e4d594375 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-scipy-mkl
-	pkgdesc = SciPy is open-source software for mathematics, science, and engineering. Compiled with intel MKL
-	pkgver = 0.19.1
+	pkgdesc = SciPy is open-source software for mathematics, science, and engineering.
+	pkgver = 1.0.0
 	pkgrel = 1
 	url = http://www.scipy.org/
 	arch = i686
@@ -8,21 +8,19 @@ pkgbase = python-scipy-mkl
 	license = BSD
 	checkdepends = python-nose
 	checkdepends = python2-nose
-	makedepends = intel-fortran-compiler
-	makedepends = intel-compiler-base
-	makedepends = intel-mkl
+	makedepends = gcc-fortran
 	makedepends = python-numpy
 	makedepends = python2-numpy
-	makedepends = swig
-	makedepends = cython
-	makedepends = cython2
-	source = https://github.com/scipy/scipy/archive/v0.19.1.tar.gz
-	sha256sums = ac268fe92edd149c6f52fa138d2a03877c080981d7944e96bab8ef68764f71cc
+	makedepends = python-setuptools
+	makedepends = python2-setuptools
+	source = https://github.com/scipy/scipy/releases/download/v1.0.0/scipy-1.0.0.tar.xz
+	sha256sums = 06b23f2a5db5418957facc86ead86b7752147c0461f3156f88a3da87f3dc6739
 
 pkgname = python-scipy-mkl
 	depends = python-numpy-mkl
 	depends = qhull
 	depends = python-nose
+	optdepends = python-pillow: for image saving module
 	provides = python3-scipy=${pkgver}
 	provides = python-scipy=${pkgver}
 	provides = scipy=${pkgver}
@@ -33,6 +31,8 @@ pkgname = python2-scipy-mkl
 	depends = python2-numpy-mkl
 	depends = qhull
 	depends = python2-nose
+	optdepends = python2-pillow: for image saving module
+	provides = python2-scipy=${pkgver}
 	provides = python2-scipy=${pkgver}
 	provides = scipy=${pkgver}
 	conflicts = python2-scipy
diff --git a/PKGBUILD b/PKGBUILD
index 6832f1aae3e5..32748cf467bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,96 +1,144 @@
-
-
-
-pkgbase="python-scipy-mkl"
-pkgname="python-scipy-mkl"
-true && pkgname=('python-scipy-mkl' 'python2-scipy-mkl')
-
-pkgver=0.19.1
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: Ray Rashif <schiv@archlinux.org>
+# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
+# Contributor: Bodor Dávid Gábor <david.gabor.bodor@gmail.com>
+# Contributor: Andrzej Giniewicz <gginiu@gmail.com>
+
+pkgname=('python-scipy-mkl' 'python2-scipy-mkl')
+pkgver=1.0.0
 pkgrel=1
-pkgdesc="SciPy is open-source software for mathematics, science, and engineering. Compiled with intel MKL"
+pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
 arch=('i686' 'x86_64')
 url="http://www.scipy.org/"
 license=('BSD')
-makedepends=('intel-fortran-compiler' 'intel-compiler-base' 'intel-mkl' 'python-numpy' 'python2-numpy' 'swig' 'cython' 'cython2')
+makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy' 'python-setuptools' 'python2-setuptools')
 checkdepends=('python-nose' 'python2-nose')
-source=("https://github.com/scipy/scipy/archive/v${pkgver}.tar.gz" )
-
-sha256sums=( 'ac268fe92edd149c6f52fa138d2a03877c080981d7944e96bab8ef68764f71cc' )
+source=("https://github.com/scipy/scipy/releases/download/v${pkgver}/scipy-${pkgver}.tar.xz")
+sha256sums=('06b23f2a5db5418957facc86ead86b7752147c0461f3156f88a3da87f3dc6739')
 
 build() {
-  unset LDFLAGS
-  unset FFLAGS
-  export LDFLAGS="" 
-  export FFLAGS="-fPIC -qopenmp -xHost"
-  
-  #mv scipy-0.18.1 scipy-0.18.1
-  
-  # Changing the arithmetic parameter (Thanks to Fabrizio Castellano)
-  #sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \
-  #  scipy-${pkgver}/scipy/special/cephes/mconf.h
+	export LDFLAGS="-Wall -shared"
+
+	# set by hand this flag if you want to compile with gcc
+	export force_gcc=false
+
+	if hash icc; then
+		export use_intel_cc=true
+		export use_gcc=false
+	else
+		export use_intel_cc=false
+		export use_gcc=true
+	fi
+
+	if [ "$force_gcc" = true ]; then
+		export use_intel_cc=false
+		export use_gcc=true
+	fi
+
+	if [ "$use_intel_cc" = true ]; then
+		export __INTEL_PRE_CFLAGS=" -D_Float128=__float128"
+	fi
+
+	# 2 builds
+	cp -r scipy-${pkgver} scipy-${pkgver}-py2
+
+	# build for python3
+	cd scipy-${pkgver}
+	if [ "$use_gcc" = true ]; then
+		python3 setup.py config_fc --fcompiler=gnu95 build
+	fi
+
+	if [ "$use_intel_cc" = true ]; then
+		export __INTEL_PRE_CFLAGS=" -D_Float128=__float128"
+		python3 setup.py config --compiler=intelem --fcompiler=intelem build_clib --compiler=intelem --fcompiler=intelem build_ext --compiler=intelem --fcompiler=intelem
+	fi
+
+	# build for python2
+	cd ../scipy-${pkgver}-py2
+
+	for file in $(find . -name '*.py' -print); do
+		sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
+		sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+	done
+
+	if [ "$use_gcc" = true ]; then
+		python2 setup.py config_fc --fcompiler=gnu95 build
+	fi
+
+	if [ "$use_intel_cc" = true ]; then
+		export __INTEL_PRE_CFLAGS=" -D_Float128=__float128"
+		python2 setup.py config --compiler=intelem --fcompiler=intelem build_clib --compiler=intelem --fcompiler=intelem build_ext --compiler=intelem --fcompiler=intelem
+	fi
 
-  
-  # 2 builds
-  cp -r scipy-${pkgver} scipy-${pkgver}-py2
-
-  # build for python3
-  cd scipy-${pkgver}
-  #patch -Np1   -i $srcdir/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch
-
-  #python setup.py build --fcompiler=intelem --compiler=intel
-  python setup.py config --compiler=intelem --fcompiler=intelem build_clib --compiler=intelem --fcompiler=intelem build_ext --compiler=intelem --fcompiler=intelem 
+}
 
+check() {
+	# we need to do a temp install so we can import scipy
+	# also, the tests must not be run from the scipy source directory
+	export LDFLAGS="-Wall -shared"
+
+	#   cd ${srcdir}/scipy-${pkgver}
+	#   python3 setup.py config_fc --fcompiler=gnu95 install \
+	#     --prefix=/usr --root=${srcdir}/test --optimize=1
+	#   export PYTHONPATH=${srcdir}/test/usr/lib/python3.6/site-packages
+	#   cd ${srcdir}
+	#   python -c "from scipy import test; test('full')"
+	#
+	#   cd ${srcdir}/scipy-${pkgver}-py2
+	#   python2 setup.py config_fc --fcompiler=gnu95 install \
+	#     --prefix=/usr --root=${srcdir}/test --optimize=1
+	#   export PYTHONPATH=${srcdir}/test/usr/lib/python2.7/site-packages
+	#   cd ${srcdir}
+	#   python2 -c "from scipy import test; test('full')"
+}
 
-  # build for python2
-  cd ../scipy-${pkgver}-py2
+package_python-scipy-mkl() {
 
-  for file in $(find . -name '*.py' -print); do
-       sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-       sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
+	depends=('python-numpy-mkl' 'qhull' 'python-nose')
+	provides=('python3-scipy=${pkgver}' 'python-scipy=${pkgver}' 'scipy=${pkgver}')
+	replaces=('python-scipy')
+	conflicts=('python-scipy')
+	optdepends=('python-pillow: for image saving module')
 
-  #python2 setup.py build --fcompiler=intelem --compiler=intel
-  python2 setup.py config --compiler=intelem --fcompiler=intelem build_clib --compiler=intelem --fcompiler=intelem build_ext --compiler=intelem --fcompiler=intelem 
+	cd scipy-${pkgver}
+	export LDFLAGS="-Wall -shared"
 
-}
+	if [ "$use_gcc" = true ]; then
+		python3 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root=${pkgdir} --optimize=1
+	fi
 
-check() {
-  cd scipy-${pkgver}
-# figure out how to run tests in the source tree easily
-#  python -c "from scipy import test; test('full')"
+	if [ "$use_intel_cc" = true ]; then
+		export __INTEL_PRE_CFLAGS=" -D_Float128=__float128"
+		python3 setup.py config_fc --fcompiler=intel install --prefix=/usr --root=${pkgdir} --optimize=1
+	fi
 
-  cd ../scipy-${pkgver}-py2
-# figure out how to run tests in the source tree easily
-#  python2 -c "from scipy import test; test('full')"
+	install -Dm644 LICENSE.txt \
+		"${pkgdir}/usr/share/licenses/python-scipy/LICENSE"
 }
 
 package_python2-scipy-mkl() {
-  depends=('python2-numpy-mkl' 'qhull' 'python2-nose' )
-  provides=('python2-scipy=${pkgver}' 'scipy=${pkgver}')
-  replaces=('python2-scipy')
-  conflicts=('python2-scipy')
 
-  cd scipy-${pkgver}-py2
+	depends=('python2-numpy-mkl' 'qhull' 'python2-nose')
+	provides=('python2-scipy=${pkgver}' 'python2-scipy=${pkgver}' 'scipy=${pkgver}')
+	replaces=('python2-scipy')
+	conflicts=('python2-scipy')
+	optdepends=('python2-pillow: for image saving module')
 
-  python2 setup.py config_fc --fcompiler=intel install \
-    --prefix=/usr --root=${pkgdir} --optimize=1
+	cd scipy-${pkgver}-py2
+	export LDFLAGS="-Wall -shared"
 
-  install -Dm644 LICENSE.txt \
-    "${pkgdir}/usr/share/licenses/python2-scipy/LICENSE"
-}
+	if [ "$use_gcc" = true ]; then
+		python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root=${pkgdir} --optimize=1
+	fi
 
-package_python-scipy-mkl() {
-  depends=('python-numpy-mkl' 'qhull' 'python-nose')
-  provides=('python3-scipy=${pkgver}' 'python-scipy=${pkgver}' 'scipy=${pkgver}')
-  replaces=('python-scipy')
-  conflicts=('python-scipy')
-  
-
-  cd scipy-${pkgver}
+	if [ "$use_intel_cc" = true ]; then
+		export __INTEL_PRE_CFLAGS=" -D_Float128=__float128"
+		python2 setup.py config_fc --fcompiler=intel install --prefix=/usr --root=${pkgdir} --optimize=1
+	fi
 
-  python setup.py config_fc --fcompiler=intel install \
-    --prefix=/usr --root=${pkgdir} --optimize=1
-
-  install -Dm644 LICENSE.txt \
-    "${pkgdir}/usr/share/licenses/python-scipy/LICENSE"
+	install -Dm644 LICENSE.txt \
+		"${pkgdir}/usr/share/licenses/python2-scipy/LICENSE"
 }
+
+# vim:set ts=2 sw=2 et: