Merge pull request #1741 from Open-MSS/merge_develop_to_stable_v8

Merge develop to stable v8

.github/workflows/build_docs_gallery.yml

@@ -1,6 +1,17 @@
 name: Build Gallery
 
-on: pull_request
+on: 
+   pull_request:
+     inputs:
+        branch_name:
+          required: true
+          type: string
+        secrets:
+          PAT:
+            required: true
+
+env:
+  PAT: ${{ secrets.PAT }}
 
 jobs:
   Test-MSS-docs:
@@ -11,7 +22,7 @@ jobs:
         shell: bash
 
     container:
-      image: openmss/mss-test:latest
+      image: openmss/testing-develop
 
     steps:
     - name: Trust My Directory

.github/workflows/python-flake8.yml

@@ -27,4 +27,4 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install flake8
-        flake8 --count --max-line-length=127 --statistics mslib
+        flake8 --count --max-line-length=127 --statistics mslib tests

.github/workflows/testing-develop.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
     - develop
+
   pull_request:
     branches:
     - develop
@@ -29,4 +30,3 @@ jobs:
     secrets:
       PAT: ${{ secrets.PAT }}
 
-

.github/workflows/testing.yml

@@ -54,7 +54,7 @@ jobs:
         cd $GITHUB_WORKSPACE \
         && source /opt/conda/etc/profile.d/conda.sh \
         && source /opt/conda/etc/profile.d/mamba.sh \
-        && mamba activate mssenv \
+        && mamba activate mss-${{ inputs.branch_name }}-env \
         && mamba deactivate \
         && cat localbuild/meta.yaml \
         | sed -n '/^requirements:/,/^test:/p' \
@@ -64,14 +64,14 @@ jobs:
         && cat requirements.d/development.txt >> reqs.txt \
         && echo pyvirtualdisplay >> reqs.txt \
         && cat reqs.txt \
-        && mamba env remove -n mssenv \
-        && mamba create -y -n mssenv --file reqs.txt
+        && mamba env remove -n mss-${{ inputs.branch_name }}-env \
+        && mamba create -y -n mss-${{ inputs.branch_name }}-env --file reqs.txt
 
     - name: Print conda list
       run: |
         source /opt/conda/etc/profile.d/conda.sh \
         && source /opt/conda/etc/profile.d/mamba.sh \
-        && mamba activate mssenv \
+        && mamba activate mss-${{ inputs.branch_name }}-env \
         && mamba list
 
     - name: Run tests
@@ -81,10 +81,10 @@ jobs:
         cd $GITHUB_WORKSPACE \
         && source /opt/conda/etc/profile.d/conda.sh \
         && source /opt/conda/etc/profile.d/mamba.sh \
-        && mamba activate mssenv \
-        && pytest -v --durations=20 --reverse --cov=mslib mslib \
+        && mamba activate mss-${{ inputs.branch_name }}-env \
+        && pytest -v --durations=20 --reverse --cov=mslib tests \
         || (for i in {1..5} \
-          ; do pytest mslib -v --durations=0 --reverse --last-failed --lfnf=none \
+          ; do pytest tests -v --durations=0 --reverse --last-failed --lfnf=none \
           && break \
         ; done)
 
@@ -95,10 +95,10 @@ jobs:
         cd $GITHUB_WORKSPACE \
         && source /opt/conda/etc/profile.d/conda.sh \
         && source /opt/conda/etc/profile.d/mamba.sh \
-        && mamba activate mssenv \
-        && pytest -vv -n 6 --dist loadfile --max-worker-restart 0 mslib \
+        && mamba activate mss-${{ inputs.branch_name }}-env \
+        && pytest -vv -n 6 --dist loadfile --max-worker-restart 0 tests \
         || (for i in {1..5} \
-          ; do pytest -vv -n 6 --dist loadfile --max-worker-restart 0 mslib --last-failed --lfnf=none \
+          ; do pytest -vv -n 6 --dist loadfile --max-worker-restart 0 tests --last-failed --lfnf=none \
           && break \
         ; done)
 
@@ -110,13 +110,13 @@ jobs:
         cd $GITHUB_WORKSPACE \
         && source /opt/conda/etc/profile.d/conda.sh \
         && source /opt/conda/etc/profile.d/mamba.sh \
