Stable to develop (#746)

* Add testing to stable * Fix error on empty coastsegs on land (#712) * Fix error on empty coastsegs * Add test for mapcanvas no coastlines * Fix sql versions (#721) created a new issue ;) #722 * conda-forge first channel (#742) * Preparations for 2.0.2 (#744) * changes link added to about and date updated * preparation v2.0.2 * flake8 fix * flake8 fix Co-authored-by: May <baermay98@gmail.com>
Open-MSS · Mar 30, 2021 · 228a7ff · 228a7ff
1 parent 33b5bbc
commit 228a7ff
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 17 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -7,7 +7,7 @@ env:
 jobs:
   Test-MSS:
     runs-on: ubuntu-latest
-    
+
     defaults:
       run:
         shell: bash
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push'
     needs: [Test-MSS]
-    
+
     steps:
       - if: env.PAT != ''
         name: Invoke dockerhub image creation

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+Version 2.0.2
+-------------
+
+Bug Fix release
+
+All changes:
+https://github.com/Open-MSS/MSS/milestone/48?closed=1
 
 Version 2.0.1
 ---------------

diff --git a/mslib/msui/mss_pyui.py b/mslib/msui/mss_pyui.py
@@ -141,7 +141,9 @@ def __init__(self, parent=None):
         """
         super(MSS_AboutDialog, self).__init__(parent)
         self.setupUi(self)
-        self.lblVersion.setText(f"Version: {__version__}")
+        self.lblVersion.setText("Version: {}".format(__version__))
+        self.lblChanges.setText(f'<a href="https://github.com/Open-MSS/MSS/issues?q=is%3Aclosed+milestone%3A"\
+            "{__version__[:-1]}">New Features and Changes</a>')
         blub = QtGui.QPixmap(python_powered())
         self.lblPython.setPixmap(blub)
 

diff --git a/mslib/msui/qt5/ui_about_dialog.py b/mslib/msui/qt5/ui_about_dialog.py
@@ -2,12 +2,14 @@
 
 # Form implementation generated from reading ui file 'ui_about_dialog.ui'
 #
-# Created by: PyQt5 UI code generator 5.9.2
+# Created by: PyQt5 UI code generator 5.12.3
 #
 # WARNING! All changes made in this file will be lost!
 
+
 from PyQt5 import QtCore, QtGui, QtWidgets
 
+
 class Ui_AboutMSUIDialog(object):
     def setupUi(self, AboutMSUIDialog):
         AboutMSUIDialog.setObjectName("AboutMSUIDialog")
@@ -73,27 +75,33 @@ def setupUi(self, AboutMSUIDialog):
         self.lblVersion = QtWidgets.QLabel(AboutMSUIDialog)
         self.lblVersion.setObjectName("lblVersion")
         self.horizontalLayout_2.addWidget(self.lblVersion)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem1)
+        self.lblChanges = QtWidgets.QLabel(AboutMSUIDialog)
+        self.lblChanges.setOpenExternalLinks(True)
+        self.lblChanges.setObjectName("lblChanges")
+        self.horizontalLayout_2.addWidget(self.lblChanges)
         self.verticalLayout_2.addLayout(self.horizontalLayout_2)
-        spacerItem1 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
-        self.verticalLayout_2.addItem(spacerItem1)
+        spacerItem2 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
+        self.verticalLayout_2.addItem(spacerItem2)
         self.lblLicense = QtWidgets.QLabel(AboutMSUIDialog)
         self.lblLicense.setObjectName("lblLicense")
         self.verticalLayout_2.addWidget(self.lblLicense)
-        spacerItem2 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
-        self.verticalLayout_2.addItem(spacerItem2)
+        spacerItem3 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
+        self.verticalLayout_2.addItem(spacerItem3)
         self.lblCopyright = QtWidgets.QLabel(AboutMSUIDialog)
         self.lblCopyright.setObjectName("lblCopyright")
         self.verticalLayout_2.addWidget(self.lblCopyright)
-        spacerItem3 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
-        self.verticalLayout_2.addItem(spacerItem3)
+        spacerItem4 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
+        self.verticalLayout_2.addItem(spacerItem4)
         self.lblLinks = QtWidgets.QLabel(AboutMSUIDialog)
         self.lblLinks.setOpenExternalLinks(True)
         self.lblLinks.setObjectName("lblLinks")
         self.verticalLayout_2.addWidget(self.lblLinks)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
-        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem4)
+        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem5)
         self.btOK = QtWidgets.QPushButton(AboutMSUIDialog)
         self.btOK.setObjectName("btOK")
         self.horizontalLayout.addWidget(self.btOK)
@@ -115,10 +123,10 @@ def retranslateUi(self, AboutMSUIDialog):
 "</style></head><body style=\" font-family:\'Ubuntu\'; font-size:11pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'DejaVu Sans Mono\'; color:#000000; background-color:#ffffff;\">Please read the reference documentation:</span><span style=\" font-family:\'DejaVu Sans Mono\'; color:#000000;\"><br /><br />Rautenhaus, M., Bauer, G., and Doernbrack, A.: A web service based tool to plan<br />atmospheric research flights, Geosci. Model Dev., 5,55-71, doi:10.5194/gmd-5-55-2012, 2012.<br /><br />and the paper\'s Supplement (which includes a tutorial) before using the application. The documents are available at:<br /><br /> * </span><span style=\" font-family:\'DejaVu Sans Mono\'; color:#000000; background-color:#ffffff;\">http://www.geosci-model-dev.net/5/55/2012/gmd-5-55-2012.pdf</span><span style=\" font-family:\'DejaVu Sans Mono\'; color:#000000;\"><br /> * http://www.geosci-model-dev.net/5/55/2012/gmd-5-55-2012-supplement.pdf<br /><br />When using this software, please be so kind and acknowledge its use by citing the above mentioned reference documentation in publications, presentations, reports, etc. that you create. Thank you very much.<br /><br /></span></p></body></html>"))
         self.lblVersion.setText(_translate("AboutMSUIDialog", "Version: --VERSION--"))
+        self.lblChanges.setText(_translate("AboutMSUIDialog", "Changes:  --CHANGES--"))
         self.lblLicense.setText(_translate("AboutMSUIDialog", "License: Apache License Version 2.0"))
         self.lblCopyright.setText(_translate("AboutMSUIDialog", "Copyright 2008-2014: Deutsches Zentrum fuer Luft- und Raumfahrt e.V.\n"
 "Copyright 2011-2014: Marc Rautenhaus\n"
-"Copyright 2016-2020: by the mss team, see AUTHORS"))
-        self.lblLinks.setText(_translate("AboutMSUIDialog", "<html><head/><body><p>See <a href=\"http://mss.rtfd.io\"><span style=\" text-decoration: underline; color:#0000ff;\">http://mss.rtfd.io</span></a> for detailed information and documentation.<br>Report bugs or feature requests at <a href=\"https://github.com/Open-MSS/MSS\"><span style=\" text-decoration: underline; color:#0000ff;\">https://https://github.com/Open-MSS/MSS</span></a>.</p></body></html>"))
+"Copyright 2016-2021: by the mss team, see AUTHORS"))
+        self.lblLinks.setText(_translate("AboutMSUIDialog", "<html><head/><body><p>See <a href=\"http://mss.rtfd.io\"><span style=\" text-decoration: underline; color:#0000ff;\">http://mss.rtfd.io</span></a> for detailed information and documentation.<br>Report bugs or feature requests at <a href=\"https://github.com/Open-MSS/MSS\"><span style=\" text-decoration: underline; color:#0000ff;\">https://github.com/Open-MSS/MSS</span></a>.</p></body></html>"))
         self.btOK.setText(_translate("AboutMSUIDialog", "Ok"))
-
diff --git a/mslib/msui/ui/ui_about_dialog.ui b/mslib/msui/ui/ui_about_dialog.ui
@@ -153,6 +153,29 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="lblChanges">
+         <property name="text">
+          <string>Changes:  --CHANGES--</string>
+         </property>
+         <property name="openExternalLinks">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
      <item>
@@ -199,7 +222,7 @@ p, li { white-space: pre-wrap; }
        <property name="text">
         <string>Copyright 2008-2014: Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
 Copyright 2011-2014: Marc Rautenhaus
-Copyright 2016-2020: by the mss team, see AUTHORS</string>
+Copyright 2016-2021: by the mss team, see AUTHORS</string>
        </property>
       </widget>
      </item>

diff --git a/mslib/version.py b/mslib/version.py
@@ -24,4 +24,4 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 """
-__version__ = u'2.0.1.'
+__version__ = u'2.0.2.'