[arch-commits] Commit in python-elasticsearch/trunk (PKGBUILD)

[Felix Yan]

    Date: Friday, May 8, 2020 @ 12:06:25
  Author: felixonmars
Revision: 625609

upgpkg: python-elasticsearch 7.6.0-2: remove python2 sibling

Modified:
  python-elasticsearch/trunk/PKGBUILD

----------+
 PKGBUILD |   45 +++++++++++++++------------------------------
 1 file changed, 15 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-08 12:03:35 UTC (rev 625608)
+++ PKGBUILD	2020-05-08 12:06:25 UTC (rev 625609)
@@ -1,52 +1,37 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
-pkgbase=python-elasticsearch
-pkgname=('python-elasticsearch' 'python2-elasticsearch')
+pkgname=python-elasticsearch
 pkgver=7.6.0
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc='Python client for Elasticsearch'
 url='https://github.com/elastic/elasticsearch-py'
 license=('Apache')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-urllib3' 'python2-urllib3')
-checkdepends=('python-nose' 'python2-nose' 'python-requests' 'python2-requests' 'python-coverage'
-              'python2-coverage' 'python-mock' 'python2-mock' 'python-pyaml' 'python2-pyaml'
-              'python-nosexcover' 'python2-nosexcover')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/elastic/elasticsearch-py/archive/$pkgver.tar.gz")
-sha512sums=('f8a54cd222af94d659087d654bcbe52da5ee90570ff04dbdd6793b870b8fd7e4b5b896620424f85057f2274ed3a16ecd97f53f704c2a97931b4876d246311ea9')
+depends=('python-urllib3')
+makedepends=('python-setuptools' 'git')
+checkdepends=('python-nose' 'python-requests' 'python-coverage' 'python-mock' 'python-pyaml'
+              'python-nosexcover')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/elastic/elasticsearch-py/archive/$pkgver.tar.gz"
+        git+https://github.com/elastic/elasticsearch.git)
+sha512sums=('f8a54cd222af94d659087d654bcbe52da5ee90570ff04dbdd6793b870b8fd7e4b5b896620424f85057f2274ed3a16ecd97f53f704c2a97931b4876d246311ea9'
+            'SKIP')
 
 prepare() {
   sed -i 's/urllib3<.*,>/urllib3>/' elasticsearch-py-$pkgver/setup.py
-  cp -a elasticsearch-py-$pkgver{,-py2}
+  sed -i 's|CA_CERTS = None|CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"|' elasticsearch-py-$pkgver/elasticsearch/connection/http_urllib3.py
 }
 
 build() {
-  cd "$srcdir"/elasticsearch-py-$pkgver
+  cd elasticsearch-py-$pkgver
   python setup.py build
-
-  cd "$srcdir"/elasticsearch-py-$pkgver-py2
-  python2 setup.py build
 }
 
 check() {
-  cd "$srcdir"/elasticsearch-py-$pkgver
-  # https://github.com/elastic/elasticsearch-py/issues/816
-  # python setup.py test
-
-  cd "$srcdir"/elasticsearch-py-$pkgver-py2
-  # python2 setup.py test
+  cd elasticsearch-py-$pkgver
+  TEST_ES_REPO="$srcdir"/elasticsearch python setup.py test
 }
 
-package_python-elasticsearch() {
-  depends=('python-urllib3')
-
+package() {
   cd elasticsearch-py-$pkgver
   python setup.py install --root "$pkgdir" --optimize=1
 }
-
-package_python2-elasticsearch() {
-  depends=('python2-urllib3')
-
-  cd elasticsearch-py-$pkgver-py2
-  python2 setup.py install --root "$pkgdir" --optimize=1
-}