Skip to content

Commit

Permalink
fix build with CondaEnv
Browse files Browse the repository at this point in the history
  • Loading branch information
@mloubout
mloubout committed Nov 1, 2024
1 parent b299fc3 commit a0573a4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
9 changes: 8 additions & 1 deletion deps/build.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.C.python_executable_path()
else
pyexe = PythonCall.CondaPkg.withenv() do
condapy = PythonCall.C.CondaPkg.which("python")
return condapy
end
end

pk = try
pyimport("pkg_resources")
Expand Down

2 comments on commit a0573a4

@mloubout
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request updated: JuliaRegistries/General/118513

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v4.0.1 -m "<description of version>" a0573a4d17bc919a64a0699d9e2b705378592ef8
git push origin v4.0.1

Please sign in to comment.