From 1d3438c1d8e1bed83638e69925f040ffd3475d19 Mon Sep 17 00:00:00 2001 From: Lisah Ligono Date: Thu, 22 Oct 2026 14:32:15 +0200 Subject: [PATCH 1/4] Register GEM-E3_V2026_EU --- .../GEM-E3/GEM-E3_V2026_EU.yaml | 293 ++++++++++++++++++ mappings/GEM-E3/GEM-E3_V2026_EU.yaml | 137 ++++++++ 2 files changed, 430 insertions(+) create mode 100644 definitions/region/native_regions/GEM-E3/GEM-E3_V2026_EU.yaml create mode 100644 mappings/GEM-E3/GEM-E3_V2026_EU.yaml diff --git a/definitions/region/native_regions/GEM-E3/GEM-E3_V2026_EU.yaml b/definitions/region/native_regions/GEM-E3/GEM-E3_V2026_EU.yaml new file mode 100644 index 00000000..c0fb2df7 --- /dev/null +++ b/definitions/region/native_regions/GEM-E3/GEM-E3_V2026_EU.yaml @@ -0,0 +1,293 @@ +- GEM-E3_V2026_EU: + - GEM-E3_V2026_EU|World + - GEM-E3_V2026_EU|European Union: + countries: + - Austria + - Belgium + - Bulgaria + - Croatia + - Cyprus + - Czechia + - Denmark + - Estonia + - Finland + - France + - Germany + - Greece + - Hungary + - Ireland + - Italy + - Latvia + - Lithuania + - Luxembourg + - Malta + - Netherlands + - Poland + - Portugal + - Romania + - Slovakia + - Slovenia + - Spain + - Sweden + - GEM-E3_V2026_EU|United Kingdom: + countries: + - United Kingdom + - GEM-E3_V2026_EU|USA: + countries: + - United States + - GEM-E3_V2026_EU|Japan: + countries: + - Japan + - GEM-E3_V2026_EU|Canada: + countries: + - Canada + - GEM-E3_V2026_EU|Brazil: + countries: + - Brazil + - GEM-E3_V2026_EU|China: + countries: + - China + - GEM-E3_V2026_EU|India: + countries: + - India + - GEM-E3_V2026_EU|South Korea + - GEM-E3_V2026_EU|Indonesia: + countries: + - Indonesia + - GEM-E3_V2026_EU|Mexico: + countries: + - Mexico + - GEM-E3_V2026_EU|Argentina: + countries: + - Argentina + - GEM-E3_V2026_EU|Turkey: + countries: + - Turkey + - GEM-E3_V2026_EU|Saudi Arabia: + countries: + - Saudi Arabia + - GEM-E3_V2026_EU|Oceania: + countries: + - Australia + - New Zealand + - GEM-E3_V2026_EU|Russian Federation: + countries: + - Russian Federation + - GEM-E3_V2026_EU|United Arab Emirates: + countries: + - United Arab Emirates + - GEM-E3_V2026_EU|Rest of Energy Producing Countries: + countries: + - Algeria + - Azerbaijan + - Iran + - Iraq + - Jordan + - Kuwait + - Lebanon + - Libya + - Nigeria + - Qatar + - Syria + - Venezuela + - Western Sahara + - Yemen + - GEM-E3_V2026_EU|South Africa: + countries: + - South Africa + - GEM-E3_V2026_EU|Rest of Europe: + countries: + - Belarus + - Bosnia and Herzegovina + - Iceland + - Kosovo + - Liechtenstein + - Moldova + - Monaco + - Montenegro + - North Macedonia + - Norway + - Serbia + - Switzerland + - Ukraine + - Vatican + - GEM-E3_V2026_EU|Rest of the World: + countries: + - Afghanistan + - Åland Islands + - Albania + - American Samoa + - Andorra + - Angola + - Anguilla + - Antarctica + - Antigua and Barbuda + - Armenia + - Aruba + - Bahamas + - Bahrain + - Bangladesh + - Barbados + - Belize + - Benin + - Bermuda + - Bhutan + - Bolivia + - Bonaire, Sint Eustatius and Saba + - Botswana + - Bouvet Island + - British Indian Ocean Territory + - British Virgin Islands + - Brunei Darussalam + - Burkina Faso + - Burundi + - Cabo Verde + - Cambodia + - Cameroon + - Cayman Islands + - Central African Republic + - Chad + - Chile + - Christmas Island + - Cocos (Keeling) Islands + - Colombia + - Comoros + - Congo + - Cook Islands + - Costa Rica + - Côte d'Ivoire + - Cuba + - Curaçao + - Democratic Republic of the Congo + - Djibouti + - Dominica + - Dominican Republic + - Ecuador + - Egypt + - El Salvador + - Equatorial Guinea + - Eritrea + - Eswatini + - Ethiopia + - Falkland Islands (Malvinas) + - Faroe Islands + - Fiji + - French Guiana + - French Polynesia + - French Southern Territories + - Gabon + - Gambia + - Georgia + - Ghana + - Gibraltar + - Greenland + - Grenada + - Guadeloupe + - Guam + - Guatemala + - Guernsey + - Guinea + - Guinea-Bissau + - Guyana + - Haiti + - Heard Island and McDonald Islands + - Honduras + - Hong Kong + - Isle of Man + - Israel + - Jamaica + - Jersey + - Kazakhstan + - Kenya + - Kiribati + - Kyrgyzstan + - Laos + - Lesotho + - Liberia + - Macao + - Madagascar + - Malawi + - Malaysia + - Maldives + - Mali + - Marshall Islands + - Martinique + - Mauritania + - Mauritius + - Mayotte + - Micronesia + - Mongolia + - Montserrat + - Morocco + - Mozambique + - Myanmar + - Namibia + - Nauru + - Nepal + - New Caledonia + - Nicaragua + - Niger + - Niue + - Norfolk Island + - North Korea + - Northern Mariana Islands + - Oman + - Pakistan + - Palau + - Palestine + - Panama + - Papua New Guinea + - Paraguay + - Peru + - Philippines + - Pitcairn + - Puerto Rico + - Réunion + - Rwanda + - Saint Barthélemy + - Saint Helena, Ascension and Tristan da Cunha + - Saint Kitts and Nevis + - Saint Lucia + - Saint Martin (French part) + - Saint Pierre and Miquelon + - Saint Vincent and the Grenadines + - Samoa + - San Marino + - Sao Tome and Principe + - Senegal + - Seychelles + - Sierra Leone + - Singapore + - Sint Maarten (Dutch part) + - Solomon Islands + - Somalia + - South Georgia and the South Sandwich Islands + - South Korea + - South Sudan + - Sri Lanka + - Sudan + - Suriname + - Svalbard and Jan Mayen + - Taiwan + - Tajikistan + - Tanzania + - Thailand + - Timor-Leste + - Togo + - Tokelau + - Tonga + - Trinidad and Tobago + - Tunisia + - Turkmenistan + - Turks and Caicos Islands + - Tuvalu + - Uganda + - United States Minor Outlying Islands + - United States Virgin Islands + - Uruguay + - Uzbekistan + - Vanuatu + - Viet Nam + - Wallis and Futuna + - Zambia + - Zimbabwe diff --git a/mappings/GEM-E3/GEM-E3_V2026_EU.yaml b/mappings/GEM-E3/GEM-E3_V2026_EU.yaml new file mode 100644 index 00000000..7c0e9ac0 --- /dev/null +++ b/mappings/GEM-E3/GEM-E3_V2026_EU.yaml @@ -0,0 +1,137 @@ +model: GEM-E3_V2026_EU +native_regions: +- WORLD: GEM-E3_V2026_EU|World +- EU27: GEM-E3_V2026_EU|European Union +- GBR: GEM-E3_V2026_EU|United Kingdom +- USA: GEM-E3_V2026_EU|USA +- JPN: GEM-E3_V2026_EU|Japan +- CAN: GEM-E3_V2026_EU|Canada +- BRA: GEM-E3_V2026_EU|Brazil +- CHN: GEM-E3_V2026_EU|China +- IND: GEM-E3_V2026_EU|India +- KOR: GEM-E3_V2026_EU|South Korea +- IDN: GEM-E3_V2026_EU|Indonesia +- MEX: GEM-E3_V2026_EU|Mexico +- ARG: GEM-E3_V2026_EU|Argentina +- TUR: GEM-E3_V2026_EU|Turkey +- SAR: GEM-E3_V2026_EU|Saudi Arabia +- OCE: GEM-E3_V2026_EU|Oceania +- RUS: GEM-E3_V2026_EU|Russian Federation +- ARE: GEM-E3_V2026_EU|United Arab Emirates +- REP: GEM-E3_V2026_EU|Rest of Energy Producing Countries +- SAF: GEM-E3_V2026_EU|South Africa +- REU: GEM-E3_V2026_EU|Rest of Europe +- ROW: GEM-E3_V2026_EU|Rest of the World +common_regions: +- World: + - ARE + - ARG + - BRA + - CAN + - CHN + - EU27 + - GBR + - IDN + - IND + - JPN + - KOR + - MEX + - OCE + - REP + - REU + - ROW + - RUS + - SAF + - SAR + - TUR + - USA +- Asia (R5): + - CHN + - IND + - KOR + - IDN +- Latin America (R5): + - BRA + - MEX + - ARG +- Middle East & Africa (R5): + - SAR + - ARE + - REP + - SAF +- OECD & EU (R5): + - EU27 + - GBR + - USA + - JPN + - CAN + - TUR + - OCE + - REU +- Other (R5): + - ROW +- Reforming Economies (R5): + - RUS +- Africa (R10): + - SAF +- China+ (R10): + - CHN + - KOR +- Europe (R10): + - EU27 + - GBR + - TUR + - REU +- India+ (R10): + - IND +- Latin America (R10): + - BRA + - MEX + - ARG +- Middle East (R10): + - SAR + - ARE + - REP +- North America (R10): + - USA + - CAN +- Other (R10): + - ROW +- Pacific OECD (R10): + - JPN + - OCE +- Reforming Economies (R10): + - RUS +- Rest of Asia (R10): + - IDN +- China (R9): + - CHN +- European Union (R9): + - EU27 +- India (R9): + - IND +- Latin America (R9): + - BRA + - MEX + - ARG +- Middle East & Africa (R9): + - SAR + - ARE + - REP + - SAF +- Other (R9): + - ROW +- Other Asia (R9): + - KOR + - IDN +- Other OECD (R9): + - GBR + - JPN + - CAN + - TUR + - OCE + - REU +- Reforming Economies (R9): + - RUS +- USA (R9): + - USA From 1b0e1b58c779f8e377a9d3b52d3cb01e66f3d377 Mon Sep 17 00:00:00 2001 From: Lisah Ligono Date: Thu, 22 Oct 2026 15:13:02 +0200 Subject: [PATCH 2/4] Apply suggestions from code review --- .../GEM-E3/GEM-E3_V2026_EU.yaml | 48 +++++------ mappings/GEM-E3/GEM-E3_V2026_EU.yaml | 79 +++++++++++++------ 2 files changed, 81 insertions(+), 46 deletions(-) diff --git a/definitions/region/native_regions/GEM-E3/GEM-E3_V2026_EU.yaml b/definitions/region/native_regions/GEM-E3/GEM-E3_V2026_EU.yaml index c0fb2df7..4cc31bbc 100644 --- a/definitions/region/native_regions/GEM-E3/GEM-E3_V2026_EU.yaml +++ b/definitions/region/native_regions/GEM-E3/GEM-E3_V2026_EU.yaml @@ -1,6 +1,6 @@ -- GEM-E3_V2026_EU: - - GEM-E3_V2026_EU|World - - GEM-E3_V2026_EU|European Union: +- GEM-E3 V2026-EU: + - GEM-E3 V2026-EU|World + - GEM-E3 V2026-EU|European Union: countries: - Austria - Belgium @@ -29,54 +29,56 @@ - Slovenia - Spain - Sweden - - GEM-E3_V2026_EU|United Kingdom: + - GEM-E3 V2026-EU|United Kingdom: countries: - United Kingdom - - GEM-E3_V2026_EU|USA: + - GEM-E3 V2026-EU|USA: countries: - United States - - GEM-E3_V2026_EU|Japan: + - GEM-E3 V2026-EU|Japan: countries: - Japan - - GEM-E3_V2026_EU|Canada: + - GEM-E3 V2026-EU|Canada: countries: - Canada - - GEM-E3_V2026_EU|Brazil: + - GEM-E3 V2026-EU|Brazil: countries: - Brazil - - GEM-E3_V2026_EU|China: + - GEM-E3 V2026-EU|China: countries: - China - - GEM-E3_V2026_EU|India: + - GEM-E3 V2026-EU|India: countries: - India - - GEM-E3_V2026_EU|South Korea - - GEM-E3_V2026_EU|Indonesia: + - GEM-E3 V2026-EU|South Korea: + countries: + - South Korea + - GEM-E3 V2026-EU|Indonesia: countries: - Indonesia - - GEM-E3_V2026_EU|Mexico: + - GEM-E3 V2026-EU|Mexico: countries: - Mexico - - GEM-E3_V2026_EU|Argentina: + - GEM-E3 V2026-EU|Argentina: countries: - Argentina - - GEM-E3_V2026_EU|Turkey: + - GEM-E3 V2026-EU|Turkey: countries: - Turkey - - GEM-E3_V2026_EU|Saudi Arabia: + - GEM-E3 V2026-EU|Saudi Arabia: countries: - Saudi Arabia - - GEM-E3_V2026_EU|Oceania: + - GEM-E3 V2026-EU|Oceania: countries: - Australia - New Zealand - - GEM-E3_V2026_EU|Russian Federation: + - GEM-E3 V2026-EU|Russian Federation: countries: - Russian Federation - - GEM-E3_V2026_EU|United Arab Emirates: + - GEM-E3 V2026-EU|United Arab Emirates: countries: - United Arab Emirates - - GEM-E3_V2026_EU|Rest of Energy Producing Countries: + - GEM-E3 V2026-EU|Other Major Fossil-Exporting Countries: countries: - Algeria - Azerbaijan @@ -92,10 +94,10 @@ - Venezuela - Western Sahara - Yemen - - GEM-E3_V2026_EU|South Africa: + - GEM-E3 V2026-EU|South Africa: countries: - South Africa - - GEM-E3_V2026_EU|Rest of Europe: + - GEM-E3 V2026-EU|Rest of Europe: countries: - Belarus - Bosnia and Herzegovina @@ -111,7 +113,7 @@ - Switzerland - Ukraine - Vatican - - GEM-E3_V2026_EU|Rest of the World: + - GEM-E3 V2026-EU|Rest of the World: countries: - Afghanistan - Åland Islands diff --git a/mappings/GEM-E3/GEM-E3_V2026_EU.yaml b/mappings/GEM-E3/GEM-E3_V2026_EU.yaml index 7c0e9ac0..5d6854d0 100644 --- a/mappings/GEM-E3/GEM-E3_V2026_EU.yaml +++ b/mappings/GEM-E3/GEM-E3_V2026_EU.yaml @@ -1,27 +1,27 @@ -model: GEM-E3_V2026_EU +model: GEM-E3 V2026-EU native_regions: -- WORLD: GEM-E3_V2026_EU|World -- EU27: GEM-E3_V2026_EU|European Union -- GBR: GEM-E3_V2026_EU|United Kingdom -- USA: GEM-E3_V2026_EU|USA -- JPN: GEM-E3_V2026_EU|Japan -- CAN: GEM-E3_V2026_EU|Canada -- BRA: GEM-E3_V2026_EU|Brazil -- CHN: GEM-E3_V2026_EU|China -- IND: GEM-E3_V2026_EU|India -- KOR: GEM-E3_V2026_EU|South Korea -- IDN: GEM-E3_V2026_EU|Indonesia -- MEX: GEM-E3_V2026_EU|Mexico -- ARG: GEM-E3_V2026_EU|Argentina -- TUR: GEM-E3_V2026_EU|Turkey -- SAR: GEM-E3_V2026_EU|Saudi Arabia -- OCE: GEM-E3_V2026_EU|Oceania -- RUS: GEM-E3_V2026_EU|Russian Federation -- ARE: GEM-E3_V2026_EU|United Arab Emirates -- REP: GEM-E3_V2026_EU|Rest of Energy Producing Countries -- SAF: GEM-E3_V2026_EU|South Africa -- REU: GEM-E3_V2026_EU|Rest of Europe -- ROW: GEM-E3_V2026_EU|Rest of the World +- WORLD: GEM-E3 V2026-EU|World +- EU27: GEM-E3 V2026-EU|European Union +- GBR: GEM-E3 V2026-EU|United Kingdom +- USA: GEM-E3 V2026-EU|USA +- JPN: GEM-E3 V2026-EU|Japan +- CAN: GEM-E3 V2026-EU|Canada +- BRA: GEM-E3 V2026-EU|Brazil +- CHN: GEM-E3 V2026-EU|China +- IND: GEM-E3 V2026-EU|India +- KOR: GEM-E3 V2026-EU|South Korea +- IDN: GEM-E3 V2026-EU|Indonesia +- MEX: GEM-E3 V2026-EU|Mexico +- ARG: GEM-E3 V2026-EU|Argentina +- TUR: GEM-E3 V2026-EU|Turkey +- SAR: GEM-E3 V2026-EU|Saudi Arabia +- OCE: GEM-E3 V2026-EU|Oceania +- RUS: GEM-E3 V2026-EU|Russian Federation +- ARE: GEM-E3 V2026-EU|United Arab Emirates +- REP: GEM-E3 V2026-EU|Other Major Fossil-Exporting Countries +- SAF: GEM-E3 V2026-EU|South Africa +- REU: GEM-E3 V2026-EU|Rest of Europe +- ROW: GEM-E3 V2026-EU|Rest of the World common_regions: - World: - ARE @@ -135,3 +135,36 @@ common_regions: - RUS - USA (R9): - USA +# mapping for G20 members +- Argentina: + - ARG +- Brazil: + - BRA +- Canada: + - CAN +- China: + - CHN +- India: + - IND +- Indonesia: + - IDN +- Japan: + - JPN +- Mexico: + - MEX +- Russian Federation: + - RUS +- Saudi Arabia: + - SAR +- South Africa: + - SAF +- South Korea: + - KOR +- Turkey: + - TUR +- United Arab Emirates: + - ARE +- United Kingdom: + - GBR +- United States: + - USA From 7f70a2bb0945ad0dbc3fcc502f423595273d4102 Mon Sep 17 00:00:00 2001 From: Lisah Ligono Date: Thu, 22 Oct 2026 15:33:29 +0200 Subject: [PATCH 3/4] Unpin SQLAlchemy --- .github/workflows/pytest.yml | 2 +- .github/workflows/validation.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index ddca8b60..5d534dab 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -27,7 +27,7 @@ jobs: python-version: 3.14 - name: Install requirements - run: pip install ${{ matrix.nomenclature }} "SQLAlchemy<2.1.0" + run: pip install ${{ matrix.nomenclature }} - name: Install pytest run: pip install pytest diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index db23e00b..026d1d68 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -28,7 +28,7 @@ jobs: python-version: 3.14 - name: Install requirements - run: pip install ${{ matrix.nomenclature }} "SQLAlchemy<2.1.0" + run: pip install ${{ matrix.nomenclature }} - name: Quickfix for pint https://github.com/hgrecco/pint/issues/1969 run: pip install git+https://github.com/hgrecco/pint.git From 765410704bf701f03097bb54ec535eff1002bf3a Mon Sep 17 00:00:00 2001 From: Lisah Ligono Date: Fri, 23 Oct 2026 12:03:41 +0200 Subject: [PATCH 4/4] Apply suggestions from code review --- .../region/native_regions/GEM-E3/GEM-E3_V2026_EU.yaml | 1 - mappings/GEM-E3/GEM-E3_V2026_EU.yaml | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/definitions/region/native_regions/GEM-E3/GEM-E3_V2026_EU.yaml b/definitions/region/native_regions/GEM-E3/GEM-E3_V2026_EU.yaml index 4cc31bbc..21291f6f 100644 --- a/definitions/region/native_regions/GEM-E3/GEM-E3_V2026_EU.yaml +++ b/definitions/region/native_regions/GEM-E3/GEM-E3_V2026_EU.yaml @@ -1,5 +1,4 @@ - GEM-E3 V2026-EU: - - GEM-E3 V2026-EU|World - GEM-E3 V2026-EU|European Union: countries: - Austria diff --git a/mappings/GEM-E3/GEM-E3_V2026_EU.yaml b/mappings/GEM-E3/GEM-E3_V2026_EU.yaml index 5d6854d0..1f124962 100644 --- a/mappings/GEM-E3/GEM-E3_V2026_EU.yaml +++ b/mappings/GEM-E3/GEM-E3_V2026_EU.yaml @@ -1,6 +1,5 @@ model: GEM-E3 V2026-EU native_regions: -- WORLD: GEM-E3 V2026-EU|World - EU27: GEM-E3 V2026-EU|European Union - GBR: GEM-E3 V2026-EU|United Kingdom - USA: GEM-E3 V2026-EU|USA @@ -135,7 +134,7 @@ common_regions: - RUS - USA (R9): - USA -# mapping for G20 members +# G20 members and key regions - Argentina: - ARG - Brazil: @@ -144,6 +143,11 @@ common_regions: - CAN - China: - CHN +- European Union: + - EU27 +- European Union and United Kingdom: + - EU27 + - GBR - India: - IND - Indonesia: