Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

require julia 1.3 / GDAL build with artifacts #125

Merged
merged 2 commits into from
Jun 4, 2020
Merged

require julia 1.3 / GDAL build with artifacts #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2618a5c
Update Project.toml
evetion Jun 4, 2020
6faf231
Properly upgrade to 1.3.
evetion Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ uuid = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"
keywords = ["GDAL", "IO"]
license = "MIT"
desc = "A high level API for GDAL - Geospatial Data Abstraction Library"
version = "0.3.3"
version = "0.4.0"

[deps]
DataStreams = "9a8bc11e-79be-5b39-94d7-1ccc349a1a85"
Expand All @@ -14,10 +14,10 @@ GeoInterface = "cf35fbd7-0cd7-5166-be24-54bfbe79505f"

[compat]
DataStreams = "0.4.2"
GDAL = "1.0.2"
GDAL = "1.1.1"
GeoInterface = "0.4, 0.5"
GeoFormatTypes = "0.3"
julia = "1"
julia = "1.3"

[extras]
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
Expand Down
9 changes: 4 additions & 5 deletions appveyor.yml
View file
Open in desktop
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
View file
Open in desktop
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