Skip to content

PI-3745: Stereographic plotting example using netcdf instead of GRIB data #3746

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Jun 26, 2020
Merged

PI-3745: Stereographic plotting example using netcdf instead of GRIB data #3746

merged 4 commits into from
Jun 26, 2020

Conversation

@pp-mo
Copy link
Member

@pp-mo pp-mo commented Jun 18, 2020 •
edited
Loading

This finally addresses #3745, by providing a replacement for the example plot that was relying on GRIB source data. The new plot uses different data (in netcdf).
Hopefully, the alternative is good enough.

Closes #3745

@pp-mo pp-mo changed the title Netcdf stereo example Stereographic plotting example using netcdf instead of GRIB data Jun 18, 2020
This was referenced Jun 18, 2020
Merged
Closed
trexfeathers
trexfeathers approved these changes Jun 22, 2020
View reviewed changes
Copy link
Contributor

@trexfeathers trexfeathers left a comment

Choose a reason for hiding this comment

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

Thanks @pp-mo! I've tested this locally and I believe the new file demonstrates polar stereographic as well as the old one. I will hold off merging until discussion is complete on SciTools/iris-sample-data#27

@trexfeathers
Copy link
Contributor

Can also confirm that Travis is passing. Link may have been broken by the PR name change.

@trexfeathers
Copy link
Contributor

@pp-mo now that I've merged SciTools/iris-sample-data#27, are you happy that this PR is no longer WIP?

@pp-mo
Copy link
Member Author

pp-mo commented Jun 24, 2020

are you happy that this PR is no longer WIP?

Absolutely 😁

@pp-mo pp-mo mentioned this pull request Jun 24, 2020
Merged
@trexfeathers
Copy link
Contributor

I'm holding off until #3742 is merged as that seems like the less confusing sequence IMO

trexfeathers
trexfeathers requested changes Jun 25, 2020
View reviewed changes
Copy link
Contributor

@trexfeathers trexfeathers left a comment

Choose a reason for hiding this comment

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

As expected, #3742 has caused this PR to have a conflict. @pp-mo please could you resolve this so that I can proceed with the merge? Thanks

@pp-mo pp-mo force-pushed the netcdf_stereo_example branch from 9600c73 to e464083 Compare June 25, 2020 10:28
@pp-mo
Copy link
Member Author

pp-mo commented Jun 25, 2020 •
edited
Loading

Thanks @trexfeathers
So, I pushed an extra merge commit to fix the merge problem.
I applied the @abooton method here : producing a manual merge commit to fix problems, instead of rebasing.
Dead easy in this case !

