Merge branch 'master' of github.com:arfc/saltproc into fix_deps

arfc · Jan 15, 2025 · c0d11b6 · c0d11b6
2 parents 178c6da + d90d275
commit c0d11b6
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 27 deletions.
diff --git a/.github/workflows/auto-labels.yml b/.github/workflows/auto-labels.yml
@@ -16,7 +16,7 @@ jobs:
         shell: bash -l {0}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Remove Priority and Status labels
         run: |
           id=${{ github.event.issue.number }}
@@ -35,7 +35,7 @@ jobs:
         shell: bash -l {0}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Remove Priority and Status labels
         run: |
           id=${{ github.event.pull_reqeust.number }}

diff --git a/.github/workflows/cache-dependencies.yml b/.github/workflows/cache-dependencies.yml
@@ -27,14 +27,13 @@ jobs:
       LIBMESH: no
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
 ## TESTING CACHE ##
 # Setup conda 
       - name: Set up conda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge # mamba is faster than base conda
           miniforge-version: latest
           activate-environment: saltproc-env
           use-mamba: true
@@ -46,7 +45,7 @@ jobs:
       - name: Set cache date
         run: echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: dependencies-cache
         with:
           path: |
@@ -72,7 +71,7 @@ jobs:
 
       - name: Download OpenMC
         if: steps.dependencies-cache.outputs.cache-hit != 'true'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with: 
           repository: openmc-dev/openmc
           path: openmc
@@ -99,13 +98,12 @@ jobs:
         shell: bash -l {0}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
 ## DOCUMENTATION CACHE ##
       - name: Set up conda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge # mamba is faster than base conda
           miniforge-version: latest
           activate-environment: saltproc-doc-env
           use-mamba: true
@@ -117,7 +115,7 @@ jobs:
       - name: Set cache date
         run: echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: dependencies-cache
         with:
           path: |
@@ -132,7 +130,7 @@ jobs:
 
       - name: Download OpenMC
         if: steps.dependencies-cache.outputs.cache-hit != 'true'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with: 
           repository: openmc-dev/openmc
           path: openmc

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -23,15 +23,14 @@ jobs:
         shell: bash -l {0}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
             fetch-depth: 0
 
 # Setup conda 
       - name: Set up conda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge # mamba is faster than base conda
           miniforge-version: latest
           activate-environment: saltproc-doc-env
           use-mamba: true
@@ -43,7 +42,7 @@ jobs:
       - name: Set cache date
         run: echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: dependencies-cache
         with:
           path: |
@@ -68,7 +67,7 @@ jobs:
             cp doc/redirect.html doc/_build/html/index.html
 
       - name: Deploy documentation to gh-pages branch
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./doc/_build/html

diff --git a/.github/workflows/populate-releasenotes.yml b/.github/workflows/populate-releasenotes.yml
@@ -18,12 +18,12 @@ jobs:
         shell: bash -l {0}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.10
       - name: Add conda to system path
         run: |
           # $CONDA is an environment variable pointing to the root of the miniconda directory

diff --git a/.github/workflows/test-saltproc.yml b/.github/workflows/test-saltproc.yml
@@ -33,13 +33,12 @@ jobs:
       LIBMESH: no
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
 # Setup conda 
       - name: Set up conda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge # mamba is faster than base conda
           miniforge-version: latest
           channels: conda-forge
           activate-environment: saltproc-env
@@ -52,7 +51,7 @@ jobs:
       - name: Set cache date
         run: echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: dependencies-cache
         with:
           path: |
@@ -79,7 +78,7 @@ jobs:
 
       - name: Download OpenMC
         if: steps.dependencies-cache.outputs.cache-hit != 'true'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with: 
           repository: openmc-dev/openmc
           path: openmc

diff --git a/saltproc/version.py b/saltproc/version.py
@@ -72,7 +72,7 @@
 
 NAME = "saltproc"
 MAINTAINER = "Oleksandr Yardas"
-MAINTAINER_EMAIL = "arfc@googlegroups.com"
+MAINTAINER_EMAIL = "olek.yardin@gmail.com"
 DESCRIPTION = description
 LONG_DESCRIPTION = long_description
 URL = "http://github.com/arfc/saltproc"