FIX: changed dependencies for ci tests

MeteoSwiss · Nov 5, 2024 · a7d42e7 · a7d42e7
1 parent a75888f
commit a7d42e7
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 39 deletions.
diff --git a/.github/workflows/pyrad_tests_base_dev.yml b/.github/workflows/pyrad_tests_base_dev.yml
@@ -1,7 +1,4 @@
 name: Test pyrad base dev
-env:
-  MINIMAL_DEPENDENCIES: Cython numpy cartopy
-  TEST_DEPENDENCIES: pytest pygrib  imageio xarray-datatree
 
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
@@ -34,6 +31,14 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+      # Install dependencies
+      - name: Setup Conda Environment
+        uses: mamba-org/setup-micromamba@v1
+        with:
+          environment-file: ci/environment-ci.yml
+          activate-environment: pyrad-dev
+          cache-downloads: true
+          python-version: ${{ matrix.python-version }}
       - name: Clone pyart
         uses: actions/checkout@master
         with:

diff --git a/.github/workflows/pyrad_tests_mch_dev.yml b/.github/workflows/pyrad_tests_mch_dev.yml
@@ -1,7 +1,4 @@
 name: Test pyrad mch dev
-env:
-  MINIMAL_DEPENDENCIES: Cython numpy cartopy
-  TEST_DEPENDENCIES: pytest pygrib imageio gdal
 
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
@@ -30,6 +27,14 @@ jobs:
       - uses: actions/checkout@v2
         with:
          ref : dev
+      # Install dependencies
+      - name: Setup Conda Environment
+        uses: mamba-org/setup-micromamba@v1
+        with:
+          environment-file: ci/environment-ci.yml
+          activate-environment: pyrad-dev
+          cache-downloads: true
+          python-version: ${{ matrix.python-version }}
       - name: Clone pyrad-tests
         uses: actions/checkout@main
         with:

diff --git a/ci/environment-ci.yml b/ci/environment-ci.yml
@@ -0,0 +1,39 @@
+name: pyrad-dev
+channels:
+  - conda-forge
+dependencies:
+  - numpy
+  - scipy
+  - matplotlib
+  - gdal
+  - netcdf4
+  - pandas
+  - pytest
+  - wradlib
+  - cartopy
+  - cvxopt
+  - wradlib
+  - xarray<2024.10.0
+  - xradar
+  - metpy
+  - pytest-cov
+  - mda-xdrlib
+  - pytest-mpl
+  - coveralls
+  - flake8
+  - Cython
+  - fsspec
+  - glpk
+  - pygrib
+  - imageio
+  - cftime
+  - setuptools
+  - shapely
+  - ruff
+  - pip
+  - pip:
+    - cibuildwheel
+    - pooch
+    - versioneer
+    - black
+    - git+https://github.com/openradar/open-radar-data
diff --git a/tools/processData/launch_sbatch.sbatch b/tools/processData/launch_sbatch.sbatch
@@ -9,9 +9,9 @@ DEFAULT_PYART_CONFIG="$HOME/pyrad/config/pyart/mch_config.py"
 DEFAULT_CONDA_ENV_NAME="pyart"
 
 # Assign arguments or defaults
-PYART_CONFIG=${3:-$DEFAULT_PYART_CONFIG}
+EXECUTABLE=$1
+PYART_CONFIG=${2:-$DEFAULT_PYART_CONFIG}
 
-export PYTHONUNBUFFERED=1
 export PATH=$PATH
 export PYART_CONFIG=$PYART_CONFIG
 export CONDA_ENV_NAME=$DEFAULT_CONDA_ENV_NAME
@@ -21,36 +21,5 @@ current_time=$(date +'%Y%m%d%H%M%S')
 echo $current_time
 echo "Launched executable $EXECUTABLE"
 
-source activate $CONDA_ENV_NAME
-
-$EXECUTABLE
-
-source deactivate
-
-
-
-#!/bin/bash
-#SBATCH -N 1     # nodes requested
-#SBATCH -c 1      # cores requested
-#SBATCH -t 10:0:00  # time requested in hour:minute:second
-#SBATCH --partition postproc
-
-# other sbatch options:
-# mem-per-cpu : maximum amount of real memory per allocated cpu required by the job
-#               --mem >= --mem-per-cpu if --mem is specified
-
-EXECUTABLE=$1
-
-export PYTHONUNBUFFERED=1
-export PATH=/store_new/mch/msrad/utils/miniconda-wolfensb/envs/pyart/bin/:$PATH
-export PYART_CONFIG=$HOME/pyrad/config/pyart/mch_config.py
-current_time=$(date +'%Y%m%d%H%M%S')
-
-echo
-echo "Launched executable $EXECUTABLE"
-
-source activate pyart
-
 $EXECUTABLE
 
-source deactivate