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

Update CMORizers and recipes for ESMValCore v2.0.0 #1699

Merged
merged 10 commits into from Jul 21, 2020
Merged

Conversation

SarahAlidoost
Copy link
Contributor

@SarahAlidoost SarahAlidoost commented Jul 3, 2020

Before you start, please read our contribution guidelines.

Please discuss your idea with the development team before getting started, to avoid disappointment later. The way to do this is to open a new issue on GitHub. If you are planning to modify an existing functionality, please discuss it with the original author(s) by tagging them in the issue.


Tasks

  • Create an issue to discuss what you are going to do, if you haven't done so already (and add the link at the bottom)
  • Give this pull request a descriptive title that can be used as a one line summary in a changelog
  • Make sure your code is composed of functions of no more than 50 lines and uses meaningful names for variables
  • Circle/CI tests pass. Status can be seen below your pull request. If the tests are failing, click the link to find out why.
  • Preferably Codacy code quality checks pass, however a few remaining hard to solve Codacy issues are still acceptable. Status can be seen below your pull request. If there is an error, click the link to find out why. If you suspect Codacy may be wrong, please ask by commenting.
  • Please use yamllint to check that your YAML files do not contain mistakes
  • (Only if really necessary) Add any additional dependencies needed for the diagnostic script to setup.py, esmvaltool/install/R/r_requirements.txt or esmvaltool/install/Julia/Project.toml (depending on the language of your script) and also to package/meta.yaml for conda dependencies (includes Python and others, but not R/Julia)
  • If new dependencies are introduced, check that the license is compatible with Apache2.0

New recipe/diagnostic

  • Add documentation for the recipe to the doc/sphinx/source/recipes folder and add a new entry to index.rst
  • Add provenance information

Modified recipe/diagnostic

  • Update documentation for the recipe to the doc/sphinx/source/recipes folder
  • Update provenance information if needed
  • Assign the author(s) of the affected recipe(s) as reviewer(s)

New data reformatting script

  • Test the CMORized data using recipes/example/recipe_check_obs.yml, to make sure the CMOR checks pass without errors
  • Add the new dataset to the table in the documentation
  • Tag @mattiarighi in this pull request, so that the new dataset can be added to the OBS data pool at DKRZ and synchronized with CEDA-Jasmin

Modified data reformatting script

  • Test the CMORized data using recipes/example/recipe_check_obs.yml, to make sure the CMOR checks pass without errors
  • Tag @mattiarighi in this pull request, so that the updated dataset can be added to the OBS data pool at DKRZ and synchronized with CEDA-Jasmin

If you need help with any of the tasks above, please do not hesitate to ask by commenting in the issue or pull request.


Closes #issue_number

@SarahAlidoost
Copy link
Contributor Author

SarahAlidoost commented Jul 3, 2020

For this PR, esmvalcore is installed in develop mode from the branch v2.0.0.
With this PR, running python setup.py test and pytest tests/ locally result only one error as:

FLAKE8 - AttributeError: 'Application' object has no attribute 'parse_preliminary_options_and_args'

However, CI here complains about another error:

Too long with no output (exceeded 20m0s): context deadline exceeded

@SarahAlidoost SarahAlidoost marked this pull request as ready for review Jul 3, 2020
@SarahAlidoost SarahAlidoost requested a review from bouweandela Jul 3, 2020
@bouweandela
Copy link
Member

bouweandela commented Jul 6, 2020

Thanks for making the pull request!

With this PR, running python setup.py test and pytest tests/ locally result only one error as:
FLAKE8 - AttributeError: 'Application' object has no attribute 'parse_preliminary_options_and_args'

This can be solved by upgrading the flake8 package so it matches the pytest-flake8 package.

However, CI here complains about another error:
Too long with no output (exceeded 20m0s): context deadline exceeded

This was an intermittent error, clicking the re-run button on CircleCI solved it.

The test are now failing (as expected) because they need the esmvalcore 2.0.0 package, which is not available on conda yet, because we haven't released it yet.

@bouweandela bouweandela added this to the v2.0.0 milestone Jul 8, 2020
@bouweandela bouweandela changed the title Fix any failing tests Update CMORizers and recipes for ESMValCore v2.0.0 Jul 10, 2020
@bouweandela bouweandela added the requires new ESMValCore release A new release of ESMValCore is needed to solve this issue/merge this pull request.. label Jul 10, 2020
@bouweandela
Copy link
Member

bouweandela commented Jul 20, 2020

@mattiarighi Could you please test and merge when you think it's ready?

@bouweandela bouweandela requested a review from mattiarighi Jul 20, 2020
@bouweandela bouweandela removed the requires new ESMValCore release A new release of ESMValCore is needed to solve this issue/merge this pull request.. label Jul 20, 2020
@mattiarighi
Copy link
Contributor

mattiarighi commented Jul 21, 2020

Successfully tested recipe_wenzel14jgr and a two cmorizers (both NCL and Python).

@mattiarighi mattiarighi merged commit 45eef27 into master Jul 21, 2020
1 check passed
@mattiarighi mattiarighi deleted the fix_tests branch Jul 21, 2020
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