switch some ci run to default pythoncall backend

slimgroup · Oct 28, 2024 · f91943e · f91943e
1 parent 350622c
commit f91943e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/.github/workflows/ci-judi.yml b/.github/workflows/ci-judi.yml
@@ -58,18 +58,6 @@ jobs:
           brew install llvm libomp
           echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH
 
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.9
-
-      - name: Set julia python
-        run: |
-          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
-
       - name: Build JUDI
         uses: julia-actions/julia-buildpkg@latest
 

diff --git a/.github/workflows/deploy_doc.yaml b/.github/workflows/deploy_doc.yaml
@@ -30,8 +30,11 @@ jobs:
 
       - name: Set julia python
         run: |
-          PYTHON=$(which python3) julia -e 'using Pkg;Pkg.add("PyCall");Pkg.build("PyCall")'
-  
+          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
+
       - name: Build JUDI
         uses: julia-actions/julia-buildpkg@latest
 

diff --git a/Project.toml b/Project.toml
@@ -25,9 +25,9 @@ DSP = "0.6, 0.7"
 Dierckx = "0.4, 0.5"
 FFTW = "1"
 Flux = "0.12, 0.13, 0.14"
-JOLI = "0.7, 0.8"
+JOLI = "0.9"
 OrderedCollections = "1.5"
-PythonCall = "0.9.23"
+PythonCall = "0.9.21"
 Requires = "1"
 SegyIO = "0.7.7 - 0.8.5"
 TimerOutputs = "0.5"

diff --git a/deps/build.jl b/deps/build.jl
@@ -14,6 +14,9 @@ catch e
     pyimport("pkg_resources")
 end
 
+################## JOLI ##################
+run(Cmd(`$(pyexe) -m pip install -U --user --no-cache-dir PyWavelets`))
+
 ################## Devito ##################
 # pip command
 dvver = "4.8.10"
@@ -26,7 +29,7 @@ try
         run(cmd)
     end
 catch e
-    @info "Devito  not installed, installing with PyCall python"
+    @info "Devito  not installed, installing with PythonCall python"
     run(cmd)
 end