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

Update ng-vat with recent changes+fixes from master #3685

Merged
merged 18 commits into from
Mar 18, 2020
Merged

Update ng-vat with recent changes+fixes from master #3685

merged 18 commits into from
Mar 18, 2020

Conversation

pp-mo
Copy link
Member

@pp-mo pp-mo commented Mar 15, 2020 •
edited
Loading

do not merge :

ng-vat branch is currently a bit behind.
Would like this updated, to make #3684 more intelligible

trexfeathers and others added 15 commits February 11, 2020 13:10
@trexfeathers
Fixed tests since Numpy 1.18 deprecation of non-int num arguments for…
4410e56 
… linspace. (#3655)
@bjlittle
remove redundant tests (#3650)
836244e
@pp-mo
Remove obsolete test. (#3662)
e2ed1a6
@pp-mo
Remove grib-specific test. (#3663)
e118a35
@trexfeathers
Removed ununused skipIf. (#3632)
1d0757b
@lbdreyer
Remove test_grib_save_rules.py which has been moved to iris-grib (#3666)
ecfbcf2
@pp-mo @trexfeathers
2v4 mergeback picks (#3668)
7f6e5e2 
* Stop PPDataProxy accessing the file when no data is needed. (#3659)

* Add 2.4 whatsnew into full whatsnew list.

Co-authored-by: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>
@lbdreyer
Remove uri callback test which is moved to iris-grib (#3665)
7b80e0e
@lbdreyer
Remove test_grib2 integration tests (#3664)
5a6afac
@lbdreyer
Remove test_grib_save.py (#3669)
2ec26c1
@jonseddon
Remove cube iter (#3656)
cbfbbb2
@trexfeathers
Fixed asv project name to 'scitools-iris'. (#3660)
d5baf1f
@pp-mo
Removed grib-specific test to iris-grib. (#3671)
c82415d
@pp-mo
Removed iris.tests.integration.test_grib_load and related CML files. (#…
38d9bae 
…3670)
@lbdreyer
Remove TestGribMessage (#3672)
06e9e2b
@pp-mo pp-mo requested review from trexfeathers and lbdreyer March 15, 2020 15:38
@pp-mo pp-mo mentioned this pull request Mar 15, 2020
Merged
trexfeathers and others added 3 commits March 17, 2020 16:45
@trexfeathers
Switched use of datetime.weekday() to datetime.dayofwk. (#3687)
0a0dd5f
@pp-mo
New image hashes for mpl 3x2 (#3682)
0d3048f 
* New image hash for iris.test.test_plot.TestSymbols.test_cloud_cover with matplotlib 3.2.0.

* Further images changes for mpl3x2.

* Yet more updated image results.
@pp-mo @trexfeathers
Correct and improve dev-guide section on fixing graphics-tests. (#3683)
c5ecefb 
* Correct and improve dev-guide section on fixing graphics-tests.

* Review changes + general rethink.

* Reduce duplication between 'graphics-tests' and general 'tests' page.

* Update docs/iris/src/developers_guide/graphics_tests.rst

Co-Authored-By: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>

* Update docs/iris/src/developers_guide/graphics_tests.rst

Co-Authored-By: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>

* Update docs/iris/src/developers_guide/graphics_tests.rst

Co-Authored-By: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>

* Update docs/iris/src/developers_guide/graphics_tests.rst

Co-Authored-By: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>

* Update docs/iris/src/developers_guide/graphics_tests.rst

Co-Authored-By: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>

Co-authored-by: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>
trexfeathers
trexfeathers approved these changes Mar 18, 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.

Have double checked that these 18 commits are indeed identical to the commits that have taken place on master since branching. All good, LGTM ✨

@trexfeathers trexfeathers merged commit df579a3 into ng-vat Mar 18, 2020
@pp-mo pp-mo mentioned this pull request Mar 18, 2020
Merged
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

@lbdreyer lbdreyer Awaiting requested review from lbdreyer

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

Successfully merging this pull request may close these issues.
5 participants
@pp-mo @trexfeathers @bjlittle @lbdreyer @jonseddon