Skip to content

Pr 44 changes#45

Merged
mzecc merged 21 commits intoopenscm:mainfrom
mzecc:pr-44-mz
Mar 17, 2026
Merged

Pr 44 changes#45
mzecc merged 21 commits intoopenscm:mainfrom
mzecc:pr-44-mz

Conversation

@mzecc
Copy link
Copy Markdown
Collaborator

@mzecc mzecc commented Mar 5, 2026

Description

Made hash check optional for historical emissions. Swapped hashes between Windows and the others.

Checklist

Please confirm that this pull request has done the following:

  • Tests added
  • Documentation added (where applicable)
  • Changelog item added to changelog/

Copy link
Copy Markdown
Collaborator

@znichollscr znichollscr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice. I'll post the changelog entries to add, then we're good to merge

Comment thread src/gcages/cmip7_scenariomip/harmonisation.py
Comment thread docs/how-to-guides/how-to-run-the-cmip7-scenariomip-workflow.py
Comment thread pyproject.toml
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mzecc can you undo the changes to this file before merging please (git fetch origin && git checkout origin/main pyproject.toml && git commit -m "Revert changes to pyproject.toml"). I think I made these changes by mistake

Copy link
Copy Markdown
Collaborator Author

@mzecc mzecc Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reverted the changes of the pyproject.toml. Could it be that tests are failing because of it?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes but not for the reason we think. I missed that you were working in a fork, so we got the version of pyproject.toml which is in your fork's main branch, not https://github.com/openscm/gcages's main branch. See mzecc#3 for fixes

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(You can see that things haven't worked as expected because there are still changes to pyproject.toml in this PR, when there shouldn't be any if you grab the latest version that is in main)

@znichollscr
Copy link
Copy Markdown
Collaborator

CHANGELOG entries to add

# changelog/45.feature.md

Added global-level harmonisation in line with what was used for CMIP7 ScenarioMIP, see [gcages.cmip7_scenariomip.harmonisation][]. Note that this is still being tweaked so will change in future.

# changelog/45.breaking.md

- renamed `harmonise_scenario` to `harmonise_single_scenario` in [gcages.ar6.harmonisation][]
- renamed `year` to `harmonisation_year` in [gcages.ar6.harmonisation.harmonise_single_scenario][]
- Renamed `KEY_TESTING_MODEL_SCENARIOS` to `KEY_AR6_TESTING_MODEL_SCENARIOS` in [gcages.testing][]
- added a required `model_scenarios` argument to [gcages.testing.get_key_testing_model_scenario_parameters][]

@znichollscr
Copy link
Copy Markdown
Collaborator

Ok @mzecc good to merge

@mzecc mzecc merged commit 11193c6 into openscm:main Mar 17, 2026
39 of 40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants