[arch-commits] Commit in python-elasticsearch/repos/community-any (4 files)
Felix Yan
felixonmars at gemini.archlinux.org
Mon Jun 27 19:21:10 UTC 2022
Date: Monday, June 27, 2022 @ 19:21:10
Author: felixonmars
Revision: 1239737
archrelease: copy trunk to community-any
Added:
python-elasticsearch/repos/community-any/PKGBUILD
(from rev 1239736, python-elasticsearch/trunk/PKGBUILD)
python-elasticsearch/repos/community-any/python310.patch
(from rev 1239736, python-elasticsearch/trunk/python310.patch)
Deleted:
python-elasticsearch/repos/community-any/PKGBUILD
python-elasticsearch/repos/community-any/python310.patch
-----------------+
PKGBUILD | 87 +++++++++++++++++++++++++-----------------------------
python310.patch | 70 +++++++++++++++++++++----------------------
2 files changed, 76 insertions(+), 81 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-27 19:20:54 UTC (rev 1239736)
+++ PKGBUILD 2022-06-27 19:21:10 UTC (rev 1239737)
@@ -1,46 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=python-elasticsearch
-pkgver=7.8.1
-pkgrel=5
-arch=('any')
-pkgdesc='Python client for Elasticsearch'
-url='https://github.com/elastic/elasticsearch-py'
-license=('Apache')
-depends=('python-urllib3')
-makedepends=('python-setuptools' 'git')
-checkdepends=('python-requests' 'python-mock' 'python-yaml' 'python-pytest' 'python-numpy'
- 'python-pandas' 'python-aiohttp' 'python-pytest-asyncio')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/elastic/elasticsearch-py/archive/$pkgver.tar.gz"
- "$pkgname-python39.patch::https://github.com/elastic/elasticsearch-py/commit/7747f2b25753.patch"
- python310.patch)
-# git+https://github.com/elastic/elasticsearch.git)
-sha512sums=('46f4295bca0da9b1fb4e8dea6ef511e4f37c342394e24c36712f63e3c75bc76c60f37a81350b7873465e129a635cbf70dd7039daae13e851cfbcc995f91bd432'
- '053e6cc452278c3b62c47c9168ec42935e441cdb43107ff793bd40bcd7f60d23f093bb4c0e67f05d1200c436dd7194632a5514ec24caf4aab1ad6e6bb8f1c7b2'
- '495694c1d89ad453fd1d2e83092a741a256cbe5627ebcca22770b340a9ac77fabcdea83fa84f1c9c0ffe734517a099f98ee8a95f1384b5f716eb34273a21b39f')
-
-prepare() {
- cd elasticsearch-py-$pkgver
- patch -Np1 -i ../$pkgname-python39.patch
- patch -Np1 -F3 -i ../python310.patch
- sed -i 's/, "certifi"//' setup.py
- sed -i 's|CA_CERTS = None|CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"|' \
- elasticsearch/{connection/http_urllib3.py,_async/http_aiohttp.py}
-}
-
-build() {
- cd elasticsearch-py-$pkgver
- python setup.py build
-}
-
-check() {
- cd elasticsearch-py-$pkgver
- # Skip tests that requires a running elasticsearch server
- #TEST_ES_REPO="$srcdir"/elasticsearch
- pytest --deselect test_elasticsearch/test_async/test_server
-}
-
-package() {
- cd elasticsearch-py-$pkgver
- python setup.py install --root "$pkgdir" --optimize=1
-}
Copied: python-elasticsearch/repos/community-any/PKGBUILD (from rev 1239736, python-elasticsearch/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-06-27 19:21:10 UTC (rev 1239737)
@@ -0,0 +1,41 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=python-elasticsearch
+pkgver=7.9.0
+pkgrel=1
+arch=('any')
+pkgdesc='Python client for Elasticsearch'
+url='https://github.com/elastic/elasticsearch-py'
+license=('Apache')
+depends=('python-certifi' 'python-urllib3')
+makedepends=('python-setuptools' 'git')
+checkdepends=('python-requests' 'python-mock' 'python-yaml' 'python-pytest' 'python-numpy'
+ 'python-pandas' 'python-aiohttp' 'python-pytest-asyncio')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/elastic/elasticsearch-py/archive/$pkgver.tar.gz"
+ python310.patch)
+# git+https://github.com/elastic/elasticsearch.git)
+sha512sums=('2fae863434f7bf06c0669426b4a261f5d0c9ea26bd68783393bf25521e46484a0d6267438ae73590b7961b2a1b1a347cf89f33a9904983a82469b25b14894657'
+ '495694c1d89ad453fd1d2e83092a741a256cbe5627ebcca22770b340a9ac77fabcdea83fa84f1c9c0ffe734517a099f98ee8a95f1384b5f716eb34273a21b39f')
+
+prepare() {
+ cd elasticsearch-py-$pkgver
+ patch -Np1 -F3 -i ../python310.patch
+}
+
+build() {
+ cd elasticsearch-py-$pkgver
+ python setup.py build
+}
+
+check() {
+ cd elasticsearch-py-$pkgver
+ # Skip tests that requires a running elasticsearch server
+ #TEST_ES_REPO="$srcdir"/elasticsearch
+ # TODO: test_elasticsearch/test_async/test_transport.py::TestTransport::test_sniff_on_fail_failing_does_not_prevent_retires
+ pytest --deselect test_elasticsearch/test_async/test_server --deselect test_elasticsearch/test_async/test_transport.py::TestTransport::test_sniff_on_fail_failing_does_not_prevent_retires
+}
+
+package() {
+ cd elasticsearch-py-$pkgver
+ python setup.py install --root "$pkgdir" --optimize=1
+}
Deleted: python310.patch
===================================================================
--- python310.patch 2022-06-27 19:20:54 UTC (rev 1239736)
+++ python310.patch 2022-06-27 19:21:10 UTC (rev 1239737)
@@ -1,35 +0,0 @@
-From 899221f26f8333254f27e85e99f8a42e75f1cecf Mon Sep 17 00:00:00 2001
-From: Seth Michael Larson <seth.larson at elastic.co>
-Date: Mon, 7 Jun 2021 13:20:26 -0500
-Subject: [PATCH] Start testing on Python 3.10
-
----
- elasticsearch/_async/http_aiohttp.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/elasticsearch/_async/http_aiohttp.py b/elasticsearch/_async/http_aiohttp.py
-index 8c3a995..2057cdd 100644
---- a/elasticsearch/_async/http_aiohttp.py
-+++ b/elasticsearch/_async/http_aiohttp.py
-@@ -167,7 +167,10 @@ class AIOHttpConnection(AsyncConnection):
-
- self.ssl_assert_fingerprint = ssl_assert_fingerprint
- if self.use_ssl and ssl_context is None:
-- ssl_context = ssl.SSLContext(ssl_version or ssl.PROTOCOL_TLS)
-+ if ssl_version is None:
-+ ssl_context = ssl.create_default_context()
-+ else:
-+ ssl_context = ssl.SSLContext(ssl_version)
-
- # Convert all sentinel values to their actual default
- # values if not using an SSLContext.
-@@ -180,8 +183,8 @@ class AIOHttpConnection(AsyncConnection):
- ssl_context.verify_mode = ssl.CERT_REQUIRED
- ssl_context.check_hostname = True
- else:
-- ssl_context.verify_mode = ssl.CERT_NONE
- ssl_context.check_hostname = False
-+ ssl_context.verify_mode = ssl.CERT_NONE
-
- ca_certs = CA_CERTS if ca_certs is None else ca_certs
- if verify_certs:
Copied: python-elasticsearch/repos/community-any/python310.patch (from rev 1239736, python-elasticsearch/trunk/python310.patch)
===================================================================
--- python310.patch (rev 0)
+++ python310.patch 2022-06-27 19:21:10 UTC (rev 1239737)
@@ -0,0 +1,35 @@
+From 899221f26f8333254f27e85e99f8a42e75f1cecf Mon Sep 17 00:00:00 2001
+From: Seth Michael Larson <seth.larson at elastic.co>
+Date: Mon, 7 Jun 2021 13:20:26 -0500
+Subject: [PATCH] Start testing on Python 3.10
+
+---
+ elasticsearch/_async/http_aiohttp.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/elasticsearch/_async/http_aiohttp.py b/elasticsearch/_async/http_aiohttp.py
+index 8c3a995..2057cdd 100644
+--- a/elasticsearch/_async/http_aiohttp.py
++++ b/elasticsearch/_async/http_aiohttp.py
+@@ -167,7 +167,10 @@ class AIOHttpConnection(AsyncConnection):
+
+ self.ssl_assert_fingerprint = ssl_assert_fingerprint
+ if self.use_ssl and ssl_context is None:
+- ssl_context = ssl.SSLContext(ssl_version or ssl.PROTOCOL_TLS)
++ if ssl_version is None:
++ ssl_context = ssl.create_default_context()
++ else:
++ ssl_context = ssl.SSLContext(ssl_version)
+
+ # Convert all sentinel values to their actual default
+ # values if not using an SSLContext.
+@@ -180,8 +183,8 @@ class AIOHttpConnection(AsyncConnection):
+ ssl_context.verify_mode = ssl.CERT_REQUIRED
+ ssl_context.check_hostname = True
+ else:
+- ssl_context.verify_mode = ssl.CERT_NONE
+ ssl_context.check_hostname = False
++ ssl_context.verify_mode = ssl.CERT_NONE
+
+ ca_certs = CA_CERTS if ca_certs is None else ca_certs
+ if verify_certs:
More information about the arch-commits
mailing list