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.

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

Remove emergency region renaming #184

Merged
merged 5 commits into from Dec 17, 2018
Merged

Conversation

znicholls
Copy link
Collaborator

@znicholls znicholls commented Dec 12, 2018

Pull request

Please confirm that this pull request has done the following:

  • Tests added
  • Documentation added (where applicable)
  • Example added (either to an existing notebook or as a new notebook, where applicable)
  • Description in CHANGELOG.rst added

Adding to CHANGELOG.rst

Please add a single line in the changelog notes similar to one of the following:

- (`#XX <http://link-to-pr.com>`_) Added feature which does something
- (`#XX <http://link-to-pr.com>`_) Fixed bug identified in (`#XX <http://link-to-issue.com>`_)

@rgieseke @lewisjared going to have to test this one locally, make sure you've got latest version of the MAGICC master branch. Your CFG needs to look like this too

  FILE_EMISSCEN =  "NONE",  ! you can leave a scenario here if you want
  FILE_EMISSCEN_2 =  "NONE",
  FILE_EMISSCEN_3 =  "NONE",
  FILE_EMISSCEN_4 =  "NONE",
  FILE_EMISSCEN_5 =  "NONE",
  FILE_EMISSCEN_6 =  "NONE",
  FILE_EMISSCEN_7 =  "",
  FILE_EMISSCEN_8 =  "",
  FILE_TUNINGMODEL_1 =  "PYMAGICC",
  FILE_TUNINGMODEL_2 =  "USER",
  FILE_TUNINGMODEL_3 =  "USER",
  FILE_TUNINGMODEL_4 =  "USER",
  FILE_TUNINGMODEL_5 =  "USER",
  FILE_TUNINGMODEL_6 =  "USER",
  FILE_TUNINGMODEL_7 =  "USER",
  FILE_TUNINGMODEL_8 =  "USER",
  FILE_TUNINGMODEL_9 =  "USER",
  FILE_TUNINGMODEL_10 =  "USER",

@znicholls znicholls changed the title Remove emergency region renaming WIP: Remove emergency region renaming Dec 12, 2018
@znicholls znicholls self-assigned this Dec 12, 2018
@znicholls znicholls changed the title WIP: Remove emergency region renaming Remove emergency region renaming Dec 12, 2018
@znicholls
Copy link
Collaborator Author

@rgieseke @lewisjared good to follow #183

@znicholls znicholls force-pushed the remove-emergency-region-renaming branch from 0c62236 to 7f06018 Compare December 12, 2018 23:21
tests/test_api.py Outdated Show resolved Hide resolved
Copy link
Member

@rgieseke rgieseke left a comment

Choose a reason for hiding this comment

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

Looks good to me, just a tiny question ...

Copy link
Collaborator

@lewisjared lewisjared left a comment

Choose a reason for hiding this comment

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

Nice tidyup. Can confirm that this works with a fresh checkout of master for magicc (only needed some changes to MAGCFG_USER.CFG)

@znicholls
Copy link
Collaborator Author

@lewisjared can you hit the button (trying to avoid merge request authors doing the merging)

@lewisjared
Copy link
Collaborator

Is the default practise to squash or rebase?

@znicholls
Copy link
Collaborator Author

znicholls commented Dec 17, 2018 via email

@lewisjared lewisjared merged commit a0ff917 into master Dec 17, 2018
@rgieseke rgieseke deleted the remove-emergency-region-renaming branch June 13, 2019 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants