Merge pull request #1466 from Open-MSS/merge_develop_to_stable

Merge develop to stable

Author: ReimarBauer

.github/workflows/build_docs_gallery.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
     - name: Trust My Directory
       run: git config --global --add safe.directory /__w/MSS/MSS
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Create gallery
       timeout-minutes: 25

.github/workflows/python-flake8.yml

@@ -18,9 +18,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python 3.8
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: 3.8
     - name: Lint with flake8

.github/workflows/testing-develop.yml

@@ -0,0 +1,32 @@
+name: test develop
+
+on:
+  push:
+    branches:
+    - develop
+  pull_request:
+    branches:
+    - develop
+
+jobs:     
+  test-develop:
+    uses: 
+      ./.github/workflows/testing.yml
+    with:
+      xdist: no
+      branch_name: develop
+      event_name: ${{ github.event_name }}
+    secrets: 
+      PAT: ${{ secrets.PAT }}
+
+  test-develop-xdist:
+    uses: 
+      ./.github/workflows/testing.yml
+    with:
+      xdist: yes
+      branch_name: develop
+      event_name: ${{ github.event_name }}
+    secrets:
+      PAT: ${{ secrets.PAT }}
+
+

.github/workflows/testing-stable.yml

@@ -0,0 +1,32 @@
+name: test stable
+
+on:
+  push:
+    branches:
+    - stable
+  pull_request:
+    branches:
+    - stable
+
+jobs:     
+  test-stable:
+    uses: 
+      ./.github/workflows/testing.yml
+    with:
+      xdist: no
+      branch_name: stable
+      event_name: ${{ github.event_name }}
+    secrets:
+      PAT: ${{ secrets.PAT }}
+
+  test-stable-xdist:
+    uses: 
+      ./.github/workflows/testing.yml
+    with:
+      xdist: yes
+      branch_name: stable
+      event_name: ${{ github.event_name }}
+    secrets:
+      PAT: ${{ secrets.PAT }}
+
+

.github/workflows/testing.yml

@@ -1,17 +1,24 @@
 name: Pytest MSS
 
-on:
-  push:
-    branches:
-    - develop
-    - stable
-  pull_request:
-    branches:
-    - develop
-    - stable
+on:                                                                                  
+  workflow_call:
+    inputs:
+      xdist:
+        required: true
+        type: string
+      branch_name:
+        required: true
+        type: string
+      event_name:
+        required: true
+        type: string
+    secrets:
+      PAT:
+        required: true
 
 env:
   PAT: ${{ secrets.PAT }}
+  EVENT: ${{ inputs.event_name }}
 
 jobs:
   Test-MSS:
@@ -22,29 +29,32 @@ jobs:
         shell: bash
 
     container:
-      image: openmss/mss-test:latest
+      image: openmss/testing-${{ inputs.branch_name }}
 
     steps:
     - name: Trust My Directory
       run: git config --global --add safe.directory /__w/MSS/MSS
-    - uses: actions/checkout@v2
-        
+
+    - uses: actions/checkout@v3
     - name: Reinstall dependencies if changed
+      id: step1
       run: |
         cmp -s /meta.yaml localbuild/meta.yaml && cmp -s /development.txt requirements.d/development.txt || (echo Dependencies differ \
+        && echo "triggerdockerbuild=yes" >> $GITHUB_ENV \
         && cat localbuild/meta.yaml \
         | sed -n '/^requirements:/,/^test:/p' \
         | sed -e "s/.*- //" \
         | sed -e "s/menuinst.*//" \
         | sed -e "s/.*://" > reqs.txt \
-        && source /opt/conda/bin/activate mssenv \
-        && conda install --revision 0 \
-        && conda install mamba python=3.9.12 \
-        && mamba install pyvirtualdisplay python=3.9.12 \
-        && mamba install --file reqs.txt \
-        && mamba install --file requirements.d/development.txt)
+        && conda create -n new_mssenv mamba python\<3.10 \
+        && conda activate new_mssenv \
+        && mamba install -c conda-forge pyvirtualdisplay python\<3.10 -y \
+        && mamba install -c conda-forge --file reqs.txt -y \
+        && mamba install -c conda-forge --file requirements.d/development.txt -y  \
+        && conda create --name mssenv --copy --clone new_mssenv -y)
 
     - name: Run tests
+      if: ${{ success() && inputs.xdist == 'no' }}
       timeout-minutes: 25
       run: |
         source /opt/conda/bin/activate mssenv \
@@ -55,9 +65,20 @@ jobs:
           && break \
         ; done)
 
