Merge remote-tracking branch 'origin/grader-samba' into grader-samba

eWaterCycle · Aug 28, 2024 · 6c48305 · 6c48305
2 parents e18d662 + 3c2d10e
commit 6c48305
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 46 deletions.
diff --git a/roles/ewatercycle/defaults/main.yml b/roles/ewatercycle/defaults/main.yml
@@ -19,4 +19,4 @@ apptainer_image_root: '{{ data_root }}/singularity-images'
 home_root: /home
 # Version of ewatercycle Python package
 # /etc/ewatercycle.yaml will be slightly different depending on version.
-pyewatercycle_version: 2.1.0
+pyewatercycle_version: 2.2.0
diff --git a/roles/grdc/defaults/main.yml b/roles/grdc/defaults/main.yml
@@ -12,18 +12,4 @@ grdc_station_zips:
   - ftp://ftp.bafg.de/pub/REFERATE/GRDC/catalogue/grdc_stations.zip
 # Archycos daily zip url
 grds_archycos_day_zip: ftp://ftp.bafg.de/pub/REFERATE/GRDC/ARC_HYCOS/arc_hycos_day.zip
-# Global Terrestrial Network for River Discharge (GTN-R) datasets
-# https://www.bafg.de/GRDC/EN/04_spcldtbss/44_GTNR/GTN-R%20SOS2.html
-grdc_gtnr:
-  - id: 1
-    name: WMO Region 1 (Africa)
-    stations: ftp://ftp.bafg.de/pub/REFERATE/GRDC/website/GTNR_ONLINE_1.txt
-    periods:
-      - range: 1931-1960
-        url: https://gemstat.bafg.de/KiWISGRDC/KiWIS?datasource=1&service=SOS&version=2.0&request=GetObservation&featureOfInterest=http://gemstat.bafg.de/stations/1104150,1104530,1159100,1160235,1160378,1160500,1160580,1160684,1160788,1160880,1255100,1257100,1259100,1445100,1732100,1733600&temporalFilter=phenomenonTime,1931-01-01T00:00:00.000Z/1960-12-31T00:00:00.000Z
-      - range: 1961-1990
-        url: https://gemstat.bafg.de/KiWISGRDC/KiWIS?datasource=1&service=SOS&version=2.0&request=GetObservation&featureOfInterest=http://gemstat.bafg.de/stations/1104150,1104530,1159100,1160235,1160378,1160500,1160580,1160684,1160788,1160880,1255100,1257100,1259100,1445100,1732100,1733600&temporalFilter=phenomenonTime,1961-01-01T00:00:00.000Z/1990-12-31T00:00:00.000Z
-      - range: 1981-2010
-        url: https://gemstat.bafg.de/KiWISGRDC/KiWIS?datasource=1&service=SOS&version=2.0&request=GetObservation&featureOfInterest=http://gemstat.bafg.de/stations/1104150,1104530,1159100,1160235,1160378,1160500,1160580,1160684,1160788,1160880,1255100,1257100,1259100,1445100,1732100,1733600&temporalFilter=phenomenonTime,1981-01-01T00:00:00.000Z/2010-12-31T00:00:00.000Z
-  # TODO add all regions
-grdc_researchdrive_archives: []
+# TODO fetch grdc data from dcache
diff --git a/roles/grdc/tasks/gtnr.yml b/roles/grdc/tasks/gtnr.yml
diff --git a/roles/grdc/tasks/main.yml b/roles/grdc/tasks/main.yml
@@ -37,9 +37,6 @@
   loop: '{{ grdc_station_zips }}'
 - name: archycos
   include_tasks: archycos.yml
-- name: GTN-R
-  include_tasks: gtnr.yml
-  loop: '{{ grdc_gtnr }}'
 - name: researchdrive archives
   include_tasks: researchdrive.yml
   loop: '{{ grdc_researchdrive_archives }}'
diff --git a/roles/grdc/tasks/researchdrive.yml b/roles/grdc/tasks/researchdrive.yml
diff --git a/roles/jupyter/templates/jupyterhub_config.py.j2 b/roles/jupyter/templates/jupyterhub_config.py.j2
@@ -45,3 +45,5 @@ c.JupyterHub.cleanup_proxy = False
 c.JupyterHub.base_url = '/jupyter'
 
 c.JupyterHub.template_vars = {'announcement_login': 'By logging in you accept the GRDC observation data policy at https://www.bafg.de/GRDC/EN/01_GRDC/12_plcy/data_policy_node.html'}
+
+c.Authenticator.allow_all = True