Fix start years #123

malininae · 2022-10-04T19:37:09Z

Hi all,

Here is a pull request to change the start years for ERA5 to 1959 and ERA5-Land to 1950 for both. I checked and they both work. The test, which returns assertation error for ERA5-Land being outside the bounds was removed. This pull request resolves issue #122.

I was thinking of adding a warning, in case one wants to download a preliminary version from 1959 to 1978, but by the looks of it, era5cli doesn't use warnings package. Let me know if I should add the warning in some fashion, or just leave it as it is.

I also humbly added my name to the creators list, but if you think the contribution is too small, feel free to remove it. Please, let me know if anything else needs to be done.

Cheers

… ERA5-Land test for inaccecibility of the years prior to 1981

codecov · 2022-10-04T20:14:27Z

Codecov Report

❗ No coverage uploaded for pull request base (back_extension_update@970226a). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files

@@                   Coverage Diff                    @@
##             back_extension_update     #123   +/-   ##
========================================================
  Coverage                         ?   98.94%           
========================================================
  Files                            ?        6           
  Lines                            ?      379           
  Branches                         ?        0           
========================================================
  Hits                             ?      375           
  Misses                           ?        4           
  Partials                         ?        0

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 970226a...fde53b0. Read the comment docs.

bvreede

Thanks so much @malininae! Indeed, this is a very necessary update, so we are very happy with your contribution.

There is a couple changes I'm requesting; small, and they should be largely as suggested commits, so I hope it is not too much work for you.

First off, we are very happy to have you recognized as a contributor! 🎉
The new version release, however, I'd like to do as a separate PR, and it would be good to focus this PR on the change in startyear. So, I'm suggesting to revert some version changes you proposed in this PR.

I've also changed the base of the PR, so we can merge this to a branch that allows us to add a few more changes before we merge it to main.

Thanks again for your contribution!

CITATION.cff

era5cli/__version__.py

era5cli/cli.py

Peter9192

Thanks for the PR! We'd have to make a new release for the changes to be available through pip and conda. Also we might want to think about deprecating support for the preliminary back extension, but that's for later.

@malininae are you OK with us taking over from here and getting it ready and released?

Peter9192 · 2022-10-18T08:12:05Z

tests/test_cli.py

-    # no land available for back extension
-    argv = ['monthly', '--startyear', '1980', '--endyear', '1980',
-            '--variables', 'total_precipitation', '--synoptic',
-            '--ensemble', '--land']
-    args = cli._parse_args(argv)
-    with pytest.raises(AssertionError):
-        cli._execute(args)
-


While this test was a bit ill-described, I do think it is important to keep it, in a slightly modified form. We need to raise an error if the --land and --prelimbe flags are used together, as there is no back extension for era5-land.

@Peter9192, thanks for the suggestion, I looked into it. So, if I understand correctly this particular test was more about --land being incompatible with the years prior to 1981, not back extension as comment says. The incompatibility of --prelimbe and --land are tested in test_fetch.py, because it is the place that gives you the ValueError, if those two tags are used together. As highlighted in #130, the request with --ensemble and --land actually goes through but fails on the cdsapi end. My suggestion is, for this pull request delete this test, and I will open a new PR with adding the AssertionError in case --ensemble and --land are used together. Then, I will re-add this test, but testing the --ensemble and --land. What do you think? @bvreede what's your opinion?

Right! So I did notice that there was a discrepancy between the description (land and back extension not compatible) and the actual test (land not available for years prior to 1981). But you're right, I overlooked that there's also the issue of --land and --ensemble being incompatible. Your suggested approach sounds good to me 👍

btw @bvreede is on holiday until next week

Thanks for figuring this out; indeed, that's a good idea, let's do it!

CITATION.cff

malininae · 2022-10-18T20:04:49Z

@bvreede @Peter9192 Thanks! I will clean it up next week if you don't mind, it's pretty straight forward, so I'm good from here!

Co-authored-by: Barbara Vreede <b.vreede@esciencecenter.nl>

bvreede

Thanks @malininae! My apologies for the delay on reviewing this; it got snowed under after I got back from holiday.

I'm happy to merge this now; let's also fix the issue you raised in #130 and make a new release!

