Merge pull request #934 from SciML/ChrisRackauckas-patch-2

test master

Author: ChrisRackauckas

test/python/Project.toml

@@ -1,13 +1,11 @@
 [deps]
 DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
-PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
 PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 
 [compat]
 DifferentialEquations = "7.11"
 OrdinaryDiffEq = "6.33"
-PyCall = "1.96"
 PythonCall = "0.9.14"
 SciMLBase = "2"

test/python/pycall.jl

@@ -1,10 +1,13 @@
-# PyCall and PythonCall must use the same Python interpreter. This environment variable
-# tells PythonCall to use the same Python interpreter as PyCall. See
-# https://github.com/JuliaPy/PythonCall.jl/blob/5f56a9b96b867a9f6742ab1d1e2361abd844e19f/docs/src/pycall.md#tips
-ENV["JULIA_PYTHONCALL_EXE"] = "@PyCall"
-
 using DifferentialEquations, PythonCall
 
+pyexec(
+    """ # This is a mess because normal site-packages is not writeable in CI
+import subprocess, sys, site
+subprocess.run([sys.executable, '-m', 'pip', 'install', '--user', 'julia'])
+subprocess.run([sys.executable, '-m', 'pip', 'install', '--user', 'diffeqpy'])
+sys.path.append(site.getusersitepackages())
+""", @__MODULE__)
+
 @testset "Use of DifferentialEquations through PythonCall with user code written in Python" begin
     pyexec("""
     from juliacall import Main

test/python/pythoncall.jl

@@ -154,9 +154,6 @@ end
 
     if !is_APPVEYOR && GROUP == "Python"
         activate_python_env()
-        @time @safetestset "PyCall" begin
-            include("python/pycall.jl")
-        end
         @time @safetestset "PythonCall" begin
             include("python/pythoncall.jl")
         end