diff --git a/.travis.yml b/.travis.yml index 7648d21..587fa8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,8 @@ os: - osx - linux julia: - - 0.6 + - 0.7 + - 1.0 - nightly env: - CONDA_JL_VERSION="2" diff --git a/REQUIRE b/REQUIRE index 1d0a382..68496fb 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,4 +1,4 @@ -julia 0.6 +julia 0.7 Compat 0.62.0 JSON VersionParsing diff --git a/appveyor.yml b/appveyor.yml index ea9668a..679735c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,5 @@ environment: matrix: - - julia_version: 0.6 - julia_version: 0.7 - julia_version: 1 - julia_version: nightly diff --git a/deps/.gitignore b/deps/.gitignore index 81a07b5..5c02576 100644 --- a/deps/.gitignore +++ b/deps/.gitignore @@ -1,3 +1,2 @@ -usr/ deps.jl !.gitignore diff --git a/deps/build.jl b/deps/build.jl index 95f4b91..aa80821 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -1,16 +1,21 @@ using Compat +const condadir = abspath(homedir(), ".julia", "conda") +const condadeps = joinpath(condadir, "deps.jl") + module DefaultDeps using Compat if isfile("deps.jl") include("deps.jl") - end - if !isdefined(@__MODULE__, :ROOTENV) - const ROOTENV = abspath(dirname(@__FILE__), "usr") + elseif isfile(Main.condadeps) + include(Main.condadeps) end if !isdefined(@__MODULE__, :MINICONDA_VERSION) const MINICONDA_VERSION = "3" end + if !isdefined(@__MODULE__, :ROOTENV) + const ROOTENV = joinpath(Main.condadir, MINICONDA_VERSION) + end end ROOTENV = get(ENV, "CONDA_JL_HOME", DefaultDeps.ROOTENV) @@ -33,11 +38,11 @@ const ROOTENV = "$(escape_string(ROOTENV))" const MINICONDA_VERSION = "$(escape_string(MINICONDA_VERSION))" """ -if !isfile("deps.jl") || read("deps.jl", String) != deps - write("deps.jl", deps) -end +mkpath(condadir) +mkpath(ROOTENV) -if !isdir(ROOTENV) - # Ensure ROOTENV exists, otherwise prefix(ROOTENV) will throw - mkpath(ROOTENV) +for depsfile in ("deps.jl", condadeps) + if !isfile(depsfile) || read(depsfile, String) != deps + write(depsfile, deps) + end end