Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -4,16 +4,16 @@ os:
   - linux
   - osx
 julia:
-  - 0.7
+  - 1.0
   - nightly
 matrix:
   allow_failures:
     - julia: nightly
 notifications:
   email: false
-env:
-   - PYTHON=""
-script:
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia -e 'Pkg.clone(pwd())'
-  - julia -e 'Pkg.test("DifferentialEquations")'
+#env:
+#   - PYTHON=""
+#script:
+#  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+#  - julia -e 'Pkg.clone(pwd())'
+#  - julia -e 'Pkg.test("DifferentialEquations")'

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.7-beta2
+julia 1.0
 Reexport 0.0.3
 DiffEqBase 3.0.0
 StochasticDiffEq 3.0.0

appveyor.yml

@@ -1,13 +1,18 @@
 environment:
   matrix:
-    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
-    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
-    - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
-    - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
+    - julia_version: 1
+    - julia_version: nightly
+
+platform:
+  - x86 # 32-bit
+  - x64 # 64-bit
+
+# # Uncomment the following lines to allow failures on nightly julia
+# # (tests will run but not make your overall status red)
 matrix:
   allow_failures:
-    - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
-    - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
+    - julia_version: nightly
+
 branches:
   only:
     - master
@@ -20,20 +25,18 @@ notifications:
     on_build_status_changed: false
 
 install:
-  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-  - set PATH=C:\Miniconda3;C:\Miniconda3\Scripts;%PATH%
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
 
 build_script:
-# Need to convert from shallow to complete for Pkg.clone to work
-  - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "versioninfo();
-      Pkg.clone(pwd(), \"DifferentialEquations\"); Pkg.build(\"DifferentialEquations\")"
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"DifferentialEquations\")"
+  - 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:
+#   - echo "%JL_CODECOV_SCRIPT%"
+#   - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"

src/DifferentialEquations.jl

@@ -16,7 +16,7 @@ module DifferentialEquations
   @reexport using DelayDiffEq
 
   @reexport using ParameterizedFunctions
-  #@reexport using DiffEqParamEstim
+  @reexport using DiffEqParamEstim
   @reexport using DiffEqSensitivity
   @reexport using DiffEqCallbacks
   @reexport using DiffEqMonteCarlo

src/ode_default_alg.jl

@@ -49,7 +49,7 @@ function default_algorithm(prob::DiffEqBase.AbstractODEProblem{uType,tType,inpla
     elseif tol_level == :low_tol
       alg = AutoVern7(Rodas4(autodiff=false),lazy=!callbacks)
     else # :med or low
-      alg = AutoTsit5(Rosenbrock23(autodiff=false),lazy=!callbacks)
+      alg = AutoTsit5(Rosenbrock23(autodiff=false))
     end
   end
   alg,extra_kwargs

test/default_sde_alg_test.jl

@@ -4,7 +4,7 @@ using DiffEqProblemLibrary.SDEProblemLibrary: importsdeproblems; importsdeproble
 import DiffEqProblemLibrary.SDEProblemLibrary: prob_sde_additive
 
 using Random
-srand(100)
+Random.seed!(100)
 
 prob = prob_sde_additive
 sol =solve(prob,dt=1/2^(3))