From ae078957e990f6e7f493ccf298e1f56ce1e7bff1 Mon Sep 17 00:00:00 2001
From: nickb <nickb@ssec.wisc.edu>
Date: Wed, 2 Dec 2020 20:24:24 +0000
Subject: [PATCH] migrate the pip dependencies from package.sh to our conda
environment file. this will include them in our buildbucket & keeps our
package script leaner.
---
buildbucket/buildbucket_environment.yaml | 9 ++++++++-
buildbucket/package.sh | 19 +------------------
2 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/buildbucket/buildbucket_environment.yaml b/buildbucket/buildbucket_environment.yaml
index 2f6a619..12c8e8a 100644
--- a/buildbucket/buildbucket_environment.yaml
+++ b/buildbucket/buildbucket_environment.yaml
@@ -16,8 +16,15 @@ dependencies:
- setuptools
- xarray
- zarr
+ # satpy dependencies:
- configobj
- pykdtree
- pyresample
- trollsift
- - trollimage
\ No newline at end of file
+ - trollimage
+ - shapely
+ - pip:
+ - git+https://github.com/deeplycloudy/lmatools.git@minvaluegrids
+ - git+https://github.com/deeplycloudy/stormdrain.git
+ - git+https://github.com/deeplycloudy/glmtools.git@master
+ - git+https://github.com/pytroll/satpy.git@feature-scmi-multivar
\ No newline at end of file
diff --git a/buildbucket/package.sh b/buildbucket/package.sh
index 5978cc2..fd950e8 100755
--- a/buildbucket/package.sh
+++ b/buildbucket/package.sh
@@ -25,13 +25,8 @@ fi
pkg_name=cspp-geo-gridded-glm-${version}
DIST=${DIST:-"/dock"}
-LMATOOLS_REF=${LMATOOLS_REF:-"minvaluegrids"}
-GLMTOOLS_REF=${GLMTOOLS_REF:-"master"}
-GLMTOOLS_REPOS=${GLMTOOLS_REPOS:-"https://github.com/deeplycloudy/glmtools.git"}
GGLM_REPOS=${GGLM_REPOS:-"https://gitlab.ssec.wisc.edu/cspp_geo/cspp-geo-gridded-glm.git"}
GGLM_REF=${GGLM_REF:-"master"}
-SATPY_REPOS=${SATPY_REPOS:-"https://github.com/pytroll/satpy.git"}
-SATPY_REF=${SATPY_REF:-"feature-scmi-multivar"}
MINIFY_TARBALL=${MINIFY_TARBALL:-1}
make_dockerfile() {
@@ -55,23 +50,11 @@ which python
conda info -a
conda list --export
echo "Version specified: ${version}"
-echo "lmatools reference: ${LMATOOLS_REF}"
-echo "glmtools reference: ${GLMTOOLS_REF}"
# Turn on command printing here because we don't need all of the `conda`
# internal bash commands to pollute our output
set -x
-# Install glmtools and related packages
-# All dependencies should have been built with the buildbucket
-# Careful: Could result in missing dependencies but we want reproducibility
-pip install --no-deps git+https://github.com/deeplycloudy/lmatools.git@${LMATOOLS_REF}
-pip install --no-deps git+https://github.com/deeplycloudy/stormdrain.git
-pip install --no-deps git+${GLMTOOLS_REPOS}@${GLMTOOLS_REF}
-
-# Install satpy
-pip install --no-deps git+${SATPY_REPOS}@${SATPY_REF}
-
# get the current packages files
# if the caller mounted the repository already then use that
GGLM_DIR="/work/cspp-geo-gridded-glm/gridded_glm"
@@ -81,7 +64,7 @@ fi
# Build a tarball version of the current conda environment
# TODO: Add conda cleanup commands similar to what Polar2Grid uses to save space
-conda_tb=conda_lmatools-${LMATOOLS_REF}_glmtools-${GLMTOOLS_REF}.tar.gz
+conda_tb=conda_gglm.tar.gz
conda clean -ay # remove unnecessary things from conda environment
conda pack --n-threads $(nproc) -n build -o ${conda_tb}
--
GitLab