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

Fixes for 1.0 #113

Merged
merged 5 commits into from
Aug 10, 2018
Merged

Fixes for 1.0 #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28c7550
Fixes for 1.0
quinnj Aug 8, 2018
08d9dd0
Fix another issue in deps/build.jl
quinnj Aug 8, 2018
69a7b60
Use `isdefined` on v0.6
jekbradbury Aug 9, 2018
ba31288
Always listen to Yichao
jekbradbury Aug 9, 2018
e662504
using Compat inside submodule
jekbradbury Aug 9, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
deps/build.log
7 changes: 4 additions & 3 deletions deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
using Compat

module DefaultDeps
using Compat
if isfile("deps.jl")
include("deps.jl")
end
if !isdefined(:ROOTENV)
if !isdefined(@__MODULE__, :ROOTENV)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errr, I think you need Compat... The using above is not in the right module iiuc.

const ROOTENV = abspath(dirname(@__FILE__), "usr")
end
if !isdefined(:MINICONDA_VERSION)
if !isdefined(@__MODULE__, :MINICONDA_VERSION)
const MINICONDA_VERSION = "3"
end
end
Expand All @@ -32,7 +33,7 @@ const ROOTENV = "$(escape_string(ROOTENV))"
const MINICONDA_VERSION = "$(escape_string(MINICONDA_VERSION))"
"""

if !isfile("deps.jl") || readstring("deps.jl") != deps
if !isfile("deps.jl") || read("deps.jl", String) != deps
write("deps.jl", deps)
end

Expand Down