Skip to content

Commit

Permalink
Bugfix diff tests (#2217)
Browse files Browse the repository at this point in the history
  • Loading branch information
georgemccabe authored Jun 16, 2023
1 parent 6ad1d5e commit 7e6add7
Show file tree
Hide file tree
Showing 5 changed files with 302 additions and 162 deletions.
2 changes: 2 additions & 0 deletions .github/jobs/run_difference_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ matrix_categories=$1
artifact_name=$2

.github/jobs/setup_and_run_diff.py ${matrix_categories} $artifact_name
ret=$?

if [ "$( ls -A ${RUNNER_WORKSPACE}/diff)" ]; then
echo "upload_diff=true" >> $GITHUB_OUTPUT
Expand All @@ -21,3 +22,4 @@ if [ "$( ls -A ${RUNNER_WORKSPACE}/diff)" ]; then
fi

echo "upload_diff=false" >> $GITHUB_OUTPUT
exit $ret
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ ENV/
# pytest cache files
*.pytest_cache*

.idea

# tilda files generated by emacs
*~

Expand Down
7 changes: 5 additions & 2 deletions internal/scripts/docker_env/scripts/diff_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

################################################################################
# Environment: diff.v5.1
# Last Updated: 2023-01-31 (mccabe@ucar.edu)
# Last Updated: 2023-06-14 (mccabe@ucar.edu)
# Notes: Adds packages needed to run differences tests to compare output to
# truth data.
# Python Packages:
# pandas==2.0.2
# pillow==9.2.0
# pdf2image==1.16.0
#
Expand All @@ -23,8 +24,10 @@ ENV_NAME=diff.${METPLUS_VERSION}
BASE_ENV=netcdf4.${METPLUS_VERSION}

conda create -y --clone ${BASE_ENV} --name ${ENV_NAME}
conda install -y --name ${ENV_NAME} -c conda-forge pandas==2.0.2
conda install -y --name ${ENV_NAME} -c conda-forge pillow==9.2.0

apt install -y poppler-utils
apt-get update
apt-get install -y poppler-utils

conda install -y --name ${ENV_NAME} -c conda-forge pdf2image==1.16.0
Loading

0 comments on commit 7e6add7

Please sign in to comment.