(incubator-sdap-ingester) 02/02: GI build w/o chardet

[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-ingester.git

commit 16724292395820f27f81e06549207fdfc986782a
Author: rileykk <ri...@jpl.nasa.gov>
AuthorDate: Mon Nov 6 10:22:50 2023 -0800

    GI build w/o chardet
---
 granule_ingester/conda-requirements.txt | 4 ++--
 granule_ingester/docker/Dockerfile      | 9 +++++++--
 granule_ingester/setup.py               | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/granule_ingester/conda-requirements.txt b/granule_ingester/conda-requirements.txt
index e49a9eb..f013d3b 100644
--- a/granule_ingester/conda-requirements.txt
+++ b/granule_ingester/conda-requirements.txt
@@ -20,7 +20,7 @@ pandas>=1.0.4
 pytz==2019.3
 xarray>=0.19.0
 pyyaml==5.3.1
-aiohttp==3.6.2
+aiohttp>=3.8.0
 tenacity
-requests==2.27.1
+requests>=2.27.1
 
diff --git a/granule_ingester/docker/Dockerfile b/granule_ingester/docker/Dockerfile
index e285872..d01c74c 100644
--- a/granule_ingester/docker/Dockerfile
+++ b/granule_ingester/docker/Dockerfile
@@ -35,8 +35,13 @@ ARG APACHE_NEXUSPROTO=https://github.com/apache/incubator-sdap-nexusproto.git
 ARG APACHE_NEXUSPROTO_BRANCH=master
 
 RUN ./install_nexusproto.sh
-RUN cd /common && python setup.py install
-RUN cd /sdap && python setup.py install
+RUN cd /common && python setup.py install clean
+
+RUN pip uninstall -y chardet
+
+RUN conda install -n base --override-channels -c conda-forge -c defaults mamba libarchive=3.5.2=hb890918_3 && conda clean -afy
+
+RUN cd /sdap && python setup.py install clean && mamba clean -afy
 
 RUN pip install boto3==1.16.10
 
diff --git a/granule_ingester/setup.py b/granule_ingester/setup.py
index e99900d..98b1548 100644
--- a/granule_ingester/setup.py
+++ b/granule_ingester/setup.py
@@ -24,7 +24,7 @@ with open('../VERSION.txt', 'r') as f:
     __version__ = f.readline()
 
 try:
-    check_call(['conda', 'install', '-y', '-c', 'conda-forge', '--file', 'conda-requirements.txt'])
+    check_call(['mamba', 'install', '-y', '-c', 'conda-forge', '--file', 'conda-requirements.txt'])
 except (CalledProcessError, IOError) as e:
     raise EnvironmentError("Error installing conda packages", e)