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

Grib1 loading defines a GRIB_PARAM attribute, like grib2 load. #402

Merged
merged 27 commits into from
Apr 18, 2024

Conversation

pp-mo
Copy link
Member

@pp-mo pp-mo commented Apr 9, 2024

Closes #330 #402 #398

TODO:

  • needs at least some doc

Noting that current docs is virtually a single page,

Also, version there on main already needs bumping from 0.18 to 0.19
-- or, it is missing a mergeback from latest release (v0.19.x)
(update : fixed that)

@pp-mo pp-mo self-assigned this Apr 9, 2024
@pp-mo
Copy link
Member Author

pp-mo commented Apr 11, 2024

Note: while fixing + documenting this, I have reworked the single-page docs quite extensively.
Hence now addresses all-of #330 #402 #398
I have also fixed it so all doctests pass -- but I believe this is not enabled at present (#274 ?)

@pp-mo pp-mo marked this pull request as ready for review April 11, 2024 12:41
@pp-mo pp-mo requested a review from trexfeathers April 11, 2024 12:41
trexfeathers added a commit to trexfeathers/iris-grib that referenced this pull request Apr 11, 2024
trexfeathers added a commit that referenced this pull request Apr 11, 2024
* add pyproject.toml and remove setup.py

* adding zip-safe

* fix typo

* fix version

* add validation precommit hook

* making suggested changes

* fix precommit indents

* change test to file

* add pyproj to precommit files

* Description based on #402.

* Selection of keywords from SciTools/iris pyproject.toml.

* Changed dev status classifier to reflect pre-v1 version.

* Revert "Changed dev status classifier to reflect pre-v1 version."

This reverts commit 6f99210.

---------

Co-authored-by: Martin Yeo <[email protected]>
@pp-mo pp-mo marked this pull request as draft April 15, 2024 14:06
@pp-mo pp-mo force-pushed the grib1_param branch 4 times, most recently from 9543454 to fa80016 Compare April 15, 2024 17:15
@trexfeathers
Copy link
Contributor

Note to self, I have previously reviewed up to this point:

368596a Line-length fix.
0c08268 Further docs rework : doctests now working.
089b5b9 Various documentation improvements.
5cff713 fix mock usage.
e60697c Update cube-load result snapshots.
e02158d Shorten line.
30dc4d3 Grib1 loading defines a GRIB_PARAM attribute, like grib2 load.

@pp-mo
Copy link
Member Author

pp-mo commented Apr 16, 2024

STATUS UPDATE 2024-04-16 13:25
pushed a bunch of further changes, to run all checks + chase any additional problems .

Intending when this is fixed to rebase / recast, as this seems to have acquired some merging problems.

@pp-mo
Copy link
Member Author

pp-mo commented Apr 16, 2024

NOTE:
Now re-picked and rebased onto current main.
I think the total resulting change is now easier to review than it was.

The doctest problem remains : it is failing to import iris.tests.stock.
Not clear what triggers this, maybe somehow we are running the doctests differently from Iris ?
May need fixing in Iris itself. Ignore for now ??

@pp-mo pp-mo marked this pull request as ready for review April 16, 2024 13:59
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.

Exhaustive is probably the right word!

Here are a few comments. Cheers!

@trexfeathers
Copy link
Contributor

trexfeathers commented Apr 16, 2024

The doctest problem remains : it is failing to import iris.tests.stock.
Not clear what triggers this, maybe somehow we are running the doctests differently from Iris ?
May need fixing in Iris itself. Ignore for now ??

Even in Iris we have never tried running a doctest that includes content from iris.tests, as far as I can see. I've always strictly stuck to content from iris-sample-data, and that is available to us now thanks to #413. Please could you adjust your doctest to use something from there instead?

@pp-mo
Copy link
Member Author

pp-mo commented Apr 16, 2024

Even in Iris we have never tried running a doctest that includes content from iris.tests, as far as I can see. I've always strictly stuck to content from iris-sample-data, and that is available to us now thanks to #413. Please could you adjust your doctest to use something from there instead?

Good thinking. 💯
I'll take a look at that.

@trexfeathers
Copy link
Contributor

I have now reviewed up to: Fix doctests: don't use iris.tests

@pp-mo
Copy link
Member Author

pp-mo commented Apr 18, 2024

I have now reviewed up to: Fix doctests: don't use iris.tests

That's good!
I think I may have some nasty merge/rebasing to sort out now, but if you've reviewed up to the latest that I can force push again if I need to.
I also have the unadressed points above to cover, but I think that all that can be done afterwards without the references to existing commits. I'll sort out those changes, bank them somewhere + re-apply when I've fixed the conflicts.

@trexfeathers trexfeathers merged commit 569d5a1 into SciTools:main Apr 18, 2024
9 checks passed
@pp-mo
Copy link
Member Author

pp-mo commented Apr 18, 2024

@trexfeathers Thanks so much for sticking with it !
🎖️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

No documentation of GRIB_PARAM
2 participants