From 2963f6a63069defd3a07c1ec528163ce9489b1ab Mon Sep 17 00:00:00 2001 From: Heiko Date: Fri, 16 Oct 2020 12:58:04 +0200 Subject: [PATCH] Rollback to ecCodes 2.18.0. Problems with DWD definitions fixed. --- Makefile | 2 ++ README.md | 4 ++-- hooks/env | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3d1ee6a..b6c85d8 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ SHELL := /bin/bash # test TEST_CMD := python -m eccodes selfcheck +TEST2_CMD := grib_ls /samples/icon_global.grib2 # load variables from ./hooks/env DATE := ${shell . ./hooks/env && echo $$DATE} @@ -27,6 +28,7 @@ run-interactive: test: @docker run --rm -i -t ${IMAGE_NAME} ${TEST_CMD} + @docker run --rm -i -t ${IMAGE_NAME} ${TEST2_CMD} login: @docker login diff --git a/README.md b/README.md index 75772df..333b6bb 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ Python and [ECMWF ecCodes](https://github.com/ecmwf/eccodes) packaged in a Docker container to allow for easy processing of GRIB2 and BUFR files. [![Python Version](https://img.shields.io/badge/python-3.7.9-informational)](https://hub.docker.com/_/python) -[![ecCodes Version](https://img.shields.io/badge/ecCodes-2.19.0-informational)](https://github.com/ecmwf/eccodes) -[![ecCodes-Python Version](https://img.shields.io/static/v1?label=eccodes-python&message=1.0.0&color=informational)](https://github.com/ecmwf/eccodes-python) +[![ecCodes Version](https://img.shields.io/badge/ecCodes-2.18.0-informational)](https://github.com/ecmwf/eccodes) +[![ecCodes-Python Version](https://img.shields.io/static/v1?label=eccodes-python&message=0.9.9&color=informational)](https://github.com/ecmwf/eccodes-python) [![Docker Build Status](https://img.shields.io/docker/cloud/build/deutscherwetterdienst/python-eccodes.svg)](https://hub.docker.com/r/deutscherwetterdienst/python-eccodes) [![Docker Pulls](https://img.shields.io/docker/pulls/deutscherwetterdienst/python-eccodes)](https://hub.docker.com/r/deutscherwetterdienst/python-eccodes) diff --git a/hooks/env b/hooks/env index 0514ab3..bc35dc6 100755 --- a/hooks/env +++ b/hooks/env @@ -5,10 +5,10 @@ [ -n "$SOURCE_URL" ] || SOURCE_URL=https://github.com/deutscherwetterdienst/python-eccodes [ -n "$DOCKER_REPO" ] || DOCKER_REPO=deutscherwetterdienst/python-eccodes -[ -n "$ECBUILD_VERSION" ] || ECBUILD_VERSION="3.4.0" -[ -n "$ECCODES_VERSION" ] || ECCODES_VERSION="2.19.0" +[ -n "$ECBUILD_VERSION" ] || ECBUILD_VERSION="3.3.5" +[ -n "$ECCODES_VERSION" ] || ECCODES_VERSION="2.18.0" [ -n "$DWD_GRIB_DEFINITIONS_VERSION" ] || DWD_GRIB_DEFINITIONS_VERSION="2.14.1-1" -[ -n "$PYTHON_ECCODES_VERSION" ] || PYTHON_ECCODES_VERSION="1.0.0" +[ -n "$PYTHON_ECCODES_VERSION" ] || PYTHON_ECCODES_VERSION="0.9.9" [ -n "$PYTHON_VERSION" ] || PYTHON_VERSION="3.7.9" [ -n "$SOURCE_BRANCH" ] || SOURCE_BRANCH=$(git symbolic-ref -q --short HEAD)