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 18:23:07 UTC
(incubator-sdap-ingester) branch release/1.2.0-no-chardet created (now 1672429)
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-ingester.git
at 1672429 GI build w/o chardet
This branch includes the following new commits:
new 2c7b0dc CM build w/o chardet
new 1672429 GI build w/o chardet
The 2 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-ingester) 02/02: GI build w/o chardet
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-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)
(incubator-sdap-ingester) 01/02: CM build w/o chardet
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-ingester.git
commit 2c7b0dc3c609bcac4ff88f7d53c3255435e57ae6
Author: rileykk <ri...@jpl.nasa.gov>
AuthorDate: Mon Nov 6 09:07:46 2023 -0800
CM build w/o chardet
---
collection_manager/docker/Dockerfile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/collection_manager/docker/Dockerfile b/collection_manager/docker/Dockerfile
index f729fa2..5c48215 100644
--- a/collection_manager/docker/Dockerfile
+++ b/collection_manager/docker/Dockerfile
@@ -29,8 +29,6 @@ COPY collection_manager/README.md /collection_manager/README.md
COPY collection_manager/docker/entrypoint.sh /entrypoint.sh
RUN cd /common && python setup.py install
-RUN cd /collection_manager && python setup.py install
-
-RUN pip install boto3==1.16.10
+RUN cd /collection_manager && python setup.py install && pip uninstall -y chardet && pip install boto3==1.16.10 requests==2.26.0
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]