Code

Merge back v1.11.x#2236

Code

Merged

pp-mo merged 21 commits intoSciTools:masterSciTools/iris:masterfrom marqh:mb111marqh/iris:mb111Copy head branch name to clipboardNov 14, 2016

+604-178

Commits

Commits on Oct 26, 2016

• Stock (SciTools#2212) (SciTools#2214)

  Show description for 64fa25b
  

  marqh

  authored and

  pp-mo

  committed
  64fa25b

  Copy full SHA for 64fa25b

• imagehash via conda

  marqh

  committed
  309c46a

  Copy full SHA for 309c46a

• Merge pull request SciTools#2215 from marqh/ihashtr

  Show description for 9040e74
  lbdreyer

  authored
  9040e74

  Copy full SHA for 9040e74

• Approxdata (SciTools#2213)

  Show description for bb9d169
  

  marqh

  authored and

  pp-mo

  committed
  bb9d169

  Copy full SHA for bb9d169

Commits on Oct 28, 2016

• only lock file when in create_missing

  marqh

  committed
  39dd0bf

  Copy full SHA for 39dd0bf

• Prevent dot_path tests from corrupting the stored path.

  marqh

  committed
  66b5c6d

  Copy full SHA for 66b5c6d

• Merge pull request SciTools#2221 from marqh/lock

  Show description for e3bc58d
  lbdreyer

  authored
  e3bc58d

  Copy full SHA for e3bc58d

• Merge pull request SciTools#2222 from marqh/dottest

  Show description for bc663b1
  lbdreyer

  authored
  bc663b1

  Copy full SHA for bc663b1

• Add required import.

  pp-mo

  committed
  458842c

  Copy full SHA for 458842c

• Merge pull request SciTools#2223 from pp-mo/dot_test_import

  Show description for 9cae764
  bjlittle

  authored
  9cae764

  Copy full SHA for 9cae764

• Tighten some assertCMLApproxData rtols.

  pp-mo

  committed
  980fc1b

  Copy full SHA for 980fc1b

• Fix filelock bug (SciTools#2225)

  Show description for e63fe10
  

  lbdreyer

  authored and

  marqh

  committed
  e63fe10

  Copy full SHA for e63fe10

Commits on Oct 31, 2016

• Unpin miniconda to latest

  bjlittle

  committed
  40110a8

  Copy full SHA for 40110a8

• Merge pull request SciTools#2227 from bjlittle/unpin-miniconda

  Show description for 2573945
  ajdawson

  authored
  2573945

  Copy full SHA for 2573945

• Move to https

  bjlittle

  committed
  9967e75

  Copy full SHA for 9967e75

• Remove plot api locking. (SciTools#2218)

  

  bjlittle

  authored and

  DPeterK

  committed
  e87ab88

  Copy full SHA for e87ab88

Commits on Nov 1, 2016

• Merge pull request SciTools#2228 from bjlittle/https-miniconda

  Show description for b8449a5
  ajdawson

  authored
  b8449a5

  Copy full SHA for b8449a5

Commits on Nov 4, 2016

• Stashcubelist (SciTools#2230)

  Show description for 8d223dd
  

  marqh

  authored and

  bjlittle

  committed
  8d223dd

  Copy full SHA for 8d223dd

Commits on Nov 11, 2016

• BUG: Iris AreaWeighted regrid float tolerance bug (SciTools#2237)

  Show description for 51a45ae
  

  Carwyn Pelley

  authored and

  marqh

  committed
  51a45ae

  Copy full SHA for 51a45ae

Commits on Nov 14, 2016

• Use v3.1 imagehash.hex_to_hash (SciTools#2240)

  Show description for b05bf53
  

  bjlittle

  authored and

  DPeterK

  committed
  b05bf53

  Copy full SHA for b05bf53

• Tighten some assertCMLApproxData rtols. (SciTools#2224)

  marqh

  authored
  8c116ad

  Copy full SHA for 8c116ad