Stable to develop

AUTHORS

@@ -1,6 +1,8 @@
 Contributors
 ============
 
+in alphabetic order by first name
+
 
 - Andreas Hilboll <hilboll@uni-bremen.de>
 - Anveshan Lal <anveshanrx8@gmail.com>
@@ -10,10 +12,10 @@ Contributors
 - Jens-Uwe Grooß <j.-u.grooss@fz-juelich.de>
 - Jörn Ungermann <j.ungermann@fz-juelich.de>
 - Marc Rautenhaus <wxmetvis@posteo.de>
+- May Bär <m.baer@fz-juelich.de>
 - Reimar Bauer <rb.proj@gmail.com>
 - Sakshi Chopkar <sakshichopkar@gmail.com>
 - Shivashis Padhi <shivashispadhi@gmail.com>
 - Tanish Grover <tanish1908@gmail.com>
 - Thomas Breuer <t.breuer@fz-juelich.de>
 - Vaibhav Mehra <veb7vmehra@gmail.com>
-- May Bär <m.baer@fz-juelich.de>

CHANGES.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+Version 4.0.1
+~~~~~~~~~~~~~
+
+Bug Fix release
+
+All changes:
+https://github.com/Open-MSS/MSS/milestone/58?closed=1
+
 Version 4.0.0
 -------------
 

conftest.py

@@ -78,7 +78,7 @@ def pytest_generate_tests(metafunc):
     This file is part of mss.
 
     :copyright: Copyright 2019 Shivashis Padhi
-    :copyright: Copyright 2019-2020 by the mss team, see AUTHORS.
+    :copyright: Copyright 2019-2021 by the mss team, see AUTHORS.
     :license: APACHE-2.0, see LICENSE for details.
 
     Licensed under the Apache License, Version 2.0 (the "License");

docs/development.rst

@@ -53,7 +53,7 @@ Create an environment and install the whole mss package dependencies then remove
 
   $ conda create -n mssdev mamba
   $ conda activate mssdev
-  $ mamba install mss --only-deps
+  $ mamba install mss=4.0.1 --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.

docs/help.rst

@@ -9,12 +9,12 @@ MSCOLAB
 
 .. raw:: html
 
-    <iframe width="560" height="315" src=http://www.youtube.com/embed/eDBnULXvo7M?rel=0" frameborder="0" allowfullscreen></iframe>
+    <iframe width="560" height="315" src="https://www.youtube.com/embed/eDBnULXvo7M?rel=0" frameborder="0" allowfullscreen></iframe>
 
 KML Docking Widget
 ------------------
 
 .. raw:: html
 
-    <iframe width="560" height="315" src=http://www.youtube.com/embed/G4aPIRLBz9U?rel=0" frameborder="0" allowfullscreen></iframe>
+    <iframe width="560" height="315" src="https://www.youtube.com/embed/G4aPIRLBz9U?rel=0" frameborder="0" allowfullscreen></iframe>
 

docs/installation.rst

@@ -56,7 +56,7 @@ leave out the 'source' here and below). ::
 
     $ conda create -n mssenv mamba
     $ conda activate mssenv
-    (mssenv) $ mamba install mss
+    (mssenv) $ mamba install mss=4.0.1 python
 
 
 You need to reactivate after the installation once the environment to setup all needed enironment
@@ -70,7 +70,9 @@ variables. ::
 update
 ++++++
 For updating an existing MSS installation to the current version, it is best to install
-it into a new environment.
+it into a new environment. If your current version is not far behind the new version
+you could try the mamba update mss as described.
+
 
 .. Important::
   mamba is under development. All dependencies of MSS and MSS itselfs are under development.
@@ -79,35 +81,29 @@ it into a new environment.
 search for MSS what you can get ::
 
    (mssenv) $ mamba search mss
-
-    mss                            3.0.3  py39hf3d152e_0  conda-forge
-    mss                            3.0.3  py39hf3d152e_1  conda-forge
+   ...
+   mss                            4.0.1  py38h578d9bd_0  conda-forge
+   mss                            4.0.1  py39hf3d152e_0  conda-forge
 
 compare what you have installed ::
 
    (mssenv) $ mamba list mss
 
      mss                            3.0.2     py39hf3d152e_0    conda-forge
 
-If an existing environment shall be updated, it is important to update all packages in this environment. ::
 
-   $ conda activate mssenv
-   (mssenv) $ mamba update --all
+We have reports that often an update suceeds by using the install option and the new version number,
+in this example 4.0.1 and python as second option ::
+
+   (mssenv) $ mamba install mss=4.0.1 python
 
-In this example there was a further build done after the first release of 3.0.3.
-Compare in the list of proposed updates what you would get ::
+All attemmpts show what you get if you continue. **Continue only if you get what you want.**
 
-   matplotlib                3.4.2            py39hf3d152e_0    conda-forge
-   matplotlib-base           3.4.2            py39h2fa2bec_0    conda-forge
-   mss                       3.0.3            py39hf3d152e_0    conda-forge
-   multidict                 5.1.0            py39h3811e60_1    conda-forge
+The alternative is to use a new environment and install mss.
 
-If you see a mismatch like this, not getting the recent buildnumber. In this example value in
-third column ends with "_1" you have to force the update by the conda command::
 
-  (mssenv) $ conda install mss==3.0.3=py39hf3d152e_1
 
-For further details :ref:`mss-configuration`
+For further details of configurating mss :ref:`mss-configuration`
 
 
 
@@ -127,7 +123,7 @@ We suggest to create a mss user.
 * login again or export PATH="/home/mss/miniconda3/bin:$PATH"
 * conda create -n mssenv mamba
 * conda activate mssenv
-* mamba install mss
+* mamba install mss=4.0.1 python
 
 For a simple test you could start the builtin standalone *mswms* and *mscolab* server::
 

docs/mscolab.rst

@@ -121,39 +121,48 @@ You can turn the `Work Locally` toggle off at any points and work on the common
 
 Notes for server administrators
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If you're configuring mscolab server, there isn't a GUI to add or manage a group of users. There is however a
-proposal to bring this on around the next release of mss. For now, there is a command line tool available with the
-installation of mss, :code:`mscolab_add_permissions`. It's usage is as follows
+If you're configuring mscolab server, there is a manage users GUI to add or manage users to a project.
+There is a command line tool available with the installation of mss, :code:`mscolab`. It can import users to the database
+and can handle joins to projects.
 
-- Make a text file with the following format
+Make a text file with the following format to import many users to the mscolab database
 
  .. code-block:: text
 
-  path1
-    u1-c
-    u2-c
-    u3-a
+  suggested_username name <email>
+  suggested_username2 name2 <email2>
 
-    path2
-    u1-a
+ .. code-block:: text
 
-    path3
-    u2-v
+  $ mscolab db --users_by_file /path/to/file
 
-- `path1` represents the path of project in mscolab db. 
-- u1, u2, u3 are usernames. 
-- `c` stands for collaborator, `a` for admin, `v` for viewer.
-- Different paths are separated by 2 '\n's.
-- The tool can be invocated anywhere by a command, where :code:`/path/to/file` represents the path to file created above.
+After executed you get informations to exchange with users.
 
  .. code-block:: text
 
-  $ mscolab_add_permissions /path/to/file
+  Are you sure you want to add users to the database? (y/[n]):
+  y
+  Userdata: email suggested_username 30736d0350c9b886
+
+  "MSCOLAB_mailid": "email",
+  "MSCOLAB_password": "30736d0350c9b886",
+
+
+  Userdata: email2 suggested_username2 342434de34904303
+
+  "MSCOLAB_mailid": "email2",
+  "MSCOLAB_password": "342434de34904303",
 
-instructions to use mscolab wsgi
+Further options can be listed by `mscolab db -h`
+
+
+Instructions to use mscolab wsgi
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 make a file called :code:`server.py`
+and install ::
+
+   mamba install eventlet==0.30.2 gunicorn
 
 **server.py**::
 
@@ -163,3 +172,6 @@ Then run the following commands. ::
 
   $ mamba install gunicorn eventlet
   $ gunicorn -b 0.0.0.0:8087 server:app
+
+
+For further options read `<https://flask.palletsprojects.com/en/1.1.x/deploying/wsgi-standalone/#gunicorn>`_

