diff --git a/api/package-lock.json b/api/package-lock.json index ce76a440..c0357607 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -1,12 +1,12 @@ { "name": "openclimate-hub-controller", - "version": "1.18.0-rc.0", + "version": "1.20.1-rc.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "openclimate-hub-controller", - "version": "1.18.0-rc.0", + "version": "1.20.1-rc.0", "license": "Apache-2.0", "dependencies": { "@elastic/elasticsearch": "^8.7.0", diff --git a/api/package.json b/api/package.json index 5af23bca..d864f268 100644 --- a/api/package.json +++ b/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": { diff --git a/import/import_all_data.py b/import/import_all_data.py index e9237cca..cb5089c8 100755 --- a/import/import_all_data.py +++ b/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) \ No newline at end of file + update_actor_data_coverage(args.host, args.dbname, args.user, args.password) diff --git a/ui/package-lock.json b/ui/package-lock.json index 0f80d747..e5711d51 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "open-climate-ui", - "version": "1.19.0", + "version": "1.20.1-rc.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "open-climate-ui", - "version": "1.19.0", + "version": "1.20.1-rc.0", "dependencies": { "-": "0.0.1", "@babel/plugin-proposal-private-property-in-object": "^7.21.11", diff --git a/ui/package.json b/ui/package.json index 32509a97..31a54088 100644 --- a/ui/package.json +++ b/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",