…ract calls)

Adding some tests and fixing some edge cases

Removing unused import

Add comment and rename var for clarity

Add comment and rename var for clarity

Minor fix

Retain lazy data

Support aux coords on leading dimensions, and split across non-neighbouring dimensions. The routine chooses the first dimension of the AuxCoord as the new flat one.

Fix whitespace

Fix issue with multiple dim coords being flattened

PEP8 conformance

Long lines

Factor out a function for flattening arbitrary dimensions

Fix case for coordinates with bounds

Flatten all dims by default

Remove unused imports

Remove unused imports

…ions. Other minor whitespace and text changes

* BLD: Pinning cftime to 1.0.1 (SciTools#3247)

* Fix for numpy 1v16. (SciTools#3257)

…ools#3267)" (SciTools#3274)

This reverts commit a76afdc.

…ls#3265)" (SciTools#3275)

This reverts commit 0f519e1.

* Fix testing cwd for licence header test to work properly.

* Remove redundant test runner --coding-tests key.

* Update all the missed header years.

* Fix problem with factories from iris.util.new_axis().

* Added whatsnew.

* Licence header fix.

* Reference PR in comment.

* Revised whatsnew.

…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.

* Fix for small plot changes with freetype 2.10.

* Remove spurious end-of-line spaces in imagerepo.json.

* 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.

* 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.

* Fix landsea-mask data access for UM files.

* Review changes.

* Fixed some stale comments  + unused variables.

v2.2.x branch mergeback

…ract calls)

Adding some tests and fixing some edge cases

Removing unused import

Add comment and rename var for clarity

Add comment and rename var for clarity

Minor fix

Retain lazy data

Support aux coords on leading dimensions, and split across non-neighbouring dimensions. The routine chooses the first dimension of the AuxCoord as the new flat one.

Fix whitespace

Fix issue with multiple dim coords being flattened

PEP8 conformance

Long lines

Factor out a function for flattening arbitrary dimensions

Fix case for coordinates with bounds

Flatten all dims by default

Remove unused imports

Remove unused imports

…ions. Other minor whitespace and text changes

…aux_coord

# Conflicts:
#	lib/iris/util.py