Bump version to 1.2.6

3 files changed, 26 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6582baaa61c2..0b1885ddc9e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,13 @@
 pkgbase = python-fastcluster
 	pkgdesc = Fast hierarchical clustering routines for R and Python
-	pkgver = 1.1.25
+	pkgver = 1.2.6
 	pkgrel = 1
-	url = https://pypi.python.org/pypi/fastcluster
+	url = https://pypi.org/project/fastcluster
 	arch = any
-	license = BSD
-	makedepends = python
+	license = custom:BSD-2-clause
 	makedepends = python-setuptools
-	makedepends = python2
-	makedepends = python2-setuptools
-	options = !emptydirs
-	source = python-fastcluster-1.1.25.tar.gz::https://pypi.io/packages/source/f/fastcluster/fastcluster-1.1.25.tar.gz
-	sha256sums = 539d84d43fbe541a38d94c84bf0469c430cb7cda488364941ce57f680a07b091
-
-pkgname = python-fastcluster
-	depends = python
 	depends = python-numpy
+	source = https://pypi.org/packages/source/f/fastcluster/fastcluster-1.2.6.tar.gz
+	sha512sums = 94a11ddd80fe219a91f1713230decfde761cd745a6ce0782e5cc0ab7d9818855d031be8c79f97256f0266fd6992a9fa4b0f5e7a30cb42387810fd8baff2a2135
 
-pkgname = python2-fastcluster
-	depends = python2
-	depends = python2-numpy
-
+pkgname = python-fastcluster
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..f59ec20aabf5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index b1c90d6b9d38..5433cc6669c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,26 @@
-# Maintainer: Clint Valentine <valentine.clint@gmail.com>
-# Co-maintainer: Dmitriy Morozov <archlinux@foxcub.org>
-
+# Contributor: Clint Valentine <valentine.clint@gmail.com>
+# Contributor: Dmitriy Morozov <archlinux@foxcub.org>
 _name=fastcluster
-pkgbase='python-fastcluster'
-pkgname=('python-fastcluster' 'python2-fastcluster')
-pkgver=1.1.25
+pkgname=python-${_name}
+pkgver=1.2.6
 pkgrel=1
 pkgdesc="Fast hierarchical clustering routines for R and Python"
-arch=('any')
-url="https://pypi.python.org/pypi/fastcluster"
-license=('BSD')
-makedepends=(
-  'python' 'python-setuptools'
-  'python2' 'python2-setuptools')
-options=(!emptydirs)
-source=("${pkgname}"-"${pkgver}".tar.gz::https://pypi.io/packages/source/"${_name:0:1}"/"${_name}"/"${_name}"-"${pkgver}".tar.gz)
-sha256sums=('539d84d43fbe541a38d94c84bf0469c430cb7cda488364941ce57f680a07b091')
-
-prepare() {
-  cp -a "${_name}"-"${pkgver}"{,-py2}
-}
-
-build(){
-  cd "${srcdir}"/"${_name}"-"${pkgver}"
+arch=(any)
+url="https://pypi.org/project/${_name}"
+license=('custom:BSD-2-clause')
+depends=(python-numpy)
+makedepends=(python-setuptools)
+source=(https://pypi.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz)
+sha512sums=('94a11ddd80fe219a91f1713230decfde761cd745a6ce0782e5cc0ab7d9818855d031be8c79f97256f0266fd6992a9fa4b0f5e7a30cb42387810fd8baff2a2135')
+
+build() {
+  cd ${_name}-${pkgver}
+  export PYTHONHASHSEED=0
   python setup.py build
-
-  cd "${srcdir}"/"${_name}"-"${pkgver}"-py2
-  python2 setup.py build
 }
 
-package_python2-fastcluster() {
-  depends=('python2' 'python2-numpy')
-
-  cd "${_name}"-"${pkgver}"-py2
-  python2 setup.py install --root="${pkgdir}"/ --optimize=1 --skip-build
-  install -Dm644 COPYING.txt "${pkgdir}"/usr/share/licenses/"${pkgname}"/COPYING.txt
-}
-
-package_python-fastcluster() {
-  depends=('python' 'python-numpy')
-
-  cd "${_name}"-"${pkgver}"
-  python setup.py install --root="${pkgdir}"/ --optimize=1 --skip-build
-  install -Dm644 COPYING.txt "${pkgdir}"/usr/share/licenses/"${pkgname}"/COPYING.txt
+package() {
+  cd ${_name}-${pkgver}
+  PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+  install -Dm 644 COPYING.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }