update to 4.2.9

3 files changed, 42 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7a80444d9d8..40a1e95f12cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,24 @@
 pkgbase = python-treecorr
 	pkgdesc = Library that efficiently computes 2-point and 3-point correlation functions
-	pkgver = 4.2.6
+	pkgver = 4.2.9
 	pkgrel = 1
 	url = https://github.com/rmjarvis/treecorr
 	changelog = CHANGELOG.rst
 	arch = x86_64
 	license = BSD
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-setuptools
 	makedepends = python-sphinx
-	depends = python-numpy>=1.14
-	depends = python-yaml>=3.13
-	depends = python-cffi>=1.12
-	depends = python-coord>=1.1
+	makedepends = python-wheel
+	depends = python-numpy
+	depends = python-yaml
+	depends = python-cffi
+	depends = python-coord
 	optdepends = python-fitsio: reads FITS catalogs or writes to FITS output files
 	optdepends = python-pandas: speeds up reading from ASCII catalogs
 	optdepends = python-h5py: reads HDF5 catalogs
-	source = python-treecorr-4.2.6.tar.gz::https://github.com/rmjarvis/treecorr/archive/v4.2.6.tar.gz
-	sha256sums = 78cb3a1bf43aef2c73dd89e1d0b03df955fd130943fcb3de0f447446b2142f5a
+	source = python-treecorr-4.2.9.tar.gz::https://github.com/rmjarvis/treecorr/archive/v4.2.9.tar.gz
+	sha256sums = 59c8ac5e0b4644967917aaa3089e847d7759cd399cee9bc21e733b4558d76c0c
 
 pkgname = python-treecorr
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d95715b8ae4d..1e61c53208e0 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -121,3 +121,22 @@ Changes from version 4.2.5 to 4.2.6
 - Fixed a numerical bug that could suppress the signal in GG correlations in
   spherical coordinates if there are multiple objects at the same position.
   Thanks to Sandra Unruh for the bug report. (#134)
+
+Changes from version 4.2.6 to 4.2.7
+===================================
+
+- Fixed a memory problem when computing patch-based covariance matrix when npatches
+  is moderately large (e.g. 500). Thanks to Joe Zuntz and Judit Prat for finding and
+  reporting the bug. (#137)
+
+Changes from version 4.2.7 to 4.2.8
+===================================
+
+- Fixed a bug in the calculation of jackknife and sample variance when only the second
+  catalog in a cross-correlation uses patches.
+
+Changes from version 4.2.8 to 4.2.9
+===================================
+
+- Fixed a error in the low_mem calculation when ra_units and/or dec_units are not
+  radians. Thanks to Chun-Hao To for the bug report. (#144)
diff --git a/PKGBUILD b/PKGBUILD
index bb8f557b4b67..729c110f8c47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,35 +3,34 @@
 # Contributor: M. Jarvis
 
 pkgname=python-treecorr
-pkgver=4.2.6
+_pkg=TreeCorr
+pkgver=4.2.9
 pkgrel=1
 pkgdesc="Library that efficiently computes 2-point and 3-point correlation functions"
 arch=('x86_64')
 url="https://github.com/rmjarvis/treecorr"
 license=('BSD')
-depends=('python-numpy>=1.14' 'python-yaml>=3.13' 'python-cffi>=1.12' 'python-coord>=1.1')
+depends=('python-numpy' 'python-yaml' 'python-cffi' 'python-coord')
 optdepends=(
 	'python-fitsio: reads FITS catalogs or writes to FITS output files'
 	'python-pandas: speeds up reading from ASCII catalogs'
 	'python-h5py: reads HDF5 catalogs')
-makedepends=('python-setuptools' 'python-sphinx')
-# checkdepends=('python-fitsio>=0.9' 'python-pandas>=0.20' 'python-hdpy' 'python-scipy>=1.2')
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-sphinx' 'python-wheel')
+# checkdepends=('python-fitsio' 'python-pandas' 'python-hdpy' 'python-scipy')
 changelog=CHANGELOG.rst
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
-sha256sums=('78cb3a1bf43aef2c73dd89e1d0b03df955fd130943fcb3de0f447446b2142f5a')
+sha256sums=('59c8ac5e0b4644967917aaa3089e847d7759cd399cee9bc21e733b4558d76c0c')
 
 build() {
-	cd "TreeCorr-$pkgver"
-	python setup.py build
-
+	cd "$_pkg-$pkgver"
+	python -m build --wheel --no-isolation
 	local _ver="$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')"
-	cd docs
-	PYTHONPATH="../build/lib.linux-$CARCH-$_ver" make man
+	PYTHONPATH="$PWD/build/lib.linux-$CARCH-$_ver" make -C docs man
 }
 
 package() {
-	cd "TreeCorr-$pkgver"
-	PYTHONHASHSEED=0 python setup.py install --root="$pkgdir/" --prefix=/usr --optimize=1 --skip-build
-	install -Dm 644 TreeCorr_LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-	install -Dm 644 docs/_build/man/TreeCorr.1 -t "$pkgdir/usr/share/man/man1/"
+	cd "$_pkg-$pkgver"
+	PYTHONHASHSEED=0 python -m installer --destdir="$pkgdir/" dist/*.whl
+	install -Dm644 TreeCorr_LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	install -Dm644 docs/_build/man/TreeCorr.1 -t "$pkgdir/usr/share/man/man1/"
 }