From a406e7c18124702c6d6e02d44c0b1045e581f965 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Wed, 17 Mar 2021 00:12:47 +0000 Subject: [PATCH] Update textproc/py-elasticsearch-dsl to 7.1.0, preserve version 6 as textproc/py-elasticsearch-dsl7 PR: 241888, 241887 Submitted by: jbaggs2016@gmail.com (maintainer) --- textproc/Makefile | 1 + textproc/py-elasticsearch-dsl/Makefile | 7 +++---- textproc/py-elasticsearch-dsl/distinfo | 6 +++--- textproc/py-elasticsearch-dsl6/Makefile | 25 ++++++++++++++++++++++++ textproc/py-elasticsearch-dsl6/distinfo | 3 +++ textproc/py-elasticsearch-dsl6/pkg-descr | 17 ++++++++++++++++ 6 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 textproc/py-elasticsearch-dsl6/Makefile create mode 100644 textproc/py-elasticsearch-dsl6/distinfo create mode 100644 textproc/py-elasticsearch-dsl6/pkg-descr diff --git a/textproc/Makefile b/textproc/Makefile index ae09011dbfb2..2082198bb91b 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1273,6 +1273,7 @@ SUBDIR += py-elasticsearch-async SUBDIR += py-elasticsearch-curator SUBDIR += py-elasticsearch-dsl + SUBDIR += py-elasticsearch-dsl6 SUBDIR += py-elasticsearch5 SUBDIR += py-elasticsearch6 SUBDIR += py-elementpath diff --git a/textproc/py-elasticsearch-dsl/Makefile b/textproc/py-elasticsearch-dsl/Makefile index b73b2032f827..7745e6d2ab43 100644 --- a/textproc/py-elasticsearch-dsl/Makefile +++ b/textproc/py-elasticsearch-dsl/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= elasticsearch-dsl -PORTVERSION= 6.4.0 -PORTREVISION= 1 +PORTVERSION= 7.1.0 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,10 +14,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}elasticsearch6>=6.2.1:textproc/py-elasticsearch6@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}elasticsearch>=7.0.5:textproc/py-elasticsearch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} -USES= python:3.7+ +USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/textproc/py-elasticsearch-dsl/distinfo b/textproc/py-elasticsearch-dsl/distinfo index a952e2d3d971..6f5d7fa865b5 100644 --- a/textproc/py-elasticsearch-dsl/distinfo +++ b/textproc/py-elasticsearch-dsl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567231186 -SHA256 (elasticsearch-dsl-6.4.0.tar.gz) = 26416f4dd46ceca43d62ef74970d9de4bdd6f4b0f163316f0b432c9e61a08bec -SIZE (elasticsearch-dsl-6.4.0.tar.gz) = 52534 +TIMESTAMP = 1573310134 +SHA256 (elasticsearch-dsl-7.1.0.tar.gz) = 3f860e0304d703f63b458fea3782f09a823ab07da7ee84ae4bff1aa63e22aedb +SIZE (elasticsearch-dsl-7.1.0.tar.gz) = 52824 diff --git a/textproc/py-elasticsearch-dsl6/Makefile b/textproc/py-elasticsearch-dsl6/Makefile new file mode 100644 index 000000000000..9bc0e95252d8 --- /dev/null +++ b/textproc/py-elasticsearch-dsl6/Makefile @@ -0,0 +1,25 @@ +# Created by: Dan Langille +# $FreeBSD$ + +PORTNAME= elasticsearch-dsl +PORTVERSION= 6.4.0 +CATEGORIES= textproc python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 6 + +MAINTAINER= jbaggs2016@gmail.com +COMMENT= High level Python client for Elasticsearch + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}elasticsearch6>=6.2.1:textproc/py-elasticsearch6@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} + +USES= python:3.7+ +USE_PYTHON= autoplist concurrent distutils +NO_ARCH= yes + +.include diff --git a/textproc/py-elasticsearch-dsl6/distinfo b/textproc/py-elasticsearch-dsl6/distinfo new file mode 100644 index 000000000000..a952e2d3d971 --- /dev/null +++ b/textproc/py-elasticsearch-dsl6/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567231186 +SHA256 (elasticsearch-dsl-6.4.0.tar.gz) = 26416f4dd46ceca43d62ef74970d9de4bdd6f4b0f163316f0b432c9e61a08bec +SIZE (elasticsearch-dsl-6.4.0.tar.gz) = 52534 diff --git a/textproc/py-elasticsearch-dsl6/pkg-descr b/textproc/py-elasticsearch-dsl6/pkg-descr new file mode 100644 index 000000000000..8f57d45f3763 --- /dev/null +++ b/textproc/py-elasticsearch-dsl6/pkg-descr @@ -0,0 +1,17 @@ +Elasticsearch DSL is a high-level library whose aim is to help with writing +and running queries against Elasticsearch. It is built on top of the official +low-level client (elasticsearch-py). + +It provides a more convenient and idiomatic way to write and manipulate +queries. It stays close to the Elasticsearch JSON DSL, mirroring its terminology +and structure. It exposes the whole range of the DSL from Python either directly +using defined classes or a queryset-like expressions. + +It also provides an optional wrapper for working with documents as Python +objects: defining mappings, retrieving and saving documents, wrapping the +document data in user-defined classes. + +To use the other Elasticsearch APIs (eg. cluster health) just use the underlying +client. + +WWW: https://pypi.org/project/elasticsearch-dsl/