Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor tweaks to correct issues in CMIP6Plus_CV.json generation #59

Merged
merged 16 commits into from
Feb 20, 2024
Merged

Minor tweaks to correct issues in CMIP6Plus_CV.json generation #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
977aa6d
#58: Minor tweaks to institution string generation and correction to …
matthew-mizielinski Feb 19, 2024
487305b
Automatically generated CVs/CMIP6Plus_CV.json: 2024-02-19 11:22
Feb 19, 2024
b420e2d
#58: attempt to fix tagging script
matthew-mizielinski Feb 19, 2024
0019c02
Merge branch 'issue58_matthew-mizielinski_minor-tweaks-CV-json' of gi…
matthew-mizielinski Feb 19, 2024
e9f797f
Automatically generated CVs/CMIP6Plus_CV.json: 2024-02-19 11:29
Feb 19, 2024
2fb606d
#58: 2nd attempt to fix tagging script
matthew-mizielinski Feb 19, 2024
8bbd62a
Tag and Release (#56)
wolfiex Feb 19, 2024
6437bc4
Tag and Release (#56)
wolfiex Feb 19, 2024
7fdba35
Tag and Release (#56)
wolfiex Feb 19, 2024
586a1ca
Tag and Release (#56)
wolfiex Feb 19, 2024
5c23269
Tag and Release (#56)
wolfiex Feb 19, 2024
ccaec00
Tag and Release (#56)
wolfiex Feb 19, 2024
2916c4e
Tag and Release (#56)
wolfiex Feb 19, 2024
7c6cb1f
Tag and Release (#56)
wolfiex Feb 19, 2024
4759e62
Tag and Release (#56)
wolfiex Feb 19, 2024
d1e8c18
Tag and Release (#56)
wolfiex Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/libs/create_cv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,11 @@ def notnull(dictionary, keys,replace='none'):
institutions = {**read_json_from_github('PCMDI', mip_tables, 'main', f'{table_prefix}institutions.json'),**read_json_from_github('PCMDI', mip_tables, 'main', f'{table_prefix}consortiums.json')}

def mapinst(i):
if i in institutions:
return f"{institutions[i]['indentifiers']['ror']} - {institutions[i]['indentifiers']['institution_name']}"
if i in institutions:
if institutions[i]['indentifiers']['ror']:
return f"{institutions[i]['indentifiers']['ror']} - {institutions[i]['indentifiers']['institution_name']}"
else:
return f"{institutions[i]['indentifiers']['institution_name']}"
elif i in institutions['consortiums']:
return f"{i} - {institutions['consortiums'][i]['name']} [consortium]"
else:
Expand Down Expand Up @@ -254,7 +257,7 @@ def mapinst(i):

components_str = "\n".join(components)

CV[entry][model]['source'] = f"{model_info['source_id']} ({model_info['release_year']}: \n{components_str})"
CV[entry][model]['source'] = f"{model_info['source_id']} ({model_info['release_year']}): \n{components_str})"


for d in 'model_component release_year label label_extended'.split():
Expand Down
10 changes: 5 additions & 5 deletions .github/libs/tag.py
View file
Open in desktop
wolfiex marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@

w,x,y,z = map(int,version.strip('v').strip().split('.'))

MIPERA = 'CMIP6Plus'
new = OrderedDict(repo=dict(mipera=MIPERA,repo=repo,url=url),changelog={})
comment = ''
new['repo']['version'] = 'none'

if branch == 'main':

MIPERA = 'CMIP6Plus'
new = OrderedDict(repo=dict(mipera=MIPERA,repo=repo,url=url),changelog={})
comment = ''


# If not wcrp-cmip, do not create this.

files = ['activity_id','experiment_id','source_id']
Expand Down
10 changes: 5 additions & 5 deletions CMIP6Plus_DRS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"Header": {
"collection": {
"CV_collection_version": "v6.5.1.0",
"CV_collection_modified": "2023-11-20T16:32:10Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.0.0",
"CV_collection_modified": "2024-02-12T16:13:34Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.1.0",
"specs_doc": "v6.5.0"
},
"file": {
"checksum": "md5: 87c4ebd7d94fc626cbbf6c848a978996",
"DRS_update_commit": "8a5ecc14d6a5d84c4a828f67fd537f4daf80d761",
"DRS_modified": "Mon Feb 12 16:11:03 2024 +0000",
"DRS_note": "Tag and Release (#56)"
"DRS_update_commit": "",
"DRS_modified": "",
"DRS_note": ""
},
"author": "Daniel Ellis",
"institution_id": "CMIP-IPO"
Expand Down
10 changes: 5 additions & 5 deletions CMIP6Plus_activity_id.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"Header": {
"collection": {
"CV_collection_version": "v6.5.1.0",
"CV_collection_modified": "2023-11-20T16:32:10Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.0.0",
"CV_collection_modified": "2024-02-12T16:13:34Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.1.0",
"specs_doc": "v6.5.0"
},
"file": {
"checksum": "md5: 13f76cb7b0cd1075fcb440b6e22afb64",
"activity_id_update_commit": "8a5ecc14d6a5d84c4a828f67fd537f4daf80d761",
"activity_id_modified": "Mon Feb 12 16:11:03 2024 +0000",
"activity_id_note": "Tag and Release (#56)"
"activity_id_update_commit": "",
"activity_id_modified": "",
"activity_id_note": ""
},
"author": "Daniel Ellis",
"institution_id": "CMIP-IPO"
Expand Down
10 changes: 5 additions & 5 deletions CMIP6Plus_experiment_id.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"Header": {
"collection": {
"CV_collection_version": "v6.5.1.0",
"CV_collection_modified": "2023-11-20T16:32:10Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.0.0",
"CV_collection_modified": "2024-02-12T16:13:34Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.1.0",
"specs_doc": "v6.5.0"
},
"file": {
"checksum": "md5: 1a4a72c633e489915a42fd482466a494",
"experiment_id_update_commit": "8a5ecc14d6a5d84c4a828f67fd537f4daf80d761",
"experiment_id_modified": "Mon Feb 12 16:11:03 2024 +0000",
"experiment_id_note": "Tag and Release (#56)"
"experiment_id_update_commit": "",
"experiment_id_modified": "",
"experiment_id_note": ""
},
"author": "Daniel Ellis",
"institution_id": "CMIP-IPO"
Expand Down
10 changes: 5 additions & 5 deletions CMIP6Plus_license.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"Header": {
"collection": {
"CV_collection_version": "v6.5.1.0",
"CV_collection_modified": "2023-11-20T16:32:10Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.0.0",
"CV_collection_modified": "2024-02-12T16:13:34Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.1.0",
"specs_doc": "v6.5.0"
},
"file": {
"checksum": "md5: 6239ce228dc3dc4f7aca7035ddced0c2",
"license_update_commit": "8a5ecc14d6a5d84c4a828f67fd537f4daf80d761",
"license_modified": "Mon Feb 12 16:11:03 2024 +0000",
"license_note": "Tag and Release (#56)"
"license_update_commit": "",
"license_modified": "",
"license_note": ""
},
"author": "Daniel Ellis",
"institution_id": "CMIP-IPO"
Expand Down
10 changes: 5 additions & 5 deletions CMIP6Plus_mip_era.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"Header": {
"collection": {
"CV_collection_version": "v6.5.1.0",
"CV_collection_modified": "2023-11-20T16:32:10Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.0.0",
"CV_collection_modified": "2024-02-12T16:13:34Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.1.0",
"specs_doc": "v6.5.0"
},
"file": {
"checksum": "md5: 15ab5b39a4b62012e371f14e3c2afbfc",
"mip_era_update_commit": "8a5ecc14d6a5d84c4a828f67fd537f4daf80d761",
"mip_era_modified": "Mon Feb 12 16:11:03 2024 +0000",
"mip_era_note": "Tag and Release (#56)"
"mip_era_update_commit": "",
"mip_era_modified": "",
"mip_era_note": ""
},
"author": "Daniel Ellis",
"institution_id": "CMIP-IPO"
Expand Down
10 changes: 5 additions & 5 deletions CMIP6Plus_product.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"Header": {
"collection": {
"CV_collection_version": "v6.5.1.0",
"CV_collection_modified": "2023-11-20T16:32:10Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.0.0",
"CV_collection_modified": "2024-02-12T16:13:34Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.1.0",
"specs_doc": "v6.5.0"
},
"file": {
"checksum": "md5: 0f0c81450ca204c2c537226f19927022",
"product_update_commit": "8a5ecc14d6a5d84c4a828f67fd537f4daf80d761",
"product_modified": "Mon Feb 12 16:11:03 2024 +0000",
"product_note": "Tag and Release (#56)"
"product_update_commit": "",
"product_modified": "",
"product_note": ""
},
"author": "Daniel Ellis",
"institution_id": "CMIP-IPO"
Expand Down
10 changes: 5 additions & 5 deletions CMIP6Plus_required_global_attributes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"Header": {
"collection": {
"CV_collection_version": "v6.5.1.0",
"CV_collection_modified": "2023-11-20T16:32:10Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.0.0",
"CV_collection_modified": "2024-02-12T16:13:34Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.1.0",
"specs_doc": "v6.5.0"
},
"file": {
"checksum": "md5: 707ac1977a119878fc4fa113b3e2e67f",
"required_global_attributes_update_commit": "8a5ecc14d6a5d84c4a828f67fd537f4daf80d761",
"required_global_attributes_modified": "Mon Feb 12 16:11:03 2024 +0000",
"required_global_attributes_note": "Tag and Release (#56)"
"required_global_attributes_update_commit": "",
"required_global_attributes_modified": "",
"required_global_attributes_note": ""
},
"author": "Daniel Ellis",
"institution_id": "CMIP-IPO"
Expand Down
10 changes: 5 additions & 5 deletions CMIP6Plus_source_id.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"Header": {
"collection": {
"CV_collection_version": "v6.5.1.0",
"CV_collection_modified": "2023-11-20T16:32:10Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.0.0",
"CV_collection_modified": "2024-02-12T16:13:34Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.1.0",
"specs_doc": "v6.5.0"
},
"file": {
"checksum": "md5: 3f8858d55a1c5d022c51ed17240832a0",
"source_id_update_commit": "8a5ecc14d6a5d84c4a828f67fd537f4daf80d761",
"source_id_modified": "Mon Feb 12 16:11:03 2024 +0000",
"source_id_note": "Tag and Release (#56)"
"source_id_update_commit": "",
"source_id_modified": "",
"source_id_note": ""
},
"author": "Daniel Ellis",
"institution_id": "CMIP-IPO"
Expand Down
10 changes: 5 additions & 5 deletions CMIP6Plus_sub_experiment_id.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"Header": {
"collection": {
"CV_collection_version": "v6.5.1.0",
"CV_collection_modified": "2023-11-20T16:32:10Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.0.0",
"CV_collection_modified": "2024-02-12T16:13:34Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.1.0",
"specs_doc": "v6.5.0"
},
"file": {
"checksum": "md5: 96bc2528e51412d3d8ab2889170bd0ed",
"sub_experiment_id_update_commit": "8a5ecc14d6a5d84c4a828f67fd537f4daf80d761",
"sub_experiment_id_modified": "Mon Feb 12 16:11:03 2024 +0000",
"sub_experiment_id_note": "Tag and Release (#56)"
"sub_experiment_id_update_commit": "",
"sub_experiment_id_modified": "",
"sub_experiment_id_note": ""
},
"author": "Daniel Ellis",
"institution_id": "CMIP-IPO"
Expand Down
10 changes: 5 additions & 5 deletions CMIP6Plus_tracking_id.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"Header": {
"collection": {
"CV_collection_version": "v6.5.1.0",
"CV_collection_modified": "2023-11-20T16:32:10Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.0.0",
"CV_collection_modified": "2024-02-12T16:13:34Z",
"CV_collection_release": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs/releases/tag/v6.5.1.0",
"specs_doc": "v6.5.0"
},
"file": {
"checksum": "md5: 73347d15310b24f863ddab04ce5fb821",
"tracking_id_update_commit": "8a5ecc14d6a5d84c4a828f67fd537f4daf80d761",
"tracking_id_modified": "Mon Feb 12 16:11:03 2024 +0000",
"tracking_id_note": "Tag and Release (#56)"
"tracking_id_update_commit": "",
"tracking_id_modified": "",
"tracking_id_note": ""
},
"author": "Daniel Ellis",
"institution_id": "CMIP-IPO"
Expand Down
Loading