[build] update workflows for 3.2.x and pypi

TRIQS · Mar 22, 2024 · a9fd4ec · a9fd4ec
1 parent 2c9febc
commit a9fd4ec
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml
@@ -12,27 +12,28 @@ env:
   OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
   OMPI_MCA_rmaps_base_oversubscribe: "yes"
 
+permissions:
+  contents: write
+
 jobs:
   build:
 
     strategy:
       fail-fast: false
 
     runs-on: ubuntu-latest
-    container: ghcr.io/triqs/solid_dmft_github_ci:3.2.x
+    container:
+      image: ghcr.io/triqs/solid_dmft_github_ci:3.2.x
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          path: 'solid_dmft.src'
 
       - name: Build solid_dmft
         run: |
-          mkdir solid_dmft.build && cd solid_dmft.build && cmake ../solid_dmft.src -DMPIEXEC_PREFLAGS='--allow-run-as-root'
-          make
+          cmake -S . -B build/
+          cmake --build build/ --verbose
 
       - name: Test solid_dmft
         run: |
-          cd solid_dmft.build
-          ctest --output-on-failure
+          cmake --build build/ --target test
 
diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
@@ -11,8 +11,7 @@ jobs:
     name: Build distribution 📦
     runs-on: ubuntu-latest
     container:   # we have to provide a working triqs installation to make the cmake step work
-      # image: materialstheory/solid_dmft_ci:${{github.ref_name}}
-      image: materialstheory/solid_dmft_ci:3.2.x
+      image: ghcr.io/triqs/solid_dmft_github_ci:3.2.x
 
     steps:
     - uses: actions/checkout@v4
@@ -28,11 +27,11 @@ jobs:
         --user
     - name: prepare python distribution
       run: |
-        mkdir build && cd build 
-        cmake ../
-        cp packaging/pypi/* ../
-        mv python/solid_dmft/version.py ../python/solid_dmft/version.py
-        rm ../python/solid_dmft/version.py.in
+        git config --global --add safe.directory ${GITHUB_WORKSPACE}
+        cmake -S . -B build/
+        cp build/packaging/pypi/* ./
+        mv build/python/solid_dmft/version.py ./python/solid_dmft/version.py
+        rm ./python/solid_dmft/version.py.in
     - name: Build a binary wheel and a source tarball
       run: python3 -m build
     - name: Store the distribution packages

diff --git a/packaging/pypi/pyproject.toml.in b/packaging/pypi/pyproject.toml.in
@@ -23,9 +23,7 @@ classifiers = [
 dependencies = [
     "numpy",
     "scipy",
-    "pytest",
-    "scikit-image",
-    "argparse"
+    "pytest"
 ]
 
 [project.urls]