bvreede · 2022-11-23T12:06:12Z

tests/test_cli.py

-    # no land available for back extension
-    argv = ['monthly', '--startyear', '1980', '--endyear', '1980',
-            '--variables', 'total_precipitation', '--synoptic',
-            '--ensemble', '--land']
-    args = cli._parse_args(argv)
-    with pytest.raises(AssertionError):
-        cli._execute(args)
-


Thanks for figuring this out; indeed, that's a good idea, let's do it!

Elizaveta Malinina added 2 commits October 4, 2022 12:15

changing start year to 1959 for ERA5 and 1950 for ERA5-Land, removing…

bc485c1

… ERA5-Land test for inaccecibility of the years prior to 1981

changing version number, adding Liza to the list of authors

23edd96

bvreede self-requested a review October 4, 2022 20:11

bvreede changed the base branch from main to back_extension_update October 16, 2022 11:37

bvreede suggested changes Oct 16, 2022

View reviewed changes

CITATION.cff Outdated Show resolved Hide resolved

CITATION.cff Outdated Show resolved Hide resolved

era5cli/__version__.py Outdated Show resolved Hide resolved

era5cli/__version__.py Outdated Show resolved Hide resolved

era5cli/cli.py Outdated Show resolved Hide resolved

Peter9192 mentioned this pull request Oct 18, 2022

Deprecate preliminary back extension support #124

Closed

Peter9192 approved these changes Oct 18, 2022

View reviewed changes

malininae and others added 7 commits October 24, 2022 15:24

revert CITATION.cff to the previous release date

440d233

Co-authored-by: Barbara Vreede <b.vreede@esciencecenter.nl>

revert CITATION.cff to the previous number

73b30d5

Co-authored-by: Barbara Vreede <b.vreede@esciencecenter.nl>

Removing Liza from era5cli/__version__.py

56bd56b

Co-authored-by: Barbara Vreede <b.vreede@esciencecenter.nl>

Update era5cli/cli.py

b1b98dd

Co-authored-by: Barbara Vreede <b.vreede@esciencecenter.nl>

updating tests for --land and years out of range

8355950

Update era5cli/__version__.py

ac29aed

Co-authored-by: Barbara Vreede <b.vreede@esciencecenter.nl>

modifying message if ERA5-Land is used with the back extension

fde53b0

malininae requested a review from bvreede October 25, 2022 19:21

Peter9192 mentioned this pull request Oct 26, 2022

No error message if using --land and --ensemble #130

Closed

bvreede approved these changes Nov 23, 2022

View reviewed changes

bvreede changed the base branch from back_extension_update to main November 23, 2022 12:13

bvreede merged commit 5d6b67d into eWaterCycle:main Nov 29, 2022

bvreede mentioned this pull request Dec 12, 2022

Prepare release for v 1.3.2 #132

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix start years #123

Fix start years #123

malininae commented Oct 4, 2022

codecov bot commented Oct 4, 2022 •

edited

Loading

bvreede left a comment

Peter9192 left a comment

Peter9192 Oct 18, 2022

malininae Oct 25, 2022

Peter9192 Oct 26, 2022

Peter9192 Oct 26, 2022

bvreede Nov 23, 2022

malininae commented Oct 18, 2022

bvreede left a comment

bvreede Nov 23, 2022

Fix start years #123

Fix start years #123

Conversation

malininae commented Oct 4, 2022

codecov bot commented Oct 4, 2022 • edited Loading

Codecov Report

bvreede left a comment

Choose a reason for hiding this comment

Peter9192 left a comment

Choose a reason for hiding this comment

Peter9192 Oct 18, 2022

Choose a reason for hiding this comment

malininae Oct 25, 2022

Choose a reason for hiding this comment

Peter9192 Oct 26, 2022

Choose a reason for hiding this comment

Peter9192 Oct 26, 2022

Choose a reason for hiding this comment

bvreede Nov 23, 2022

Choose a reason for hiding this comment

malininae commented Oct 18, 2022

bvreede left a comment

Choose a reason for hiding this comment

bvreede Nov 23, 2022

Choose a reason for hiding this comment

codecov bot commented Oct 4, 2022 •

edited

Loading