Add artifacts creation to GitHub actions again

Author: jochenklar

.github/workflows/ci.yaml

@@ -17,8 +17,8 @@ env:
   PYTHON_VERSION: "3.11"
 
 jobs:
-  setup:
-    name: Setup tests
+  test:
+    name: Run tests
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -29,17 +29,17 @@ jobs:
       with:
         persist-credentials: false
 
-    - name: Restore testing cache 📥
-      uses: actions/cache@v4
-      with:
-        path: |
-          testing/datasets
-          testing/extractions
-          testing/protocol
-          testing/share
-        key: testing-${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('**/*.py') }}
-        restore-keys: |
-          testing-${{ runner.os }}-${{ env.PYTHON_VERSION }}-
+    # - name: Restore testing cache 📥
+    #   uses: actions/cache@v4
+    #   with:
+    #     path: |
+    #       testing/datasets
+    #       testing/extractions
+    #       testing/protocol
+    #       testing/share
+    #     key: testing-${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('isimip_utils/tests/constants.py') }}
+    #     restore-keys: |
+    #       testing-${{ runner.os }}-${{ env.PYTHON_VERSION }}-
 
     - name: Install cdo 🌍
       run: |
@@ -50,63 +50,35 @@ jobs:
       uses: actions/setup-python@v6
       with:
         python-version: ${{ env.PYTHON_VERSION }}
+        cache: 'pip'
 
     - name: Install package 📦
-      run: pip install -e .[all]
+      run: |
+        pip install --upgrade pip
+        pip install -e .[all]
 
     - name: Run setup scripts 🔧
       run: |
         python testing/download.py
         python testing/setup.py
 
-    - name: Save testing cache 📤
-      if: always()
-      uses: actions/cache/save@v4
-      with:
-        path: |
-          testing/datasets
-          testing/extractions
-          testing/protocol
-          testing/share
-        key: testing-${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('**/*.py') }}
-
-  test:
-    name: Run tests
-    needs: setup
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-    - name: Check out repository 💾
-      uses: actions/checkout@v5
-      with:
-        persist-credentials: false
-
-    - name: Restore testing cache 📥
-      uses: actions/cache@v4
-      with:
-        path: |
-          testing/datasets
-          testing/extractions
-          testing/protocol
-          testing/share
-        key: testing-${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('**/*.py') }}
-        restore-keys: |
-          testing-${{ runner.os }}-${{ env.PYTHON_VERSION }}-
-
-    - name: Install cdo 🌍
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y cdo netcdf-bin --no-install-recommends
-
-    - name: Set up Python 🐍
-      uses: actions/setup-python@v6
-      with:
-        python-version: ${{ env.PYTHON_VERSION }}
-
-    - name: Install package 📦
-      run: pip install -e .[all]
+    # - name: Save testing cache 📤
+    #   if: always()
+    #   uses: actions/cache/save@v4
+    #   with:
+    #     path: |
+    #       testing/datasets
+    #       testing/extractions
+    #       testing/protocol
+    #       testing/share
+    #     key: testing-${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('isimip_utils/tests/constants.py') }}
 
     - name: Run pytest 🧪
-      run: pytest --cov=isimip_utils --cov-fail-under=90 --cov-report=term-missing
+      run: pytest --cov=isimip_utils --cov-fail-under=90 --cov-report=term-missing isimip_utils/tests/test_fetch.py
+
+    # - name: Upload testing directory 📤
+    #   uses: actions/upload-artifact@v5
+    #   with:
+    #     name: testing
+    #     path: |
+    #       testing/protocol

testing/download.py

@@ -3,8 +3,8 @@
 
 
 def main():
-    download_datasets()
     download_protocol()
+    download_datasets()
 
 
 def download_datasets():
@@ -16,7 +16,7 @@ def download_datasets():
 
         url = f"https://files.isimip.org/{path}"
 
-        helper.call(f'wget -c {url} -O {file_path}')
+        helper.call(f'curl -C - -L -f -o {file_path} {url}')
 
 
 def download_protocol():
@@ -28,7 +28,7 @@ def download_protocol():
 
         url = f"https://protocol.isimip.org/{path}"
 
-        helper.call(f'wget -c {url} -O {file_path}')
+        helper.call(f'curl -C - -L -f -o {file_path} {url}')
 
 
 if __name__ == "__main__":