From 6f9b740ff07669cae3794e0c01a2a8ac72e4d5f0 Mon Sep 17 00:00:00 2001 From: Adrien Perrin Date: Wed, 20 May 2020 13:55:27 +0200 Subject: [PATCH 1/4] update setup.py version to 1.0.0 --- .travis.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba3b6241..e7210c5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ services: env: global: - - BASE_IMAGE_NAME="${DOCKER_ORG}/geospaas:v0.4" + - BASE_IMAGE_NAME="${DOCKER_ORG}/geospaas:v1.0.0" - METANORM_VERSION='0.0.3' jobs: diff --git a/setup.py b/setup.py index 364282db..189894f8 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setuptools.setup( name="geospaas_harvesting", - version="0.0.7", + version="1.0.0", author="Adrien Perrin", author_email="adrien.perrin@nersc.no", description="Metadata harvesting tool for GeoSPaaS", From d446c84e322912213a3cd2486664a3f10d78ef9a Mon Sep 17 00:00:00 2001 From: Adrien Perrin Date: Thu, 25 Jun 2020 14:27:42 +0200 Subject: [PATCH 2/4] update base image (geospaas) version to v1.0.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cf40d04e..b563a0f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nansencenter/geospaas:v0.4 as base +FROM nansencenter/geospaas:v1.0.0 as base ARG METANORM_VERSION=0.0.3 RUN pip install --no-cache-dir \ From 939db84e8348387fbde243fc10ba2910cc2feee4 Mon Sep 17 00:00:00 2001 From: Adrien Perrin Date: Thu, 25 Jun 2020 15:14:35 +0200 Subject: [PATCH 3/4] update metanorm version to 1.0.0 --- .travis.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e7210c5d..77f057d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ services: env: global: - BASE_IMAGE_NAME="${DOCKER_ORG}/geospaas:v1.0.0" - - METANORM_VERSION='0.0.3' + - METANORM_VERSION='1.0.0' jobs: include: diff --git a/Dockerfile b/Dockerfile index b563a0f4..b703d72a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM nansencenter/geospaas:v1.0.0 as base -ARG METANORM_VERSION=0.0.3 +ARG METANORM_VERSION=1.0.0 RUN pip install --no-cache-dir \ https://github.com/nansencenter/metanorm/releases/download/${METANORM_VERSION}/metanorm-${METANORM_VERSION}-py3-none-any.whl \ graypy==2.1.0 \ From a4ab40d8e08844d7627b31f44bfe562fdcfeddca Mon Sep 17 00:00:00 2001 From: Adrien Perrin Date: Thu, 25 Jun 2020 13:38:42 +0000 Subject: [PATCH 4/4] adapt unit tests to metanorm improvement --- tests/test_ingesters.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/test_ingesters.py b/tests/test_ingesters.py index 66926aa5..07e43645 100644 --- a/tests/test_ingesters.py +++ b/tests/test_ingesters.py @@ -537,9 +537,8 @@ def test_get_normalized_attributes(self): year=2020, month=3, day=18, hour=6, minute=23, second=30, microsecond=975000, tzinfo=tzutc())) - self.assertEqual(normalized_parameters['instrument']['Short_Name'], 'SAR') - self.assertEqual(normalized_parameters['instrument']['Long_Name'], - 'Synthetic Aperture Radar') + self.assertEqual(normalized_parameters['instrument']['Short_Name'], 'SENTINEL-1 C-SAR') + self.assertEqual(normalized_parameters['instrument']['Long_Name'], '') self.assertEqual(normalized_parameters['instrument']['Category'], 'Earth Remote Sensing Instruments') self.assertEqual(normalized_parameters['instrument']['Subtype'], '')