Unfortunately though .. it seems the conflict isn't the whole remaining problem...
What we missed was that the original "green tick" appearing above is actually missing a Travis test (don't ask me why, this continues to happen sporadically).
So, the problem is that we need to release a new iris-sample-data to get this working.
Watch this space ...

@pp-mo
Copy link
Member Author

pp-mo commented Jun 25, 2020

SciTools/iris-sample-data#28 refers.
If someone can address that, then I'll cut a new iris-sample-data version 2.3.

Then, of course, we will need another PR to bump the sample-data version to "2.4.0dev".

@pp-mo
Copy link
Member Author

pp-mo commented Jun 25, 2020 •
edited
Loading

If someone can address that, then I'll cut a new iris-sample-data version 2.3.

Actually no, now we need a friendly reviewer on the conda-forge feedstock : conda-forge/iris-sample-data-feedstock#9
Not you or me, as we don't have merge there. Possibly @bjlittle if he gets there first.

Quite a little dance, isn't it ?

Now sorted !

@pp-mo
Copy link
Member Author

pp-mo commented Jun 25, 2020

Next to do: check for availability on conda-forge channel, then re-spin here...

trexfeathers
trexfeathers requested changes Jun 25, 2020
View reviewed changes
Copy link
Contributor

@trexfeathers trexfeathers left a comment

Choose a reason for hiding this comment

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

@pp-mo I wasn't aware that we did graphics tests on the examples. But looking at the failed tests that clearly is the case and we'll need to make the necessary changes to imagerepo.json and test-iris-imagehash.

@pp-mo
Copy link
Member Author

pp-mo commented Jun 25, 2020

Oh bother 😫
It seems we need a new image hash, and a new file in test-iris-imagehash too.
I think I only ran the docs build, not the example tests.

  • so, now that seems obvious !

@pp-mo
Copy link
Member Author

pp-mo commented Jun 25, 2020 •
edited
Loading

@trexfeathers I wasn't aware that we did graphics tests on the examples

Sorry, missed your update when I posted my latest.
Yes, for each sourcefile in ./docs/iris/example_code there is a matching runnable test in ./docs/iris/example_tests (though the division into separate subfolders is not preserved).

I just hadn't run them. And of course it wouldn't run on Travis till we got the new sample-data release.

@pp-mo
Copy link
Member Author

pp-mo commented Jun 25, 2020

Here we go ... SciTools/test-iris-imagehash#34

@pp-mo
Copy link
Member Author

pp-mo commented Jun 25, 2020 •
edited
Loading

"New image hash"

This is going to fail again.
Now failing, as expected.
But should be OK on respin, once SciTools/test-iris-imagehash#34 is merged.

@pp-mo pp-mo added this to the v3.0.0 milestone Jun 25, 2020
@pp-mo pp-mo changed the title Stereographic plotting example using netcdf instead of GRIB data PI#3745 : Stereographic plotting example using netcdf instead of GRIB data Jun 25, 2020
@pp-mo pp-mo changed the title PI#3745 : Stereographic plotting example using netcdf instead of GRIB data PI-3745: Stereographic plotting example using netcdf instead of GRIB data Jun 25, 2020
@trexfeathers
Copy link
Contributor

Hooray! 🎉
Merging before anything else happens

@trexfeathers trexfeathers merged commit dd5f1fe into SciTools:master Jun 26, 2020
tkknight added a commit to tkknight/iris that referenced this pull request Jun 26, 2020
@tkknight
Merge branch 'master' into docs_overhaul
0e1065a 
* master:
  PI-3745: Stereographic plotting example using netcdf instead of GRIB data (SciTools#3746)
tkknight added a commit to tkknight/iris that referenced this pull request Jun 29, 2020
@tkknight
Merge branch 'docs_overhaul' of github.com:tkknight/iris into docs_ov…
63a06cf 
…erhaul

* 'docs_overhaul' of github.com:tkknight/iris:
  some changes
  Clean build (almost)
  tidy README
  tidy
  PI-3745: Stereographic plotting example using netcdf instead of GRIB data (SciTools#3746)
  svg to png
  reinstate grib examples
  minor tweak
  Remove iris-grib dependency from Iris tests. (SciTools#3742)
  added download option for pdf
  travis test for linkcheck
  travis test
  new travis job to run linkcheck
  fixed links
  tidy rtd build
  rtd test 16
  rtd test 15
  rtd test 14
  rtd test 13
  rtd test 12
tkknight added a commit to tkknight/iris that referenced this pull request Jun 29, 2020
@tkknight
Merge branch 'docs_overhaul' of github.com:tkknight/iris into docs_ov…
78267b5 
…erhaul

* 'docs_overhaul' of github.com:tkknight/iris: (122 commits)
  squash it
  some changes
  Clean build (almost)
  tidy README
  tidy
  PI-3745: Stereographic plotting example using netcdf instead of GRIB data (SciTools#3746)
  svg to png
  reinstate grib examples
  minor tweak
  Remove iris-grib dependency from Iris tests. (SciTools#3742)
  added download option for pdf
  travis test for linkcheck
  travis test
  new travis job to run linkcheck
  fixed links
  tidy rtd build
  rtd test 16
  rtd test 15
  rtd test 14
  rtd test 13
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@trexfeathers trexfeathers trexfeathers approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v3.0.0

Development

Successfully merging this pull request may close these issues.

Completely remove iris-grib from Iris testing

2 participants

@pp-mo @trexfeathers