Merge branch 'udpate_base_image_version'

nansencenter · Jun 25, 2020 · a7c2179 · a7c2179
2 parents e3f9cc2 + a4ab40d
commit a7c2179
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,8 +11,8 @@ services:
 
 env:
   global:
-    - BASE_IMAGE_NAME="${DOCKER_ORG}/geospaas:v0.4"
-    - METANORM_VERSION='0.0.3'
+    - BASE_IMAGE_NAME="${DOCKER_ORG}/geospaas:v1.0.0"
+    - METANORM_VERSION='1.0.0'
 
 jobs:
   include:

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
-FROM nansencenter/geospaas:v0.4 as base
+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 \

diff --git 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'], '')