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 outdated cmor_table facet from data finder tests #1798

Merged
merged 1 commit into from
Nov 18, 2022

Conversation

bouweandela
Copy link
Member

@bouweandela bouweandela commented Nov 15, 2022

Description

This removes the cmor_table facet from the esmvalcore/_data_finder.py tests. A long time ago, the CMOR table could be different from the project. This is no longer the case, so it can be removed.

This also adds hist to the list of ignored spelling mistakes, because that raised incorrect warnigns with the pre-commit hook for codespell while trying to commit this change.

Part of #1609


Before you get started

Checklist

It is the responsibility of the author to make sure the pull request is ready to review. The icons indicate whether the item will be subject to the 🛠 Technical or 🧪 Scientific review.


To help with the number pull requests:

@codecov
Copy link

codecov bot commented Nov 15, 2022

Codecov Report

Merging #1798 (1027eaf) into main (4d48ece) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1798   +/-   ##
=======================================
  Coverage   91.51%   91.51%           
=======================================
  Files         202      202           
  Lines       10908    10908           
=======================================
  Hits         9982     9982           
  Misses        926      926           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@bouweandela bouweandela marked this pull request as ready for review November 15, 2022 11:23
@bouweandela bouweandela added this to the v2.8.0 milestone Nov 15, 2022
@valeriupredoi
Copy link
Contributor

the CMOR table could be different from the project

it still is, I don't understand this - CMIP5 CMOR tables are totally different from CMIP6 CMOR tables, it's just that the handling is done better on our side

Copy link
Contributor

@valeriupredoi valeriupredoi left a comment

Choose a reason for hiding this comment

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

thanks @bouweandela 🍺 There are some more instances of cmor_table in tests/integration/test_recipe.py - do we still need those?

@bouweandela
Copy link
Member Author

Yes, they are function arguments to preprocessor functions

@bouweandela
Copy link
Member Author

@ESMValGroup/technical-lead-development-team could someone please do a final check and merge?

@sloosvel
Copy link
Contributor

A long time ago, the CMOR table could be different from the project. This is no longer the case, so it can be removed.

What do you mean by that? For convenience, internally we have a project that has a certain name but that follows a version of the CMIP6 tables. These changes only affect the tests, but is any further work going to affect the ability of having custom named projects that may follow tables that don't have the same name?

@valeriupredoi
Copy link
Contributor

A long time ago, the CMOR table could be different from the project. This is no longer the case, so it can be removed.

What do you mean by that? For convenience, internally we have a project that has a certain name but that follows a version of the CMIP6 tables. These changes only affect the tests, but is any further work going to affect the ability of having custom named projects that may follow tables that don't have the same name?

This is getting all X-Files now, guys - I was a bit puzzlated by what Bouwe was on about too, but since this is just some test fixing, I thinks it's OK

@bouweandela
Copy link
Member Author

A long time ago, the CMOR table could be different from the project. This is no longer the case, so it can be removed.

What do you mean by that?

I mean that the cmor_table facet is not used anywhere in the code. All uses of it were removed in #358, but even then it was already the same as the project facet for quite some time. When we were just writing version 2, you could specify {project: OBS, cmor_table: CMIP5}, you could dig into the git history if you want to know more..

is any further work going to affect the ability of having custom named projects that may follow tables that don't have the same name?

No. I need to make some changes to esmvalcore/_data_finder.py in #1609 to support wildcard searches, that's why I was looking at the tests and noticed this bit of ancient history and decided to remove it.

@sloosvel
Copy link
Contributor

Great, thanks! I will merge now

@sloosvel sloosvel merged commit 4d96890 into main Nov 18, 2022
@sloosvel sloosvel deleted the remove-unnessary-facets branch November 18, 2022 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants