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 1771d8b
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-examples.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
python3 -m pip install -U pip
python3 -m pip install "matplotlib<3.9" seiscm colorcet
echo "JULIA_PYTHONCALL_EXE=$(which python3)" >> $GITHUB_ENV
echo "JULIA_CONDAPKG_BACKEND=\"Null\"" >> $GITHUB_ENV
echo "JULIA_CONDAPKG_BACKEND=Null" >> $GITHUB_ENV
echo "PYTHON=$(which python3)" >> $GITHUB_ENV
echo "PYCALL_JL_RUNTIME_PYTHON=$(which python3)" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-op.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
echo "PYTHON=$(which python3)" >> $GITHUB_ENV
echo "PYCALL_JL_RUNTIME_PYTHON=$(which python3)" >> $GITHUB_ENV
echo "JULIA_PYTHONCALL_EXE=$(which python3)" >> $GITHUB_ENV
echo "JULIA_CONDAPKG_BACKEND=\"Null\"" >> $GITHUB_ENV
echo "JULIA_CONDAPKG_BACKEND=Null" >> $GITHUB_ENV
- name: Build JUDI
uses: julia-actions/julia-buildpkg@latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_doc.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
echo "PYTHON=$(which python3)" >> $GITHUB_ENV
echo "PYCALL_JL_RUNTIME_PYTHON=$(which python3)" >> $GITHUB_ENV
echo "JULIA_PYTHONCALL_EXE=$(which python3)" >> $GITHUB_ENV
echo "JULIA_CONDAPKG_BACKEND=\"Null\"" >> $GITHUB_ENV
echo "JULIA_CONDAPKG_BACKEND=Null" >> $GITHUB_ENV
- name: Build JUDI
uses: julia-actions/julia-buildpkg@latest
Expand Down
82 changes: 0 additions & 82 deletions .github/workflows/docker-publish.yml
View file

This file was deleted.

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
10 changes: 9 additions & 1 deletion deps/build.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,15 @@ struct DevitoException <: Exception
msg::String
end

pyexe = PythonCall.python_executable_path()
if PythonCall.C.CondaPkg.backend() == :Null
pyexe = PythonCall.python_executable_path()
else
@info "Using $(PythonCall.C.CondaPkg.backend()) as the CondaPkg backend"
pyexe = PythonCall.C.CondaPkg.withenv() do
condapy = PythonCall.C.CondaPkg.which("python")
return condapy
end
end

pk = try
pyimport("pkg_resources")
Expand Down

2 comments on commit 1771d8b

@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>" 1771d8b7585e9c159a3e919d63c4d8ca9651534f
git push origin v4.0.1

Please sign in to comment.