-        && mamba activate mssenv \
+        && mamba activate mss-${{ inputs.branch_name }}-env \
         && mamba install coveralls \
         && coveralls --service=github
 
     - name: Invoke dockertesting image creation
       if: ${{ always() && inputs.event_name == 'push' && env.triggerdockerbuild == 'yes' && inputs.xdist == 'no'}}
-      uses: benc-uk/workflow-dispatch@827565b908f387ffd483c84312273ae185c06c8a
+      uses: benc-uk/workflow-dispatch@v1.2.2
       with:
         workflow: Update Image testing-${{ inputs.branch_name }}
         repo: Open-MSS/dockertesting

.gitignore

@@ -19,5 +19,9 @@ docs/_build
 docs/gallery/plots
 docs/gallery/code
 docs/gallery/plots.html
+docs/videos/
 build/
 mss.egg-info/
+tutorials/recordings
+tutorials/cursor_image.png
+

AUTHORS

@@ -16,9 +16,12 @@ in alphabetic order by first name
 - Jörn Ungermann <[email protected]>
 - Marc Rautenhaus <[email protected]>
 - May Bär <[email protected]>
+- Nilupul Manodya <[email protected]>
 - Reimar Bauer <[email protected]>
+- Rishabh Soni <[email protected]>
 - Sakshi Chopkar <[email protected]>
 - Shivashis Padhi <[email protected]>
+- Shubh Gaur <[email protected]>
 - Sonja Gisinger <[email protected]>
 - Sreelakshmi Jayarajan <[email protected]>
 - Tanish Grover <[email protected]>

CHANGES.rst

@@ -1,6 +1,36 @@
 Changelog
 =========
 
+Version 8.0.0
+~~~~~~~~~~~~~
+
+Sreelakshmi Jayarajan created a new CLI module for automated plotting by an user
+and refactored existing plotting and QT based classes modules.
+These classes can be used for plotting purposes without
+involving QT-based GUI and Interactive functionalities.
+Users can retrieve a set of plots for several flights or hundreds of time-steps
+during post-campaign analysis or when compiling an overview over flights of a campaign
+for a daily briefing.
+This allows users to retrieve similar plots of the same parameters
+such as map section, level etc., on a daily basis.
+The initial idea stems from Jörn Ungermann. GSoC mentors were Reimar Bauer, Jörn Ungermann, Christian Rolf, Sonja Gisinger
+
+
+Jatin Jain did UI and server improvements in his GSoC project.
+Users can now, compare and plot multiple flightpaths on topview.
+This feature can be used for flightpathes or MSColab operations.
+A fligthpath style width can be changed.
+Timestamps are dislayed below each message in MSColab.
+Mscolab Operations in use for more than 30 days, move to an inactive list.
+The initial idea for multiple flightpaths on topview stems from bkirbus.
+GSoC mentors were Reimar Bauer, Jörn Ungermann, Sonja Gisinger
+
+With MSS 8.0.0 we base our installation on mambaforge. This has
+mamba in the base environment.
+
+All changes:
+https://github.com/Open-MSS/MSS/milestone/81?closed=1
+
 Version 7.0.8
 ~~~~~~~~~~~~~
 

MANIFEST.in

@@ -2,7 +2,6 @@ include README.md
 include LICENSE
 
 recursive-include mslib *
-recursive-include *
 global-exclude *.pyc
 global-exclude *.pyo
 global-exclude *.orig

NOTICE

@@ -4,7 +4,7 @@ Mission Support System (MSS)
 
     :copyright: Copyright 2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
     :copyright: Copyright 2011-2014 Marc Rautenhaus (mr)
-    :copyright: Copyright 2016-2021 by the mss team, see AUTHORS.
+    :copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
     :license: APACHE-2.0, see LICENSE for details.
 
 
@@ -14,9 +14,13 @@ Mission Support System (MSS)
    reference documentation in any publication, presentation, report,
    etc. you create:
 
+   Bauer, R., Grooß, J.-U., Ungermann, J., Bär, M., Geldenhuys, M., and Hoffmann, L.: The Mission Support
+   System (MSS v7.0.4) and its use in planning for the SouthTRAC aircraft campaign, Geosci.
+   Model Dev., 15, 8983–8997, https://doi.org/10.5194/gmd-15-8983-2022, 2022.
+
    Rautenhaus, M., Bauer, G., and Doernbrack, A.: A web service based
    tool to plan atmospheric research flights, Geosci. Model Dev., 5,
-   55-71, doi:10.5194/gmd-5-55-2012, 2012.
+   55-71, https://doi.org/10.5194/gmd-5-55-2012, 2012.
 
    Thank you.
 
