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.

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

merged 5 commits into from
Aug 10, 2018

Conversation

quinnj
Copy link
Contributor

@quinnj quinnj commented Aug 8, 2018

This fixes building Conda.jl on 1.0.

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

Choose a reason for hiding this comment

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

read("deps.jl", String)?

@jekbradbury
Copy link
Collaborator

@isdefined isn't defined on 0.6, while both REQUIRE and Travis indicate that Conda master is meant to continue working on 0.6, so those lines may need to be guarded with if VERSION

@devgeist42
Copy link

How about

module DefaultDeps
    if VERSION < v"0.7"
        macro isdefined(x)
            isdefined(x)
        end
    end
    if isfile("deps.jl")
        include("deps.jl")
    end
    if !(@isdefined ROOTENV)
        const ROOTENV = abspath(dirname(@__FILE__), "usr")
    end
    if !(@isdefined MINICONDA_VERSION)
        const MINICONDA_VERSION = "3"
    end
end

The Compat situation for `isdefined`/`@isdefined` is complicated; see JuliaLang/Compat.jl#402.
@jekbradbury
Copy link
Collaborator

I went with something similar; will merge if Travis is happy because no IPython on 1.0 is 😢.

@yuyichao
Copy link
Collaborator

yuyichao commented Aug 9, 2018

You just need to use isdefined(@__MODULE__, ...) instead. That is the Compat solution.

@@ -4,10 +4,10 @@ module DefaultDeps
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.

@jekbradbury
Copy link
Collaborator

The remaining issue is that the Appveyor script uses julia -e 'versioninfo(), which needs using InteractiveUtils on 1.0. Should Conda switch to the Appveyor.jl version of the script?

@stevengj
Copy link
Member

Merging this as-is, so that people can use Conda.jl under 1.0. Fixing AppVeyor can be a separate PR.

@fredrikekre
Copy link

Can we make a new release such that people can use IJulia on v1.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants