Merge pull request #1271 from Open-MSS/merge_develop_to_stable

Merge develop to stable, v6.0.0

Author: joernu76

.github/workflows/testing.yml

@@ -39,9 +39,9 @@ jobs:
       run: |
         source /opt/conda/bin/activate mssenv \
         && cd $GITHUB_WORKSPACE \
-        && pytest --cov=mslib mslib \
+        && pytest -v --durations=20 --reverse --cov=mslib mslib \
         || (for i in {1..5} \
-          ; do pytest mslib --last-failed --lfnf=none \
+          ; do pytest mslib -v --durations=0 --reverse --last-failed --lfnf=none \
           && break \
         ; done)
 

.github/workflows/xdist_testing.yml

@@ -39,8 +39,8 @@ jobs:
       run: |
         source /opt/conda/bin/activate mssenv \
         && cd $GITHUB_WORKSPACE \
-        && pytest -n 6 --dist loadscope --max-worker-restart 0 mslib \
+        && pytest -vv -n 6 --dist loadfile --max-worker-restart 0 mslib \
         || (for i in {1..5} \
-          ; do pytest -n 6 --dist loadscope --max-worker-restart 0 mslib --last-failed --lfnf=none \
+          ; do pytest -vv -n 6 --dist loadfile --max-worker-restart 0 mslib --last-failed --lfnf=none \
           && break \
         ; done)

.gitignore

@@ -1,6 +1,7 @@
 .cache/
 .idea/
 .vscode/
+.DS_Store
 *.pyc
 *.swp
 *.patch

CHANGES.rst

@@ -1,6 +1,29 @@
 Changelog
 =========
 
+Version 6.0.0
+~~~~~~~~~~~~~
+
+Aravind Murali redesigned in google summer of code 2021 the MSUI interface.
+This now connects in a user-friendly way the editing of flight paths locally
+or remotely with other users. Many of Jörn Ungermann's ideas were implemented.
+In addition, Aravind Murali has improved a configuration editor for our json mss_settings file
+and made this user-friendly. The initial idea of the new editor stems from Reimar Bauer.
+GSoC mentors were Jörn Ungermann, May Bär, Reimar Bauer
+
+Hrithik Kumar Verma developed a toolchain for the automatic creation of tutorials
+in the Google Summer of Code 2021. This simplifies the creation of video tutorials in
+a similar way to updating tests. Using these tutorial scripts to create videos
+also increases test coverage. The initial idea stems from Reimar Bauer.
+GSoC mentors were Reimar Bauer, May Bär
+
+Jörn Ungermann improved kml visualizing the same way as of a flightpath.
+
+Reimar Bauer improved permissions, projects and signalling for mscolab.
+
+All changes:
+https://github.com/Open-MSS/MSS/milestone/50?closed=1
+
 Version 5.0.2
 ~~~~~~~~~~~~~
 
@@ -21,7 +44,8 @@ Version 5.0.0
 ~~~~~~~~~~~~~
 
 This release brings many improvements to the WMS Server along with new features for the UI.
-On demand a WMS server can show what kind of view graphics are provided.
+May Bär implemented a gallery feature. On demand a WMS server can show what kind of view graphics
+are provided.
 Optional the source for creating the graphics can be published over the web service too.
 By this any existing server shows examples how to create graphics. Have a look on
 our documentation on https://mss.readthedocs.io/en/stable/gallery/index.html for this feature.

NOTICE

@@ -117,3 +117,12 @@ Airports Data
 
 To draw airspaces on the topview we use the services provided by openaip.net
 Further Information: http://www.openaip.net/
+
+Qt-json-view
+------------
+
+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.

README.md

@@ -10,6 +10,22 @@ computer.
 Installing MSS
 ==============
 
+Automatically
+-------------
+
+- For **Windows**, go [here](https://github.com/Open-MSS/mss-install/blob/main/Windows.bat?raw=1)
+    - Right click on the webpage and select "Save as..." to download the file
+    - Double click the downloaded file and follow further instructions
+        - For fully automatic installation, open cmd and execute it with `/Path/To/Windows.bat -a`
+- For **Linux/Mac**, go [here](https://github.com/Open-MSS/mss-install/blob/main/LinuxMac.sh?raw=1)
+    - Right click on the webpage and select "Save as..." to download the file
+    - Make it executable via `chmod +x LinuxMac.sh`
+    - Execute it and follow further instructions `./LinuxMac.sh`
+        - For fully automatic installation, run it with the -a parameter `./LinuxMac.sh -a`
+
+Manually
+--------
+
 Installing `MSS` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with:
 
 

conftest.py

@@ -118,6 +118,25 @@ class mscolab_settings(object):
     # used to generate and parse tokens
     SECRET_KEY = secrets.token_urlsafe(16)
 
+    # used to generate the password token
+    SECURITY_PASSWORD_SALT = secrets.token_urlsafe(16)
+
+    # mail settings
+    MAIL_SERVER = 'localhost'
+    MAIL_PORT = 25
+    MAIL_USE_TLS = False
+    MAIL_USE_SSL = True
+
+    # mail authentication
+    MAIL_USERNAME = os.environ.get('APP_MAIL_USERNAME')
+    MAIL_PASSWORD = os.environ.get('APP_MAIL_PASSWORD')
+
+    # mail accounts
+    MAIL_DEFAULT_SENDER = 'MSS@localhost'
+
+    # enable verification by Mail
+    USER_VERIFICATION = False
+
     SQLALCHEMY_DB_URI = 'sqlite:///' + url_join(DATA_DIR, 'mscolab.db')
 
     # mscolab file upload settings

docs/components.rst

@@ -6,7 +6,8 @@ Components
 
    usage
    deployment
+   mswms
    mscolab
-   demodata
+   tutorials
 
 

docs/conf.py

@@ -50,19 +50,22 @@
 
 import mslib.mswms.wms
 import mslib.mswms.gallery_builder
+import importlib
 
 # Generate template plots
 from docs.gallery.plot_examples import HS_template, VS_template
+from mslib.mswms.mpl_lsec_styles import LS_DefaultStyle
 dataset = [next(iter(mslib.mswms.wms.mss_wms_settings.data))]
 mslib.mswms.wms.mss_wms_settings.register_horizontal_layers = [(HS_template.HS_Template, dataset)]
 mslib.mswms.wms.mss_wms_settings.register_vertical_layers = [(VS_template.VS_Template, dataset)]
-mslib.mswms.wms.mss_wms_settings.register_linear_layers = []
+mslib.mswms.wms.mss_wms_settings.register_linear_layers = [(LS_DefaultStyle, dataset)]
 mslib.mswms.wms.server.__init__()
-mslib.mswms.wms.server.generate_gallery(sphinx=True, create=True, clear=True)
-mslib.mswms.gallery_builder.plots = {"Top": [], "Side": [], "Linear": []}
+mslib.mswms.wms.server.generate_gallery(sphinx=True, create=True, clear=True, simple_naming=True)
+importlib.reload(mslib.mswms.gallery_builder)
 
 # Generate all other plots
-mslib.mswms.wms.server.generate_gallery(sphinx=True, generate_code=True, all_plots=True)
+mslib.mswms.wms.server.generate_gallery(sphinx=True, generate_code=True, all_plots=True, levels="3,4,200,300",
+                                        vtimes="2012-10-18T00:00:00,2012-10-19T00:00:00")
 
 # readthedocs has no past.builtins
 try:
@@ -231,7 +234,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['mss_theme']
+html_static_path = ['mss_theme', 'gallery/plots']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied