Fixes

abinit · Jul 21, 2024 · e702fae · e702fae
1 parent b389c4f
commit e702fae
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 49 deletions.
diff --git a/.github/workflows/abipy-lint.yml b/.github/workflows/abipy-lint.yml
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -21,19 +21,34 @@ jobs:
   build:
     # prevent this action from running on forks
     if: github.repository == 'abinit/abipy'
+    defaults:
+      run:
+        shell: bash -l {0} # enables conda/mamba env activation by reading bash profile
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Check out Abipy repo
         uses: actions/checkout@v4
 
       - name: Setup Pages
         uses: actions/configure-pages@v3
 
-      - name: Build with Jekyll
-        uses: actions/jekyll-build-pages@v1
-        with:
-          source: ./docs
-          destination: ./_site
+      - name: Installing abinit from conda-forge and abipy with python=${{ matrix.config.python }}
+        run: |
+            conda create -n abipy python=${{ matrix.config.python }} --yes
+            conda activate abipy
+            conda install abinit -c conda-forge --yes
+            abinit --version
+            abinit --build
+            pip install . # --editable
+            mkdir -p $HOME/.abinit/abipy/
+            cp abipy/data/managers/travis_manager.yml $HOME/.abinit/abipy/manager.yml
+            cp abipy/data/managers/simple_scheduler.yml $HOME/.abinit/abipy/scheduler.yml
+
+      - name: Build docs with Sphinx
+        run: |
+            cd docs
+            pip install -r requirements.txt
+            make -j
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v2

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -53,7 +53,7 @@ jobs:
             conda install abinit -c conda-forge --yes
             abinit --version
             abinit --build
-            pip install . # --editable
+            pip install . --editable
             mkdir -p $HOME/.abinit/abipy/
             cp abipy/data/managers/travis_manager.yml $HOME/.abinit/abipy/manager.yml
             cp abipy/data/managers/simple_scheduler.yml $HOME/.abinit/abipy/scheduler.yml
@@ -62,4 +62,5 @@ jobs:
         run: |
           conda activate abipy
           #abicheck.py --with-flow
+          pip install -r requirements-test.txt
           pytest --splits 10 --group ${{ matrix.split }} # --durations-path tests/files/.pytest-split-durations tests
diff --git a/docs/workflows/manager_examples.rst b/docs/workflows/manager_examples.rst
@@ -597,7 +597,7 @@ Travis
 	      job:
 	        mpi_runner: mpirun
 	        pre_run:
-	            - source activate abinit-environment
+	            - conda activate abipy
 	      limits:
 	         min_cores: 1
 	         max_cores: 2