You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by rk...@apache.org on 2023/11/06 15:44:12 UTC

(incubator-sdap-nexus) branch release/1.2.0-no-chardet created (now 3b12e26)

This is an automated email from the ASF dual-hosted git repository.

rkk pushed a change to branch release/1.2.0-no-chardet
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git


      at 3b12e26  Remove chardet from project files & cloud-init image

This branch includes the following new commits:

     new 3b12e26  Remove chardet from project files & cloud-init image

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(incubator-sdap-nexus) 01/01: Remove chardet from project files & cloud-init image

Posted by rk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rkk pushed a commit to branch release/1.2.0-no-chardet
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git

commit 3b12e26193572b59fd952c1f94f610d202e749bd
Author: rileykk <ri...@jpl.nasa.gov>
AuthorDate: Mon Nov 6 07:44:00 2023 -0800

    Remove chardet from project files & cloud-init image
    
    - Also a fix for SDAP-496 is included
---
 docker/solr/cloud-init/Dockerfile           |  4 ++--
 integrations/python-client/README.md        |  0
 integrations/python-client/requirements.txt | 13 -------------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/docker/solr/cloud-init/Dockerfile b/docker/solr/cloud-init/Dockerfile
index 1bb7644..97583dd 100644
--- a/docker/solr/cloud-init/Dockerfile
+++ b/docker/solr/cloud-init/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM python:3
+FROM python:3.11
 MAINTAINER Apache SDAP "dev@sdap.apache.org"
 
 ENV MINIMUM_NODES="1" \
@@ -25,7 +25,7 @@ ENV MINIMUM_NODES="1" \
     CREATE_COLLECTION_PARAMS="name=nexustiles&collection.configName=nexustiles&numShards=1"
 
 
-RUN pip install kazoo==2.6.0 requests==2.21.0
+RUN pip install kazoo==2.6.0 'requests>=2.26.0'
 COPY ./cloud-init/create-collection.py /tmp/create-collection.py
 
 ENTRYPOINT ["/tmp/create-collection.py"]
diff --git a/integrations/python-client/README.md b/integrations/python-client/README.md
deleted file mode 100644
index e69de29..0000000
diff --git a/integrations/python-client/requirements.txt b/integrations/python-client/requirements.txt
deleted file mode 100644
index 986c39d..0000000
--- a/integrations/python-client/requirements.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-chardet==3.0.4
-idna==2.5
-Mako==1.0.7
-markdown==2.4.1
-MarkupSafe==1.0
-nexuscli==1.0
-numpy==1.17.0
-pdoc==0.3.2
-Pygments==2.2.0
-pytz==2017.2
-requests==2.22.0
-shapely==1.5.17
-urllib3==1.25.3