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.

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

Travis test with both Iris latest-release and latest-master. #231

Merged
merged 7 commits into from
Oct 6, 2020
Merged

Travis test with both Iris latest-release and latest-master. #231

merged 7 commits into from
Oct 6, 2020

Conversation

pp-mo
Copy link
Member

@pp-mo pp-mo commented Oct 5, 2020 •
edited
Loading

Targetting the "f__tes-iris-master" feature branch.

This is intended to develop the feature-branch for testing against latest iris, with a staged development, tested at each commit.
Plan :

  1. test against Iris both old (2.4) and new (3.0.0.rc0)
    * it will fail when testing the 3.0rc
  2. add fixes to tests for Iris 3
    * it will succeed against Iris3, and now fail against 2.4
  3. restrict to testing against latest-master only (**)
    * passes : mergable to the feature-branch

(**) : at point #3, it may also be appropriate to require Iris >= 3

After this is merged, we will wait until the new Iris 3 is released on conda-forge.
Then we can mergeback to master and tag the 0.16 release.

@trexfeathers
Copy link
Contributor

It hadn't occurred to me that this feature branch might want to test against released Iris, too. What's the scenario in which that's needed?

@coveralls
Copy link

Coverage Status

Coverage remained the same at 92.482% when pulling 54437ac on pp-mo:f__test-iris-master into ad6c676 on SciTools:f__test-iris-master.

@coveralls
Copy link

coveralls commented Oct 5, 2020 •
edited
Loading

Coverage Status

Coverage remained the same at 92.482% when pulling a100042 on pp-mo:f__test-iris-master into ad6c676 on SciTools:f__test-iris-master.

@pp-mo
Copy link
Member Author

pp-mo commented Oct 5, 2020

test against released Iris, too

You beat me to it !
Changes to come show that it's not practical to make it test against both, as some tests would need to allow either of two CML results. Hence, I intend to restrict to latest-Iris only at that point.

@pp-mo
Copy link
Member Author

pp-mo commented Oct 5, 2020 •
edited
Loading

Now : works with old Iris but not new.
Coming next : fixes that make it work with new, but not old ...

@pp-mo
Copy link
Member Author

pp-mo commented Oct 5, 2020

Now : tests all pass with new-Iris (3), fails with old (2.4)
next : restrict to testing against "new" only.

@pp-mo
Copy link
Member Author

pp-mo commented Oct 5, 2020

Ok, shazamm !! 🧙‍♂️ ✨
Please review, and we'll merge to the f-b when happy.

This was referenced Oct 6, 2020
Closed
Closed
Closed
Closed
Closed
Closed
@trexfeathers trexfeathers self-requested a review October 6, 2020 10:25
trexfeathers
trexfeathers reviewed Oct 6, 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.

Looks great @pp-mo, thanks for the clear commit sequence too.

Couple of questions on good testing practice...

@trexfeathers
Copy link
Contributor

I had imagined this feature branch persisting for future use, with appropriate mergebacks being made to master when needed. Is that the intention?

@pp-mo
Copy link
Member Author

pp-mo commented Oct 6, 2020

feature branch persisting

I think master should be testing against a released Iris.
So we can merge back once there is a released Iris we can install from conda-forge, but not before.
( Also, I would aim to leave the matrix option controls in place, commented out, so we have banked the solution for next time. )

@trexfeathers
Copy link
Contributor

Also, I would aim to leave the matrix option controls in place, commented out, so we have banked the solution for next time.

OK cool, so it'll be easy to make a new feature branch if there's something specific that needs testing in the future, but we won't need to persist the current feature branch in the meantime.

@trexfeathers trexfeathers merged commit 03d60a9 into SciTools:f__test-iris-master Oct 6, 2020
@pp-mo
Copy link
Member Author

pp-mo commented Oct 6, 2020

we won't need to persist the current feature branch

Ah yes, I see -- I guess that is what I was imagining.

Thanks @trexfeathers !

