update versions packages to match METplotpy requirements and update c…

…all to cartopy feature download script -- see SciTools/cartopy#2263
dtcenter · Sep 24, 2024 · bf9a134 · bf9a134
1 parent 3d752d1
commit bf9a134
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/internal/scripts/docker_env/Dockerfile.cartopy b/internal/scripts/docker_env/Dockerfile.cartopy
@@ -24,9 +24,7 @@ ARG METPLUS_ENV_VERSION
 ARG ENV_NAME
 RUN apt update && apt -y upgrade \
   && apt install -y curl \
-  && rm -f cartopy_feature_download.py \
-  && curl https://raw.githubusercontent.com/SciTools/cartopy/master/tools/cartopy_feature_download.py > cartopy_feature_download.py \
-  && /usr/local/conda/envs/${ENV_NAME}.${METPLUS_ENV_VERSION}/bin/python3 cartopy_feature_download.py cultural physical
+  && /usr/local/conda/envs/${ENV_NAME}.${METPLUS_ENV_VERSION}/bin/cartopy_feature_download.py cultural physical
 
 # remove base environment to free up space
 ARG METPLUS_ENV_VERSION

diff --git a/internal/scripts/docker_env/README.md b/internal/scripts/docker_env/README.md
@@ -225,7 +225,7 @@ export METPLUS_ENV_VERSION=v6.0
 docker build -t dtcenter/metplus-envs:metplotpy.${METPLUS_ENV_VERSION} \
     --build-arg METPLUS_ENV_VERSION \
     --build-arg ENV_NAME=metplotpy \
-    -f Dockerfile.cartopy .
+    -f Dockerfile.cartopy.
 docker push dtcenter/metplus-envs:metplotpy.${METPLUS_ENV_VERSION}
 ```
 
@@ -234,9 +234,7 @@ docker push dtcenter/metplus-envs:metplotpy.${METPLUS_ENV_VERSION}
 ```
 export METPLUS_ENV_VERSION=v6.0
 ./scripts/metplotpy_env.sh ${METPLUS_ENV_VERSION}
-wget https://raw.githubusercontent.com/SciTools/cartopy/master/tools/cartopy_feature_download.py
-/home/met_test/.conda/envs/metplotpy.${METPLUS_ENV_VERSION}/bin/python3 cartopy_feature_download.py cultural physical
-rm cartopy_feature_download.py
+/home/met_test/.conda/envs/metplotpy.${METPLUS_ENV_VERSION}/bin/cartopy_feature_download.py cultural physical
 ```
 
 #### To install METplotpy and METcalcpy packages in environment
@@ -283,9 +281,7 @@ docker push dtcenter/metplus-envs:weatherregime.${METPLUS_ENV_VERSION}
 ```
 export METPLUS_ENV_VERSION=v6.0
 ./scripts/weatherregime_env.sh ${METPLUS_ENV_VERSION}
-wget https://raw.githubusercontent.com/SciTools/cartopy/master/tools/cartopy_feature_download.py
-/home/met_test/.conda/envs/weatherregime.${METPLUS_ENV_VERSION}/bin/python3 cartopy_feature_download.py cultural physical
-rm cartopy_feature_download.py
+/home/met_test/.conda/envs/weatherregime.${METPLUS_ENV_VERSION}/bin/cartopy_feature_download.py cultural physical
 ```
 
 #### To install METplotpy and METcalcpy packages in environment
@@ -331,9 +327,7 @@ docker push dtcenter/metplus-envs:cycloneplotter.${METPLUS_ENV_VERSION}
 ```
 export METPLUS_ENV_VERSION=v6.0
 ./scripts/cycloneplotter_env.sh ${METPLUS_ENV_VERSION}
-wget https://raw.githubusercontent.com/SciTools/cartopy/master/tools/cartopy_feature_download.py
-/home/met_test/.conda/envs/cycloneplotter.${METPLUS_ENV_VERSION}/bin/python3 cartopy_feature_download.py cultural physical
-rm cartopy_feature_download.py
+/home/met_test/.conda/envs/cycloneplotter.${METPLUS_ENV_VERSION}/bin/cartopy_feature_download.py cultural physical
 ```
 
 

diff --git a/internal/scripts/docker_env/scripts/metplotpy_env.sh b/internal/scripts/docker_env/scripts/metplotpy_env.sh
@@ -33,4 +33,4 @@ BASE_ENV=metplus_base.${METPLUS_VERSION}
 
 mamba create -y --clone ${BASE_ENV} --name ${ENV_NAME}
 
-mamba install -y --name ${ENV_NAME} -c conda-forge matplotlib==3.6.3 scipy==1.9.3 plotly==5.13.0 xarray==2023.1.0 netcdf4==1.6.2 pyyaml==6.0 python-kaleido==0.2.1 imageio==2.25.0 imutils==0.5.4 scikit-image pint==0.20.1 metpy cartopy==0.21.1
+mamba install -y --name ${ENV_NAME} -c conda-forge matplotlib==3.6.3 scipy>=1.11.1 plotly==5.13.0 xarray==2023.1.0 netcdf4==1.6.2 pyyaml==6.0 python-kaleido>=0.2.1 imageio==2.25.0 imutils==0.5.4 scikit-image==0.19.3 pint==0.20.1 metpy==1.4.0 cartopy==0.21.1