v1.17.4, no python2 support

2 files changed, 10 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82f1c3cb8060..66d4ca0c4922 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,23 @@
 pkgbase = python-numpy-mkl
 	pkgdesc = Scientific tools for Python compiled with intel mkl
-	pkgver = 1.16.4
+	pkgver = 1.17.4
 	pkgrel = 1
 	url = http://numpy.scipy.org/
 	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
 	makedepends = intel-compiler-base
 	makedepends = intel-fortran-compiler
 	makedepends = cython
 	depends = intel-mkl
 	depends = python
-	depends = python2
 	options = staticlibs
-	source = https://github.com/numpy/numpy/archive/v1.16.4.tar.gz
+	source = https://github.com/numpy/numpy/archive/v1.17.4.tar.gz
 	source = site64.cfg
 	source = site32.cfg
 	source = intelccompiler.py.patch
-	sha256sums = 3bdabda4a2ac4f1986b4bc55f865cd0b68b71edc9420b03e911e0ee52743e9c4
+	sha256sums = SKIP
 	sha256sums = 86cd68a695a5e1d76f8e53cda70c888c4ed04349f15c8096d4492e346e7187e1
 	sha256sums = 882f2717deca0fd6a2e2384aac2dc7973c566f9cd2ba46777c3b5ffdffa814df
 	sha256sums = 0d185daf0f2fcab08778173f54cee86cd88dc3c6703413686ab3742c0097db4e
@@ -28,13 +26,6 @@ pkgname = python-numpy-mkl
 	depends = intel-mkl
 	depends = python
 	optdepends = python-pytest: testsuite
-	provides = python-numpy=1.16.4
+	provides = python-numpy=1.17.4
 	conflicts = python-numpy
 
-pkgname = python2-numpy-mkl
-	depends = intel-mkl
-	depends = python2
-	optdepends = python2-pytest: testsuite
-	provides = python2-numpy=1.16.4
-	conflicts = python2-numpy
-
diff --git a/PKGBUILD b/PKGBUILD
index 8c167dfe877a..25a375272202 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,27 +5,24 @@
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Adapted to mkl by Simone Riva
-pkgbase="python-numpy-mkl"
-pkgname="python-numpy-mkl"
-true && pkgname=('python-numpy-mkl' 'python2-numpy-mkl')
-#pkgname=('python-numpy')
-pkgver=1.16.4
+pkgname=python-numpy-mkl
+pkgver=1.17.4
 pkgrel=1
 pkgdesc="Scientific tools for Python compiled with intel mkl"
 arch=('i686' 'x86_64')
 license=('custom')
 options=('staticlibs')
 url="http://numpy.scipy.org/"
-depends=('intel-mkl' 'python' 'python2')
-makedepends=('python-setuptools' 'python2-setuptools' 'intel-compiler-base' 'intel-fortran-compiler' 'cython')
+depends=('intel-mkl' 'python')
+makedepends=('python-setuptools' 'intel-compiler-base' 'intel-fortran-compiler' 'cython')
 
 source=(https://github.com/numpy/numpy/archive/v${pkgver}.tar.gz
 	'site64.cfg'
 	'site32.cfg'
 	'intelccompiler.py.patch')
 
-sha256sums=('3bdabda4a2ac4f1986b4bc55f865cd0b68b71edc9420b03e911e0ee52743e9c4'
-            '86cd68a695a5e1d76f8e53cda70c888c4ed04349f15c8096d4492e346e7187e1'
+sha256sums=( SKIP
+	    '86cd68a695a5e1d76f8e53cda70c888c4ed04349f15c8096d4492e346e7187e1'
             '882f2717deca0fd6a2e2384aac2dc7973c566f9cd2ba46777c3b5ffdffa814df'
 	    '0d185daf0f2fcab08778173f54cee86cd88dc3c6703413686ab3742c0097db4e')
 
@@ -57,8 +54,6 @@ build() {
 		_compiler=intelem
 	fi
 
-	cp -a numpy-${pkgver} numpy-py2-${pkgver}
-
 	export Atlas=None
 	#export LDFLAGS="$LDFLAGS -shared" # makes no difference
 
@@ -73,19 +68,6 @@ build() {
 	#	export __INTEL_PRE_CFLAGS="$__INTEL_PRE_CFLAGS -D__PURE_INTEL_C99_HEADERS__ -D_Float32=float -D_Float64=double -D_Float128=\"long double\" -D_Float32x=_Float64 -D_Float64x=_Float128"
 	#fi
 
-	echo "Building Python2"
-	cd "${srcdir}"
-	cp ${srcdir}/site.cfg "${srcdir}/numpy-py2-${pkgver}"
-	cd "${srcdir}/numpy-py2-${pkgver}"
-
-	#if [ "$use_intel_cc" = true ]; then
-	python2 setup.py config --compiler=${_compiler} build_clib --compiler=${_compiler} build_ext --compiler=${_compiler}
-	#fi
-
-	#if [ "$use_gcc" = true ]; then
-	#	python2 setup.py config build_clib build_ext
-	#fi
-
 	echo "Building Python3"
 	cd "${srcdir}"	
 	cp ${srcdir}/site.cfg "${srcdir}/numpy-${pkgver}"
@@ -101,27 +83,6 @@ build() {
 
 }
 
-package_python2-numpy-mkl() {
-
-	depends=('intel-mkl' 'python2')
-	provides=("python2-numpy=${pkgver}")
-	conflicts=("python2-numpy")
-	optdepends=('python2-pytest: testsuite')
-
-	cd "${srcdir}/numpy-py2-${pkgver}"
-	python2 setup.py config_fc install --prefix=/usr --root="${pkgdir}" --optimize=2
-
-	install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy"
-	install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/"
-
-	sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-		-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-		-e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
-		$(find ${pkgdir} -name '*.py')
-
-	mv "$pkgdir"/usr/bin/f2py{,2}
-}
-
 package_python-numpy-mkl() {
 
 	depends=('intel-mkl' 'python')