diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 02999808..ce3e2ac6 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - version: ['1.6', '1.7', '1.8', '1.9', '1.10'] + version: ['1.10', '1.11'] steps: - name: Check event name @@ -69,7 +69,7 @@ jobs: strategy: fail-fast: false matrix: - version: ['1.6', '1.7', '1.8', '1.9', '1.10'] + version: ['1.10', '1.11'] steps: - name: Run simple test diff --git a/Project.toml b/Project.toml index 551fcde9..745d35b7 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "JUDI" uuid = "f3b833dc-6b2e-5b9c-b940-873ed6319979" authors = ["Philipp Witte, Mathias Louboutin"] -version = "4.0.0" +version = "4.0.1" [deps] ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" diff --git a/deps/build.jl b/deps/build.jl index 7c1a2f72..a4284405 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -5,7 +5,14 @@ struct DevitoException <: Exception msg::String end -pyexe = PythonCall.python_executable_path() +if get(ENV, "JULIA_CONDAPKG_BACKEND", "conda") == "Null" + pyexe = PythonCall.python_executable_path() +else + pyexe = CondaPkg.withenv() do + condapy = CondaPkg.which("python") + return condapy + end +end pk = try pyimport("pkg_resources")