-        
-    - name: coveralls
-      if: ${{ always() && github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
+    - name: Run tests in parallel
+      if: ${{ success() && inputs.xdist == 'yes' }}
+      timeout-minutes: 25
+      run: |
+        source /opt/conda/bin/activate mssenv \
+        && cd $GITHUB_WORKSPACE \
+        && pytest -vv -n 6 --dist loadfile --max-worker-restart 0 mslib \
+        || (for i in {1..5} \
+          ; do pytest -vv -n 6 --dist loadfile --max-worker-restart 0 mslib --last-failed --lfnf=none \
+          && break \
+        ; done)
+
+    - name: Collect coverage
+      if: ${{ always() && inputs.event_name == 'push' && inputs.branch_name == 'develop' && inputs.xdist == 'no'}}
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
@@ -66,17 +87,11 @@ jobs:
         && mamba install coveralls \
         && coveralls --service=github
 
-  Update-Images:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push'
-    needs: [Test-MSS]
-    
-    steps:
-      - if: env.PAT != ''
-        name: Invoke dockerhub image creation
-        uses: benc-uk/workflow-dispatch@827565b908f387ffd483c84312273ae185c06c8a
-        with:
-          workflow: Update all images
-          repo: Open-MSS/dockerhub
-          ref: stable
-          token: ${{ secrets.PAT }}
+    - name: Invoke dockertesting image creation
+      if: ${{ always() && inputs.event_name == 'push' && env.triggerdockerbuild == 'yes' && inputs.xdist == 'no'}}
+      uses: benc-uk/workflow-dispatch@827565b908f387ffd483c84312273ae185c06c8a
+      with:
+        workflow: Update Image testing-${{ inputs.branch_name }}
+        repo: Open-MSS/dockertesting
+        ref: main
+        token: ${{ secrets.PAT }}

.github/workflows/xdist_testing.yml

@@ -19,6 +19,7 @@ in alphabetic order by first name
 - Reimar Bauer <rb.proj@gmail.com>
 - Sakshi Chopkar <sakshichopkar@gmail.com>
 - Shivashis Padhi <shivashispadhi@gmail.com>
+- Sonja Gisinger <sonja.gisinger@dlr.de>
 - Sreelakshmi Jayarajan <sreelakshmipj555@gmail.com>
 - Tanish Grover <tanish1908@gmail.com>
 - Thomas Breuer <t.breuer@fz-juelich.de>

AUTHORS

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+Version 6.2.0
+~~~~~~~~~~~~~
+
+This release includes the use of the new basemap-1.3.3 release and enables packaging for python 3.10.x.
+We added the possibility of flight level as vertical coordinate.
+A user can now leave on his own an operation. 
+
+
+All changes:
+https://github.com/Open-MSS/MSS/milestone/80?closed=1
+
+
 Version 6.1.1
 ~~~~~~~~~~~~~
 

CHANGES.rst

@@ -131,6 +131,8 @@ The vertical coordinate variable is identified by the standard_name being one of
 
 - atmosphere_potential_temperature_coordinate - "tl"
 
+- fligth_level_coordinate -"fl"
+
 The two-letter abbreviation is used for brief identification in the plotting routines in addition
 to the standard_name of the variable to uniquely identify which data shall be used.
 The data shall be organized with the dimensions in the order of "time", "vertical coordinate",

docs/mswms.rst

@@ -9,7 +9,7 @@ source:
   path: ../
 
 build:
-  skip: true  # [py27]
+  skip: true  # [py<38]
   number: 1000
   script: "{{ PYTHON }} -m pip install . --no-deps -vv"  # [not win]
   entry_points:
@@ -20,19 +20,18 @@ build:
 
 requirements:
   build:
-    - python
+    - python <3.10
     - pip
     - future
     - menuinst  # [win]
   run:
-    - python
+    - python <3.10
     - defusedxml
     - menuinst  # [win]
-    - basemap >1.2.1
+    - basemap >=1.3.3
     - chameleon
     - execnet
     - fastkml =0.11
-    - gsl =2.7.0
     - isodate
     - lxml
     - netcdf4
@@ -75,8 +74,6 @@ requirements:
     - xstatic
     - xstatic-jquery
     - xstatic-bootstrap
-    - pyperclip
-    - geos <3.9.0
     - gpxpy >=1.4.2
     - metpy
     - pycountry
@@ -94,7 +91,8 @@ test:
 about:
   summary: 'A web service based tool to plan atmospheric research flights.'
   home: https://github.com/Open-MSS/MSS
-  license: Apache-2.0
+  license: "Apache-2.0"
+  license_family: "APACHE"
   license_file: LICENSE
   description: |
     MSS - Mission Support System