-
Notifications
You must be signed in to change notification settings - Fork 57
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.
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
Fixes for 1.0 #113
Conversation
deps/build.jl
Outdated
@@ -32,7 +32,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") || String(read("deps.jl")) != deps |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
read("deps.jl", String)
?
|
How about
|
The Compat situation for `isdefined`/`@isdefined` is complicated; see JuliaLang/Compat.jl#402.
I went with something similar; will merge if Travis is happy because no IPython on 1.0 is 😢. |
You just need to use |
@@ -4,10 +4,10 @@ module DefaultDeps | |||
if isfile("deps.jl") | |||
include("deps.jl") | |||
end | |||
if !isdefined(:ROOTENV) | |||
if !isdefined(@__MODULE__, :ROOTENV) |
There was a problem hiding this comment.
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.
The remaining issue is that the Appveyor script uses |
Merging this as-is, so that people can use Conda.jl under 1.0. Fixing AppVeyor can be a separate PR. |
Can we make a new release such that people can use IJulia on v1.0. |
This fixes building Conda.jl on 1.0.