Merge pull request #141 from JuliaClimate/Balinus-patch-1

ClimateBase 0.6

.travis.yml

@@ -3,9 +3,9 @@ language: julia
 os:
   - linux
   - osx
-julia:
-  - 1.0
+julia:  
   - 1.3
+  - 1.4
   - nightly
 
 script:
@@ -31,6 +31,3 @@ notifications:
 
 after_success:
   - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder()); Coveralls.submit(process_folder())'
-
-
-

Project.toml

@@ -2,7 +2,7 @@ name = "ClimateTools"
 uuid = "4f4ee721-4970-5af2-8560-6c1d960e3231"
 authors = ["Philippe Roy <[email protected]>"]
 repo = "https://github.com/JuliaClimate/ClimateTools.jl.git"
-version = "0.19.0"
+version = "0.20.0"
 
 [deps]
 ArgCheck = "dce04be8-c92d-5529-be00-80e4d2c0e197"
@@ -30,11 +30,11 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 [compat]
 ArgCheck = "1, 2.0"
 AxisArrays = "0.3, 0.4"
-ClimateBase = "0.3"
+ClimateBase = "0.6"
 DataFrames = "0.19, 0.20"
 Distances = "0.7, 0.8"
 Extremes = "0.1.1"
-GeoStats = "0.10, 0.11"
+GeoStats = "0.11"
 Interpolations = "0.12"
 InverseDistanceWeighting = "0.2, 0.3"
 IterTools = "1.1, 1.2, 1.3"

appveyor.yml

@@ -1,9 +1,10 @@
 environment:
-  matrix:  
+  matrix:
   - julia_version: 1.3
+  - julia_version: 1.4
   - julia_version: nightly
 
-platform:  
+platform:
   - x64 # 64-bit
 
 # Uncomment the following lines to allow failures on nightly julia

src/functions.jl

@@ -324,7 +324,7 @@ function interp!(OUT, timeorig, dataorig, lonorig, latorig, londest, latdest, va
     p = Progress(length(timeorig), 5, "Regridding: ")
     for t = 1:length(timeorig)
 
-        SD = StructuredGridData(Dict(target => dataorig[:, :, t]), lonorig, latorig)
+        SD = StructuredGridData(OrderedDict(target => dataorig[:, :, t]), lonorig, latorig)
 
         problem = EstimationProblem(SD, SG, target)
         solution = solve(problem, solver)