@@ -125,4 +129,4 @@ Author: Paul Schweizer (https://github.com/PaulSchweizer)
 License: https://github.com/PaulSchweizer/qt-json-view/blob/master/LICENSE (MIT License)
 
 Package for working with JSON files in PyQt5.
-Obtained from Github (https://github.com/PaulSchweizer/qt-json-view), on 23/7/2021.
+Obtained from Github (https://github.com/PaulSchweizer/qt-json-view), on 23/7/2021.

README.md

@@ -60,9 +60,13 @@ Publications
 
 Please read the reference documentation
 
+   Bauer, R., Grooß, J.-U., Ungermann, J., Bär, M., Geldenhuys, M., and Hoffmann, L.: The Mission Support
+   System (MSS v7.0.4) and its use in planning for the SouthTRAC aircraft campaign, Geosci.
+   Model Dev., 15, 8983–8997, https://doi.org/10.5194/gmd-15-8983-2022, 2022.
+
    Rautenhaus, M., Bauer, G., and Doernbrack, A.: A web service based
    tool to plan atmospheric research flights, Geosci. Model Dev., 5,
-   55-71, doi:10.5194/gmd-5-55-2012, 2012.
+   55-71, https://doi.org/10.5194/gmd-5-55-2012, 2012.
 
 and the paper's Supplement (which includes a tutorial) before using the
 application. The documents are available at:

conftest.py

@@ -37,13 +37,35 @@
 import pytest
 import fs
 import shutil
+import keyring
 from mslib.mswms.demodata import DataFiles
-import mslib._tests.constants as constants
+import tests.constants as constants
 
 # make a copy for mscolab test, so that we read different pathes during parallel tests.
-sample_path = os.path.join(os.path.dirname(__file__), "docs", "samples", "flight-tracks")
+sample_path = os.path.join(os.path.dirname(__file__), "tests", "data")
 shutil.copy(os.path.join(sample_path, "example.ftml"), constants.ROOT_DIR)
 
+
+class TestKeyring(keyring.backend.KeyringBackend):
+    """A test keyring which always outputs the same password
+    from Runtime Configuration
+    https://pypi.org/project/keyring/#third-party-backends
+    """
+    priority = 1
+
+    def set_password(self, servicename, username, password):
+        pass
+
+    def get_password(self, servicename, username):
+        return "password from TestKeyring"
+
+    def delete_password(self, servicename, username):
+        pass
+
+# set the keyring for keyring lib
+keyring.set_keyring(TestKeyring())
+
+
 def pytest_addoption(parser):
     parser.addoption("--msui_settings", action="store")
 
@@ -77,7 +99,7 @@ def pytest_generate_tests(metafunc):
 """
 
     mslib.mscolab.conf.py.example
-    ~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     config for mscolab.
 
@@ -138,7 +160,7 @@ class mscolab_settings(object):
     MAIL_DEFAULT_SENDER = 'MSS@localhost'
 
     # enable verification by Mail
-    USER_VERIFICATION = False
+    MAIL_ENABLED = False
 
     SQLALCHEMY_DB_URI = 'sqlite:///' + url_join(DATA_DIR, 'mscolab.db')
 

docs/about.rst

@@ -29,8 +29,8 @@ paths can be constructed and modified on these views. Exchange through a waypoin
 MSS is a client/server application written in the language **Python**. This is used to create flight plans and
 discuss these with pilots of research aircraft. The flight path is designed by local and remote scientists based
 on meteorologic forecast data on the QT5 MSS gui application.
-A `publication by Rautenhaus et al. <http://www.geosci-model-dev.net/5/55/2012/gmd-5-55-2012.pdf>`_
-summarizes the principle of this software. On the EuroPython conference a
+Two publications are available, one by `Bauer et al. <https://gmd.copernicus.org/articles/15/8983/2022/gmd-15-8983-2022.pdf>`_ and the other by `Rautenhaus et al <http://www.geosci-model-dev.net/5/55/2012/gmd-5-55-2012.pdf>`_,
+which summarizes the principle of this software. On the EuroPython conference a
 `overview talk <https://pyvideo.org/europython-2017/mss-software-for-planning-research-aircraft-missions.html>`_
 about MSS was held.
 

docs/components.rst

@@ -9,5 +9,6 @@ Components
    mswms
    mscolab
    gentutorials
+   mssautoplot