From 87fa6b5f906163cb8fe2c5fb29e705bd1397c71e Mon Sep 17 00:00:00 2001 From: Jo Date: Tue, 8 Mar 2022 19:19:43 +0100 Subject: [PATCH] Hardcoded version of ES client python library (#862) * - hardcoded version of ES python library * - Pin down dependency versions * - updated package number syntax * - updated package syntax * - updated package number Co-authored-by: doublebyte1 --- debian/control | 2 +- docker/examples/elastic/ES/Dockerfile | 2 +- requirements-provider.txt | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 8d0e5a2..b949540 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Depends: ${python3:Depends}, python3-unicodecsv, python3-yaml, ${misc:Depends} -Suggests: python3-babel, python3-elasticsearch, python3-fiona, python3-geojson, python3-pydantic, python3-pygeometa, python3-pyproj, python3-rasterio +Suggests: python3-babel, python3-elasticsearch (<8), python3-fiona, python3-geojson, python3-pydantic, python3-pygeometa, python3-pyproj, python3-rasterio Description: pygeoapi provides an API to geospatial data. . This package the pygeoapi module for Python 3. diff --git a/docker/examples/elastic/ES/Dockerfile b/docker/examples/elastic/ES/Dockerfile index d403e5c..88b694d 100644 --- a/docker/examples/elastic/ES/Dockerfile +++ b/docker/examples/elastic/ES/Dockerfile @@ -54,7 +54,7 @@ RUN echo "discovery.type: single-node" >> config/elasticsearch.yml RUN yum --enablerepo=extras -y install epel-release \ && yum install -y python3 python3-pip python3-setuptools python-typing \ - && pip3 install --upgrade pip elasticsearch elasticsearch-dsl \ + && pip3 install --upgrade pip elasticsearch==7.17.1 elasticsearch-dsl \ && yum clean packages USER elasticsearch diff --git a/requirements-provider.txt b/requirements-provider.txt index c642cb9..28e898c 100644 --- a/requirements-provider.txt +++ b/requirements-provider.txt @@ -1,4 +1,4 @@ -elasticsearch==7.1.0 +elasticsearch<8 fiona #GDAL>=3.0.0 netCDF4 @@ -10,4 +10,5 @@ pymongo==3.10.1 scipy xarray zarr -elasticsearch-dsl +elasticsearch-dsl<8 +