Merge branch 'master' of https://github.com/JuliaPy/PyCall.jl

JuliaPy · Feb 12, 2020 · 0bc2f84 · 0bc2f84 · stevengj · Feb 12, 2020
2 parents d3dd1d1 + 098f51b
commit 0bc2f84
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "PyCall"
 uuid = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
 authors = ["Steven G. Johnson <stevenj@mit.edu>", "Yichao Yu <yyc1992@gmail.com>", "Takafumi Arakaki <aka.tkf@gmail.com>", "Simon Kornblith <simon@simonster.com>", "Páll Haraldsson <Pall.Haraldsson@gmail.com>", "Jon Malmaud <malmaud@gmail.com>", "Jake Bolewski <jakebolewski@gmail.com>", "Keno Fischer <keno@alumni.harvard.edu>", "Joel Mason <jobba1@hotmail.com>", "Jameson Nash <vtjnash@gmail.com>", "The JuliaPy development team"]
-version = "1.91.2"
+version = "1.91.3"
 
 [deps]
 Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"

diff --git a/src/pyinit.jl b/src/pyinit.jl
@@ -181,6 +181,10 @@ function __init__()
             else
                 pyhome = pythonhome_of(current_python())
             end
+        elseif conda && Sys.iswindows()
+            # some Python modules on Windows need the PATH to include
+            # Anaconda's Library\bin directory in order to find their DLL files
+            ENV["PATH"] = Conda.bin_dir(Conda.ROOTENV) * ";" * get(ENV, "PATH", "")
         end
 
         Py_SetPythonHome(libpy_handle, pyversion, pyhome)