Fix deprecations (#91)

JuliaPy · Dec 7, 2017 · 6ca6a3b · 6ca6a3b
1 parent eca5315
commit 6ca6a3b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/Conda.jl b/src/Conda.jl
@@ -186,16 +186,7 @@ function _install_conda(env::Environment, force::Bool=false)
             run(`$installer -b -f -p $PREFIX`)
         end
         if Compat.Sys.iswindows()
-            if VERSION >= v"0.5.0-dev+8873" # Julia PR #13780
-                run(Cmd(`$installer /S /AddToPath=0 /RegisterPython=0 /D=$PREFIX`, windows_verbatim=true))
-            else
-                # Workaround a bug in command-line argument parsing, see
-                # https://github.com/Luthaf/Conda.jl/issues/17
-                if match(r" {2,}", "") != nothing
-                    error("The installer will fail when the path=\"$PREFIX\" contains two consecutive spaces")
-                end
-                run(`$installer /S /AddToPath=0 /RegisterPython=0 $(split("/D=$PREFIX"))`)
-            end
+            run(Cmd(`$installer /S /AddToPath=0 /RegisterPython=0 /D=$PREFIX`, windows_verbatim=true))
         end
         Conda.add_channel("defaults")
         # Update conda because conda 4.0 is needed and miniconda download installs only 3.9

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -25,7 +25,7 @@ end
 
 @test isfile(Conda.conda_bin(env))
 Conda.add("python", env)
-pythonpath = joinpath(Conda.python_dir(env), "python" * (Compat.Sys.iswindows() ? ".exe": ""))
+pythonpath = joinpath(Conda.python_dir(env), "python" * (Compat.Sys.iswindows() ? ".exe" : ""))
 @test isfile(pythonpath)
 pyversion = readstring(`$pythonpath -c "import sys; print(sys.version)"`)
 @test pyversion[1:1] == Conda.MINICONDA_VERSION