v2.2.x branch mergeback#3316

Merged

bjlittle merged 14 commits intoSciTools:masterfrom

lbdreyer:221_mergeback_rebase

Jun 4, 2019

Commits on Jun 3, 2019

Avoid numpy FutureWarning about indexing with sequence. (#3276)

pp-mo
authored and
lbdreyer
committed
Test with newest cf-units: no longer called cf_units. (#3277)

pp-mo
authored and
lbdreyer
committed
Fix for non-calendar datetimes. (#3259)

pp-mo
authored and
lbdreyer
committed
Fix problem with factories in iris.util.new_axis(). (#3263)

pp-mo
authored and
lbdreyer
committed
Added a timeout to stop requests.get hanging on platforms with no internet (#3284)

wilbertcs
authored and
lbdreyer
committed
Fix for small plot changes with freetype 2.10. (#3297)

pp-mo
authored and
lbdreyer
committed
Attempt to fix Sphinx import. (#3310)

pp-mo
authored and
lbdreyer
committed
Imagehash listfile for fixbranch (#3311)

pp-mo
authored and
lbdreyer
committed
Coord nan equal (#3283)

pp-mo
authored and
lbdreyer
committed
Dask landsea masks bugfix (#3255)

pp-mo
authored and
lbdreyer
committed
Remove underscore in whatsnew
lbdreyer
committed
Remove note from userguide that is out of date.
lbdreyer
committed
Update copyright years in license headers
lbdreyer
committed
Add explicit sphinx import (#3322)
lbdreyer
committed