Merge f8081bf into 5585534

.travis.yml

@@ -1,10 +1,13 @@
 # Documentation: http://docs.travis-ci.com/user/languages/julia/
 language: julia
+branches:
+  only:
+    - master
 os:
   - linux
 #  - osx
 julia:
-  - 1.2
+  - 1
   - nightly
 matrix:
   allow_failures:
@@ -13,12 +16,6 @@ notifications:
   email: false
 env:
   - PYTHON=""
-# uncomment the following lines to override the default test script
-#script:
-#  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-#  - julia -e 'Pkg.clone(pwd()); Pkg.build("PyDSTool"); Pkg.test("PyDSTool"; coverage=true)'
 after_success:
-  # push coverage results to Coveralls
-  - julia -e 'cd(Pkg.dir("PyDSTool")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
-  # push coverage results to Codecov
-  - julia -e 'cd(Pkg.dir("PyDSTool")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
+  - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
+  - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())'

Project.toml

@@ -12,7 +12,7 @@ RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 
 [compat]
 Conda = "1"
-DataStructures = "0.17"
+DataStructures = "0.17, 0.18"
 DiffEqBase = "6"
 PyCall = "1.91"
 RecipesBase = "0.7, 0.8, 1.0"