docs/samples/config/mscolab/mscolab_settings.py.sample

@@ -9,6 +9,7 @@
     This file is part of mss.
 
     :copyright: Copyright 2019 Shivashis Padhi
+    :copyright: Copyright 2019-2021 by the mss team, see AUTHORS.
     :license: APACHE-2.0, see LICENSE for details.
 
     Licensed under the Apache License, Version 2.0 (the "License");

docs/samples/config/mss/mss_settings.json.sample

@@ -1,6 +1,21 @@
 
 {
     "data_dir": "~/mssdata",
+    "filepicker_default": "default",
+
+    "import_plugins": {
+        "CSV": ["csv", "mslib.plugins.io.csv", "load_from_csv"],
+        "FliteStar": ["fls", "mslib.plugins.io.flitestar", "load_from_flitestar"],
+        "Text": ["txt", "mslib.plugins.io.text", "load_from_txt"]
+    },
+
+    "export_plugins": {
+        "CSV": ["csv", "mslib.plugins.io.csv", "save_to_csv"],
+        "Text": ["txt", "mslib.plugins.io.text", "save_to_txt"],
+        "KML": ["kml", "mslib.plugins.io.kml", "save_to_kml"],
+        "GPX": ["gpx", "mslib.plugins.io.gpx", "save_to_gpx"]
+        },
+
 
     "layout": {
        "topview": [963, 702],
@@ -53,19 +68,23 @@
 
    "new_flighttrack_template": ["Kiruna", "Ny-Alesund"],
    "new_flighttrack_flightlevel": 250,
+   "num_interpolation_points": 201,
+   "num_labels": 10,
+
    "WMS_request_timeout": 30,
 
    "default_WMS": ["http://www.your-server.de/forecasts"],
    "default_VSEC_WMS": ["http://www.your-server.de/forecasts"],
+   "default_LSEC_WMS": ["http://www.your-server.de/forecasts"],
+
    "default_MSCOLAB": ["http://www.your-mscolab-server.de/"],
    "WMS_login": {
                   "http://www.your-server.de/forecasts" : ["youruser", "yourpassword"]
                  },
    "MSC_login": {
                  "http://www.your-mscolab-server.de" : ["youruser", "yourpassword"]
                 },
-   "num_interpolation_points": 201,
-   "num_labels": 10,
 
-   "filepicker_default": "default"
+   "MSCOLAB_mailid": "",
+   "MSCOLAB_password": ""
 }

docs/samples/config/wms/mss_chem_plots.py

@@ -139,14 +139,14 @@ def make_msschem_hs_class(
         _contourname = "_pcontours"
 
     class fnord(HS_MSSChemStyle):
-        name = "HS_{}_{}{}".format(entity, vert, _contourname)
+        name = f"HS_{entity}_{vert}{_contourname}"
         dataname = entity
         units = units
         unit_scale = scale
         _title_tpl = nam + " (" + vert + ")"
         long_name = entity
         if units:
-            _title_tpl += " ({})".format(units)
+            _title_tpl += f"({units})"
 
         required_datafields = [(vert, entity, None)] + add_data
         contours = add_contours
@@ -308,14 +308,14 @@ def make_msschem_vs_class(
         add_contours = []
 
     class fnord(VS_MSSChemStyle):
-        name = "VS_{}_{}".format(entity, vert)
+        name = f"VS_{entity}_{vert} "
         dataname = entity
         units = units
         unit_scale = scale
         title = nam + " (" + vert + ")"
         long_name = entity
         if units:
-            title += " ({})".format(units)
+            title += f"({units})"
         required_datafields = [(vert, entity, None)] + add_data
         contours = add_contours if add_contours else []
 

docs/samples/config/wms/mss_wms_auth.py.sample

@@ -10,7 +10,7 @@
 
     :copyright: 2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
     :copyright: 2011-2014 Marc Rautenhaus
-    :copyright: Copyright 2016-2017 by the mss team, see AUTHORS.
+    :copyright: Copyright 2016-2021 by the mss team, see AUTHORS.
     :license: APACHE-2.0, see LICENSE for details.
 
     Licensed under the Apache License, Version 2.0 (the "License");

docs/samples/config/wms/mss_wms_settings.py.chem_plots

@@ -11,7 +11,7 @@
     :copyright: 2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
     :copyright: 2011-2014 Marc Rautenhaus
     :copyright: Copyright 2017 Jens-Uwe Grooss, Joern Ungermann, Reimar Bauer
-    :copyright: Copyright 2017-2019 by the mss team, see AUTHORS.
+    :copyright: Copyright 2017-2021 by the mss team, see AUTHORS.
     :license: APACHE-2.0, see LICENSE for details.
 
     Licensed under the Apache License, Version 2.0 (the "License");

docs/usage.rst

@@ -92,14 +92,15 @@ importing changed files back in addition to the main FTML format. These filters
 from the File menu of the Main Window.
 
 MSS currently offers several import/export filters in the mslib.plugins.io module, which may serve
-as an example for the definition of own plugins. They are listed below. The CSV plugin is enabled
-by default. Enabling the experimental FliteStar text import plugin would require those lines in
+as an example for the definition of own plugins. Take care that added plugins use different file extensions.
+They are listed below. The CSV plugin is enabled by default.
+Enabling the experimental FliteStar text import plugin would require those lines in
 the UI settings file:
 
 .. code:: text
 
     "import_plugins": {
-        "FliteStar": ["txt", "mslib.plugins.io.flitestar", "load_from_flitestar"]
+        "FliteStar": ["fls", "mslib.plugins.io.flitestar", "load_from_flitestar"]
     },
 
 The dictionary entry defines the name of the filter in the File menu. The list specifies in this

mslib/_tests/constants.py

@@ -40,7 +40,7 @@
 CACHED_CONFIG_FILE = None
 SERVER_CONFIG_FILE = "mss_wms_settings.py"
 MSCOLAB_CONFIG_FILE = "mscolab_settings.py"
-ROOT_FS = TempFS(identifier="mss{}".format(SHA))
+ROOT_FS = TempFS(identifier=f"mss{SHA}")
 OSFS_URL = ROOT_FS.geturl("", purpose="fs")
 
 ROOT_DIR = ROOT_FS.getsyspath("")

mslib/mscolab/_tests/test_chat_manager.py

@@ -9,6 +9,7 @@
     This file is part of mss.
 
     :copyright: Copyright 2020 Reimar Bauer
+    :copyright: Copyright 2020-2021 by the mss team, see AUTHORS.
     :license: APACHE-2.0, see LICENSE for details.
 
     Licensed under the Apache License, Version 2.0 (the "License");

mslib/mscolab/_tests/test_file_manager.py

@@ -9,6 +9,7 @@
     This file is part of mss.
 
     :copyright: Copyright 2020 Reimar Bauer
+    :copyright: Copyright 2020-2021 by the mss team, see AUTHORS.
     :license: APACHE-2.0, see LICENSE for details.
 
     Licensed under the Apache License, Version 2.0 (the "License");

mslib/mscolab/_tests/test_server.py

@@ -9,6 +9,7 @@
     This file is part of mss.
 
     :copyright: Copyright 2020 Reimar Bauer
+    :copyright: Copyright 2020-2021 by the mss team, see AUTHORS.
     :license: APACHE-2.0, see LICENSE for details.
 
     Licensed under the Apache License, Version 2.0 (the "License");

mslib/msui/_tests/test_mscolab_project.py

@@ -31,7 +31,7 @@
 from mslib.msui.mscolab import MSSMscolabWindow
 from mslib.mscolab.conf import mscolab_settings
 from mslib.mscolab.models import Message
-from PyQt5 import QtCore, QtTest, QtWidgets, Qt
+from PyQt5 import QtCore, QtTest, QtWidgets
 from mslib._tests.utils import mscolab_start_server
 
 
@@ -103,7 +103,7 @@ def test_copy_message(self):
         self._send_message("**test message**")
         self._send_message("**test message**")
         self._activate_context_menu_action(Actions.COPY)
-        assert Qt.QApplication.clipboard().text() == "**test message**"
+        assert QtWidgets.QApplication.clipboard().text() == "**test message**"
 
     def test_reply_message(self):
         self._send_message("**test message**")