Skip to content

Commit

Permalink
merge commit
Browse files Browse the repository at this point in the history
  • Loading branch information
meggart committed Sep 22, 2015
2 parents 527b73e + 8c440f4 commit 5113416
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
20 changes: 10 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
language: cpp
compiler:
- clang
# Documentation: http:https://docs.travis-ci.com/user/languages/julia/
language: julia
os:
- linux
- osx
julia:
- 0.4
notifications:
email: false
before_install:
- sudo add-apt-repository ppa:staticfloat/julia-deps -y
- sudo add-apt-repository ppa:staticfloat/julianightlies -y
- sudo apt-get update -qq -y
- sudo apt-get install libpcre3-dev julia -y
# uncomment the following lines to override the default test script
script:
- julia -e 'Pkg.init(); run(`ln -s $(pwd()) $(Pkg.dir())/NetCDF`); Pkg.resolve(); Pkg.build("NetCDF")'
- julia -e 'using NetCDF; @assert isdefined(:NetCDF); @assert typeof(NetCDF) === Module; include("$(Pkg.dir())/NetCDF/test/runtests.jl")'
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia -e 'Pkg.clone("https://github.com/JuliaGeo/NetCDF.jl.git"); Pkg.test("NetCDF"; coverage=true)'
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
NetCDF.jl
============

[![Build Status](https://travis-ci.org/meggart/NetCDF.jl.png)](https://travis-ci.org/meggart/NetCDF.jl)
[![Build Status](https://travis-ci.org/JuliaGeo/NetCDF.jl.png)](https://travis-ci.org/JuliaGeo/NetCDF.jl)

NetCDF support for the julia programming language, there is a high-level and a medium-level interface for writing and reading netcdf files.

Expand Down Expand Up @@ -44,4 +44,4 @@ To learn more, have a look at https://github.com/meggart/NetCDF.jl/blob/master/d
Contact info:
Fabian Gans ([email protected])
Max-Planck-Institute for Biogeochemistry
Jena, Germany
Jena, Germany
1 change: 1 addition & 0 deletions REQUIRE
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ julia 0.4-
BinDeps
Conda
Compat
Formatting

0 comments on commit 5113416

Please sign in to comment.