merge with dev

Author: wolfidan

.github/workflows/pyrad_tests_base.yml

@@ -34,6 +34,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:
@@ -44,24 +52,6 @@ jobs:
         with:
           repository: MeteoSwiss/pyrad-tests
           path: pyrad-tests
-      - name: Setup Miniconda
-        uses: mamba-org/setup-micromamba@v1.9.0
-        with:
-          micromamba-version: '2.0.0-0'
-          python-version: ${{ matrix.python-version }}
-          channels: conda-forge
-          channel-priority: flexible
-          init-shell: >-
-            bash
-          activate-environment: test-environment
-
-      - name: Install dependencies
-        env:
-          PACKAGES: ${{env.MINIMAL_DEPENDENCIES}} ${{env.OPTIONAL_DEPENDENCIES}} ${{env.TEST_DEPENDENCIES}}
-          PYRAD_TESTS_PATH: ${{github.workspace}}/pyrad-tests/
-        run: |
-          conda install --quiet ${{env.PACKAGES}}
-          pip install wradlib
       - name: Install pyart
         working-directory:  ${{github.workspace}}/pyart/
         run: python -m pip install .

.github/workflows/pyrad_tests_mch.yml

@@ -37,27 +37,19 @@ jobs:
         with:
          submodules: recursive
          ref : master
+      # 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:
           repository: MeteoSwiss/pyrad-tests
           path: pyrad-tests
-      - name: Setup Miniconda
-        uses: conda-incubator/setup-miniconda@v2.0.0
-        with:
-          auto-update-conda: true
-          python-version: ${{ matrix.python-version }}
-          channels: conda-forge
-          channel-priority: flexible
-          activate-environment: test-environment
-
-      - name: Install dependencies
-        env:
-          PACKAGES: ${{env.MINIMAL_DEPENDENCIES}} ${{env.OPTIONAL_DEPENDENCIES}} ${{env.TEST_DEPENDENCIES}}
-          PYRAD_TESTS_PATH: ${{github.workspace}}/pyrad-tests/
-        run: |
-          conda install -c conda-forge ${{env.PACKAGES}}
-          pip install wradlib
       - name: Install pyart
         if: matrix.os != 'macos-latest'
         working-directory: ${{github.workspace}}/src/pyart/

ci/parse_pyrad_processes.py

@@ -1,4 +1,3 @@
-# %%
 from pathlib import Path
 import inspect
 import re
@@ -44,8 +43,6 @@ def dict_to_restructured_text(yaml_data):
                 for ele in value3:
                     rst_output.append('     | ' + ele)
             rst_output.append('')
-            rst_output.append('returns')
-            rst_output.append('   ' + value2['returns'] +'\n')
             # rst_output.append(f"\n\n{value2['parameters']}\n\n")
     return '\n'.join(rst_output)
 
@@ -111,7 +108,7 @@ def process_docstring(docstr):
     returns_dict[header] = list(returns.strip().split('\n'))[1:]
     dic = {'description': " ".join(description.split()),
            'parameters': parse_string_to_dict(attributes),
-           'returns': returns.strip()}
+           'returns': returns_dict}
     return dic
 
 
@@ -146,6 +143,3 @@ def process_docstring(docstr):
 fname = Path(OUT_DIRECTORY, 'list_process.rst')
 with open(fname, 'w') as f:
     f.write(rst_content)
-
-
-# %%