Merge tag 'v1.20.1-rc.0'

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclimate-hub-controller",
-  "version": "1.19.0",
+  "version": "1.20.1-rc.0",
   "private": true,
   "license": "Apache-2.0",
   "dependencies": {

import/import_all_data.py

@@ -24,6 +24,10 @@ def import_all_data(zipfileurl, processed, host, dbname, user, password):
         "UNLOCODE"
     ]
 
+    # Do these overrides last
+
+    postreqs = ["IBGE:agregados-prelimares-por-municipios-br:2024-03-20"]
+
     for prereq in prereqs:
         logger.info(f'Importing {prereq}')
         import_openclimate_data(processed + '/' + prereq, host, dbname, user, password)
@@ -33,13 +37,17 @@ def import_all_data(zipfileurl, processed, host, dbname, user, password):
     logger.info('Beginning import')
 
     for f in pp.iterdir():
-        if f.is_dir() and f.name not in prereqs:
+        if f.is_dir() and f.name not in prereqs and f.name not in postreqs:
             logger.info(f'Importing {f.name}')
             try:
                 import_openclimate_data(str(f), host, dbname, user, password)
             except Exception as err:
                 logger.error('Error importing %s: %s', f.name, err)
 
+    for postreq in postreqs:
+        logger.info(f"Importing {postreq}")
+        import_openclimate_data(processed + "/" + postreq, host, dbname, user, password)
+
     if zipfileurl:
         shutil.rmtree(expand_path)
 
@@ -56,4 +64,4 @@ def import_all_data(zipfileurl, processed, host, dbname, user, password):
     parser.add_argument('--processed', help='directory with subdirectories', default=os.environ.get('PROCESSED_DATA_DIR'))
     args = parser.parse_args()
     import_all_data(args.zipfileurl, args.processed, args.host, args.dbname, args.user, args.password)
-    update_actor_data_coverage(args.host, args.dbname, args.user, args.password)
+    update_actor_data_coverage(args.host, args.dbname, args.user, args.password)

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-climate-ui",
-  "version": "1.19.0",
+  "version": "1.20.1-rc.0",
   "private": true,
   "dependencies": {
     "-": "0.0.1",