Skip to content

Commit

Permalink
unpin Anaconda on Windows (#170)
Browse files Browse the repository at this point in the history
  • Loading branch information
stevengj committed Feb 11, 2020
1 parent 662bfdf commit ea4d3d3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
9 changes: 1 addition & 8 deletions src/Conda.jl
Original file line number Diff line number Diff line change
Expand Up @@ -129,21 +129,14 @@ function _installer_url()
elseif Sys.islinux()
res *= "Linux"
elseif Sys.iswindows()
if MINICONDA_VERSION == "3"
# Quick fix for:
# * https://github.com/JuliaLang/IJulia.jl/issues/739
# * https://github.com/ContinuumIO/anaconda-issues/issues/10082
# * https://github.com/conda/conda/issues/7789
res = "https://repo.continuum.io/miniconda/Miniconda$(MINICONDA_VERSION)-4.5.4-"
end
res *= "Windows"
else
error("Unsuported OS.")
end

# mapping of Julia architecture names to Conda architecture names, where they differ
arch2conda = Dict(:i686 => :x86)

if Sys.ARCH in (:i686, :x86_64, :ppc64le)
res *= string('-', get(arch2conda, Sys.ARCH, Sys.ARCH))
else
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ rm(Conda.prefix(env); force=true, recursive=true)
Conda.add("curl", env)

@testset "Install Python package" begin
Conda.add("python=3.6", env) # 3.7 doesn't work on Windows at the moment
Conda.add("python", env)
pythonpath = joinpath(Conda.python_dir(env), "python" * exe)
@test isfile(pythonpath)

Expand Down

0 comments on commit ea4d3d3

Please sign in to comment.