Merge pull request #1437 from Open-MSS/merge_develop_to_stable

Merge develop to stable, preparing 6.1.0

Author: ReimarBauer

.github/workflows/python-flake8.yml

@@ -3,7 +3,16 @@
 
 name: flake8
 
-on: [ push, pull_request ]
+on:
+  push:
+    branches:
+    - develop
+    - stable
+  pull_request:
+    branches:
+    - develop
+    - stable
+
 jobs:
   lint:
     runs-on: ubuntu-latest

.github/workflows/testing.yml

@@ -1,6 +1,15 @@
 name: Pytest MSS
 
-on: [ push, pull_request ]
+on:
+  push:
+    branches:
+    - develop
+    - stable
+  pull_request:
+    branches:
+    - develop
+    - stable
+
 env:
   PAT: ${{ secrets.PAT }}
 

.github/workflows/xdist_testing.yml

@@ -1,6 +1,15 @@
 name: Pytest MSS
 
-on: [ push, pull_request ]
+on:
+  push:
+    branches:
+    - develop
+    - stable
+  pull_request:
+    branches:
+    - develop
+    - stable
+
 env:
   PAT: ${{ secrets.PAT }}
 

AUTHORS

@@ -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>
+- Sreelakshmi Jayarajan <sreelakshmipj555@gmail.com>
 - Tanish Grover <tanish1908@gmail.com>
 - Thomas Breuer <t.breuer@fz-juelich.de>
 - Vaibhav Mehra <veb7vmehra@gmail.com>

CHANGES.rst

@@ -1,6 +1,17 @@
 Changelog
 =========
 
+Version 6.1.0
+~~~~~~~~~~~~~
+
+This release includes some small improvements of the usablity.
+A few bug fixes, a new plugin for NAVAID waypoints is decribed and
+mscolab gots few improvements for user creation.
+Wind speed plots can now be created for altitudes > 25km.
+
+All changes:
+https://github.com/Open-MSS/MSS/milestone/70?closed=1
+
 
 Version 6.0.6
 ~~~~~~~~~~~~~

conftest.py

@@ -25,7 +25,6 @@
     limitations under the License.
 """
 
-import importlib
 import importlib.machinery
 import os
 import sys
@@ -37,9 +36,13 @@
 
 import pytest
 import fs
+import shutil
 from mslib.mswms.demodata import DataFiles
 import mslib._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")
+shutil.copy(os.path.join(sample_path, "example.ftml"), constants.ROOT_DIR)
 
 def pytest_addoption(parser):
     parser.addoption("--mss_settings", action="store")

docs/components.rst

@@ -5,6 +5,7 @@ Components
    :maxdepth: 3
 
    usage
+   plugins
    mswms
    mscolab
    tutorials

docs/development.rst

@@ -143,7 +143,7 @@ Create an environment and install the whole mss package dependencies then remove
 
   $ conda create -n mssdev mamba
   $ conda activate mssdev
-  $ mamba install mss=$mss_version --only-deps
+  $ mamba install mss=$mss_version python --only-deps
 
 You can also use conda to install mss, but mamba is a way faster.
 Compare versions used in the meta.yaml between stable and develop branch and apply needed changes.
@@ -172,7 +172,7 @@ You can view the default configuration of mscolab in the file `mslib/mscolab/con
 If you want to change any values of the configuration, please take a look at the "Configuring Your Mscolab Server"
 section in :ref:`mscolab`
 
-When using for the first time you need to initialise your database. Use the command :code:`python mslib/mscolab/mscolab db --init`
+When using for the first time you need to initialise your database. Use the command :code:`python mslib/mscolab/mscolab.py db --init`
 to initialise it. The default database is a sqlite3 database.
 You can add some dummy data to your database by using the command :code:`python mslib/mscolab/mscolab.py db --seed`.
 The content of the dummy data can be found in the file `mslib/mscolab/seed.py`.

docs/mscolab.rst

@@ -23,10 +23,10 @@ Protecting Login
 ~~~~~~~~~~~~~~~~
 The login to the MSColab server can be protected by an additional auth method.
 
-**mss_mscolab_auth.py**
-
  .. literalinclude:: samples/config/mscolab/mss_mscolab_auth.py.sample
 
+Make a copy of the above file, rename it to mss_mscolab_auth.py, make the necessary changes in the file and add it to your $PYTHONPATH.
+
 Steps to Run MSColab Server
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
   - The MSColab server comes included in the MSS python package.

docs/mswms.rst

@@ -20,6 +20,8 @@ For more information on WMS, see http://www.opengeospatial.org/standards/wms
 WMS Server Deployment
 =====================
 
+.. _deployment:
+
 Once installation and configuration are complete, you can start the
 Web Map Service application (provided you have forecast data to visualise).
 The file "mswms" is an executable Python script starting up a Flask HTTP server
@@ -449,4 +451,4 @@ Detailed server configuration *mss_wms_settings.py* for this demodata
 
 For setting authentication see *mss_wms_auth.py*
 
- .. literalinclude:: samples/config/wms/mss_wms_auth.py.sample
+ .. literalinclude:: samples/config/wms/mss_wms_auth.py.sample