jamesp added a commit to jamesp/iris-grib that referenced this pull request Feb 23, 2021
@jamesp
Merge remote-tracking branch 'upstream/v0.16.x' into cirrus-16
d1b192e 
* upstream/v0.16.x:
  Docstest 0v16 (SciTools#244)
  Remove eccodes bug workaround added in SciTools#208. (SciTools#224)
  Update requirements to pick up Iris 3. (SciTools#243)
  Add 'main' conda-forge channel, needed for docs builds. (SciTools#240)
  Fix RC date in release notes (about to cut). (SciTools#235)
  Version 0.16 release candidate (SciTools#232)
  Cosmetic change : rename the travis iris-test-version options (SciTools#234)
  Travis test with  both Iris latest-release and latest-master. (SciTools#231)
lbdreyer pushed a commit that referenced this pull request Feb 24, 2021
@pp-mo @lbdreyer
Travis test with both Iris latest-release and latest-master. (#231)
b2e4dba 
* Travis test with  both Iris latest-release and latest-master.

* Modify test CMLs for latest Iris (Iris3.0 changes).

* Grib1 load fixes.

* Fix loading since units=None default for Iris3 coords

* Modify test to work with latest Iris (Iris3.0 changes).

* Test against latest Iris only.

* Review changes.
bjlittle pushed a commit that referenced this pull request Mar 2, 2021
@jamesp @pp-mo
Cirrus CI (#250)
1a8be59 
* Travis test with  both Iris latest-release and latest-master. (#231)

* Travis test with  both Iris latest-release and latest-master.

* Modify test CMLs for latest Iris (Iris3.0 changes).

* Grib1 load fixes.

* Fix loading since units=None default for Iris3 coords

* Modify test to work with latest Iris (Iris3.0 changes).

* Test against latest Iris only.

* Review changes.

* Cosmetic change : rename the travis iris-test-version options (#234)

* Rename Iris test-version options, and enable all to check action.

* Review changes.

* Version 0.16 release candidate (#232)

* Require Iris >=3 (just for the gdt90 changes).

* Whatsnew entry for requiring Iris 3.

* Set version string for release candidate.

* Test against Iris 3.0.0rc0 from conda-forge/rc_iris.

* Fix RC date in release notes (about to cut). (#235)

* Add 'main' conda-forge channel, needed for docs builds. (#240)

* Add 'main' conda-forge channel, needed for docs builds.

* Use fixed spherical-earth-radius in GRIB1, ignoring change in gribapi default.

* Codestyle fix.

* Update requirements to pick up Iris 3. (#243)

* Remove eccodes bug workaround added in #208. (#224)

* Docstest 0v16 (#244)

* Document PR#240 in release notes.

* Fix version string and release-notes date.

* Added getting started .cirrus.yml

* Update cirrus to use miniconda image

* Update .cirrus.yml

* Update .cirrus.yml

Copied across cirrus file from iris-ugrid

* Added nox testing

Borrowing from iris and iris-ugrid, added nox testing and a test runner.

Tests currently fail on my local machine.

* Path fixes in cirrus.yml

* eccodes test added to noxfile

* Added config and coverage

* Trying to set SITE_CFG

* syntax error

* taking the IRIS_DIR from Travis CI config

* Add allow_failures to the linux task for now

* Dodgy r key...

* Update .cirrus.yml

* Allow failures in linting

* Force return error 0  for now

* Added eccodes test

* moved matrix

* Yaml syntax error & * wrong way around

* Typo

* Update iris version dependency

* Date fix

This resolves the same bash issue as SciTools/iris#4019

* Configure Iris in nox

* Updated CI config

* correct site-packages path

* Fix to iris test data path

* force cache update

* refactored writing iris config in noxfile

* Fix pep8 and license test fails

* Support for testing against packaged iris and building from source

* Adding yaml to list of cirrus container requirements

* invalidate cirrus cache

* really invalidate cirrus cache...

* yaml -> pyyaml

* missing iris_dir reference

* call write_iris_config

* docstrings and matrix testing

* git syntax error

* eccodes selfcheck in basic tests

* Removed py3.8 testing for now

* Fixed regression in setup.py test

* Removed unused imports

* Disabled lint checking

* Removed nox from test dependencies for python3.6 and python3.8

* Removed python3.8 from noxfile

* Removed nox from test requirements

Co-authored-by: Patrick Peglar <patrick.peglar@metoffice.gov.uk>
@lbdreyer lbdreyer mentioned this pull request Jun 8, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trexfeathers trexfeathers trexfeathers left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pp-mo @trexfeathers @coveralls