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

v2.2.x branch mergeback #3316

Merged
merged 14 commits into from
Jun 4, 2019
Merged

v2.2.x branch mergeback #3316

merged 14 commits into from
Jun 4, 2019

Conversation

lbdreyer
Copy link
Member

@lbdreyer lbdreyer commented May 28, 2019 •
edited
Loading

There has been a fair amount of additions to the 2.2.x branch that should be merged back into master (especially since we just cut the 2.2.1 release).

To create this PR I did the following commands:

$ git checkout upstream/v2.2.x -b 221_mergeback_rebase
Then I did an interactive release to select the commits that were missing
$ git rebase -i --onto upstream/master HEAD~12
Which were all the commits since c3048cbf Fix for numpy 1v16. (#3257) as this and b0d5512b BLD: Pinning cftime to 1.0.1 (#3247) were included in the last mergeback.

@lbdreyer lbdreyer requested a review from bjlittle May 28, 2019 15:57
@QuLogic QuLogic added this to the v2.3.0 milestone May 28, 2019
@lbdreyer
Copy link
Member Author

This is currently failing as some of the license headers need updating.

I found it a bit strange that the license header checks passed when the PRs were made to the v2.2.x branch, but it turns out they weren't even running!
For example in #3310, the file's license header has the dates 2010 - 2015 and yet, in that PR the travis job claims to have passed as the license header check is skipped!

test_license_headers (iris.tests.test_coding_standards.TestLicenseHeaders) ... SKIP: Iris installation did not look like a git repo.

So the license header check is only done on the master branch? There may have been a fix to the master branch that deals with this...

I am going to fix the license headers on the v2.2.x branch then add that change to this PR

@lbdreyer lbdreyer mentioned this pull request May 29, 2019
Merged
@rcomer rcomer mentioned this pull request May 31, 2019
Merged
@lbdreyer lbdreyer force-pushed the 221_mergeback_rebase branch from 929f583 to 4b3931d Compare June 3, 2019 12:26
@lbdreyer
Copy link
Member Author

lbdreyer commented Jun 3, 2019

I have updated this PR with the latest changed to the v2.2.x branch.

However, the tests are failing due to a missing import from sphinx. See #3322 for the fix.

Once the fix is in I will update this PR and hopefully get this PR in!

pp-mo and others added 14 commits June 3, 2019 15:07
@pp-mo @lbdreyer
Avoid numpy FutureWarning about indexing with sequence. (SciTools#3276)
7bc4d5a
@pp-mo @lbdreyer
Test with newest cf-units: no longer called cf_units. (SciTools#3277)
4f26e80
@pp-mo @lbdreyer
Fix for non-calendar datetimes. (SciTools#3259)
bbcfae7
@pp-mo @lbdreyer
Fix problem with factories in iris.util.new_axis(). (SciTools#3263)
400abd2 
* Fix problem with factories from iris.util.new_axis().

* Added whatsnew.

* Licence header fix.

* Reference PR in comment.

* Revised whatsnew.
@wilbertcs @lbdreyer
Added a timeout to stop requests.get hanging on platforms with no int…
3237313 
…ernet (SciTools#3284)

* Added a 1 second timout to stop requests.get hanging on the HPC

* Amended comment to be more generic

* Changed 1 second timeout to 10 seconds.
@pp-mo @lbdreyer
Fix for small plot changes with freetype 2.10. (SciTools#3297)
d40a3a8 
* Fix for small plot changes with freetype 2.10.

* Remove spurious end-of-line spaces in imagerepo.json.
@pp-mo @lbdreyer
Attempt to fix Sphinx import. (SciTools#3310)
cc5017c
@pp-mo @lbdreyer
Imagehash listfile for fixbranch (SciTools#3311)
c732c02 
* Test-imagehash uris checked against listing file instead of github api listing.

* Licence header fix.

* Remove redundant import + skip; fix bytes decode; improve error message; clarify comments.

* Improved error message.
@pp-mo @lbdreyer
Coord nan equal (SciTools#3283)
535d763 
* Allow coords with NaNs in to compare equal.

* Tests for AuxCoord.__eq__ and util.array_equal(withnans=True).

* Move whatsnew contributions into existing whatsnew document.

* Better logic in util.array_equal.
@pp-mo @lbdreyer
Dask landsea masks bugfix (SciTools#3255)
859e0c5 
* Fix landsea-mask data access for UM files.

* Review changes.

* Fixed some stale comments  + unused variables.
@lbdreyer
Remove underscore in whatsnew
6e26263
@lbdreyer
Remove note from userguide that is out of date.
7968001
@lbdreyer
Update copyright years in license headers
f8e95a8
@lbdreyer
Add explicit sphinx import (SciTools#3322)
3872614
@lbdreyer lbdreyer force-pushed the 221_mergeback_rebase branch from 4b3931d to 3872614 Compare June 3, 2019 14:07
@bjlittle bjlittle self-assigned this Jun 3, 2019
@bjlittle
Copy link
Member

bjlittle commented Jun 4, 2019

Talked through this with @lbdreyer, as the merge back is complicated due to cherry-picking from master to 2.2.x and vice versa - hence the sha changes on the merge back commits from 2.2.x to master.
Let's go with this LGTM

@bjlittle bjlittle merged commit b209642 into SciTools:master Jun 4, 2019
@bjlittle
Copy link
Member

bjlittle commented Jun 4, 2019

Awesome, thanks @lbdreyer 👍

@lbdreyer lbdreyer deleted the 221_mergeback_rebase branch September 3, 2019 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjlittle bjlittle Awaiting requested review from bjlittle

Assignees

@bjlittle bjlittle

Labels
None yet
Projects
None yet
Milestone
v2.3.0
Development

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