Skip to content

Commit

Permalink
Properly upgrade to 1.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
evetion committed Jun 4, 2020
1 parent 2618a5c commit 6faf231
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ os:
- linux
- osx
julia:
- 1.0
- 1.3
- 1
- nightly
matrix:
Expand All @@ -20,7 +20,7 @@ jobs:
os: linux
script:
- julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));
Pkg.instantiate()'
Pkg.instantiate()'
- julia --project=docs/ test/remotefiles.jl
- julia --project=docs/ docs/make.jl
after_success: skip
9 changes: 4 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
environment:
matrix:
- julia_version: 1.0
- julia_version: 1
- julia_version: nightly
- julia_version: 1.3
- julia_version: 1
- julia_version: nightly

platform:
- x86 # 32-bit
- x64 # 64-bit

matrix:
allow_failures:
- julia_version: nightly
- julia_version: nightly

branches:
only:
Expand All @@ -33,7 +33,6 @@ build_script:
test_script:
- echo "%JL_TEST_SCRIPT%"
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

# # Uncomment to support code coverage upload. Should only be enabled for packages
# # which would have coverage gaps without running on Windows
# on_success:
Expand Down
6 changes: 1 addition & 5 deletions test/test_cookbook_projection.jl
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,7 @@ end
end

AG.importEPSG(26912) do spatialref
if VERSION >= v"1.3" # GDAL.jl v1.1 which uses PROJ 6.3
proj4str = "+proj=utm +zone=12 +datum=NAD83 +units=m +no_defs"
else # GDAL.jl v1.0 which uses PROJ 6.1
proj4str = "+proj=utm +zone=12 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs"
end
proj4str = "+proj=utm +zone=12 +datum=NAD83 +units=m +no_defs"
@test AG.toPROJ4(spatialref) == proj4str
@test AG.toWKT(spatialref)[1:6] == "PROJCS"
AG.morphtoESRI!(spatialref)
Expand Down

0 comments on commit 6faf231

Please sign in to comment.