Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gsoc develop merge 2 #1119

Merged
merged 22 commits into from
Aug 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
658acf9
URL replaced in `docker_based_installation.rst` (#1078)
Jatin2020-24 Jul 16, 2021
1351e95
Less intrusive layer error handling (#1087)
Marilyth Jul 20, 2021
89899f5
preparation v4.0.4 (#1088)
ReimarBauer Jul 20, 2021
37625aa
Return default settings on pytest (#1091)
Marilyth Jul 23, 2021
dd23769
Open WMS on view start (#1094)
Marilyth Jul 28, 2021
e9d8f7c
Close windows and timeout after 60 seconds (#1097)
Marilyth Jul 30, 2021
d4b56a8
Made NASA LARC URL clickable. (#1100)
joernu76 Jul 30, 2021
d00d592
Added option to fly hexagons anti-clockwise. (#1101)
joernu76 Jul 30, 2021
632b6dc
FlightLevel <-> Pressure MetPy conversion (#1075)
Marilyth Jul 30, 2021
dab4f08
Use mamba for all commands if possible (#1106)
Marilyth Aug 1, 2021
ea5be34
removed "default" channel (#1109)
ReimarBauer Aug 2, 2021
a391d56
Include airports and airspaces in topview (#1089)
Marilyth Aug 2, 2021
2366e97
restructured / updated documentation (#1107)
ReimarBauer Aug 2, 2021
0916534
Removed outdated parameters from sample json. (#1111)
joernu76 Aug 2, 2021
d4318b1
added some campaign logos where MSS was used (#1112)
ReimarBauer Aug 2, 2021
a8e6863
Merge branch 'stable' into develop
ReimarBauer Aug 2, 2021
a60fb0c
removed some old lines, prefered is the $mss_search
ReimarBauer Aug 2, 2021
3477121
Merge pull request #1114 from Open-MSS/merged_stable_into_develop
joernu76 Aug 2, 2021
a6d4c89
authors file updated (#1113)
ReimarBauer Aug 2, 2021
7d4d924
prepare v5.0.0 (#1115)
ReimarBauer Aug 2, 2021
9dad762
Merge remote-tracking branch 'upstream/develop' into gsoc-develop-mer…
aravindm711 Aug 3, 2021
ae254f0
changed connect_window in tests to non modal to prevent time-out
aravindm711 Aug 3, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ in alphabetic order by first name

- Andreas Hilboll <hilboll@uni-bremen.de>
- Anveshan Lal <anveshanrx8@gmail.com>
- Aravind Murali <aravindmurali711@gmail.com>
- Christian Rolf <c.rolf@fz-juelich.de>
- Debajyoti Dasgupta <debajyotidasgupta6@gmail.com>
- Hrithik Kumar Verma <vermahrithik812@gmail.com>
- Isabell Krisch <isabellkrisch@gmail.com>
- Jatin Jain <jatinalwar2001@gmail.com>
- Jens-Uwe Grooß <j.-u.grooss@fz-juelich.de>
- Jörn Ungermann <j.ungermann@fz-juelich.de>
- Marc Rautenhaus <wxmetvis@posteo.de>
Expand Down
27 changes: 27 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,33 @@
Changelog
=========

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.
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.

The linear styles got improved to work also on .ml files

We refactored some of our oldest code in thermolib and moved to the famous metpy module.
A new docking widget for topview was introduced for integrating airbase data by openaip.net and ourairports.com

Newer versions than 5.0.0 can now use the built-in update feature on command line or by the UI.

All changes:
https://github.com/Open-MSS/MSS/milestone/59?closed=1

Version 4.0.4
~~~~~~~~~~~~~

Bug fix release

All changes:
https://github.com/Open-MSS/MSS/milestone/63?closed=1

Version 4.0.3
~~~~~~~~~~~~~

Expand Down
42 changes: 8 additions & 34 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -106,40 +106,14 @@ Author: Jakub Steiner jimmac@gmail.com
License: https://github.com/freedesktop/tango-icon-library/blob/master/COPYING.PublicDomain
Further Information: http://tango.freedesktop.org

Airports Data
-------------

To draw airports on the topview we use the services provided by ourairports
Further Information: https://ourairports.com/about.html#overview

Airports Data
-------------



































To draw airspaces on the topview we use the services provided by openaip.net
Further Information: http://www.openaip.net/
29 changes: 29 additions & 0 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
import importlib.machinery
import os
import sys
import mock
import warnings
from PyQt5 import QtWidgets
# Disable pyc files
sys.dont_write_bytecode = True

Expand Down Expand Up @@ -152,6 +155,32 @@ class mscolab_settings(object):
sys.path.insert(0, parent_path)


@pytest.fixture(autouse=True)
def close_open_windows():
"""
Closes all windows after every test
"""
# Mock every MessageBox widget in the test suite to avoid unwanted freezes on unhandled error popups etc.
with mock.patch("PyQt5.QtWidgets.QMessageBox.question") as q, \
mock.patch("PyQt5.QtWidgets.QMessageBox.information") as i, \
mock.patch("PyQt5.QtWidgets.QMessageBox.critical") as c, \
mock.patch("PyQt5.QtWidgets.QMessageBox.warning") as w:
yield
if any(box.call_count > 0 for box in [q, i, c, w]):
summary = "\n".join([f"PyQt5.QtWidgets.QMessageBox.{box()._extract_mock_name()}: {box.mock_calls[:-1]}"
for box in [q, i, c, w] if box.call_count > 0])
warnings.warn(f"An unhandled message box popped up during your test!\n{summary}")


# Try to close all remaining widgets after each test
for qobject in set(QtWidgets.QApplication.topLevelWindows() + QtWidgets.QApplication.topLevelWidgets()):
try:
qobject.destroy()
# Some objects deny permission, pass in that case
except RuntimeError:
pass


@pytest.fixture(scope="session", autouse=True)
def configure_testsetup(request):
if Display is not None:
Expand Down
2 changes: 1 addition & 1 deletion docs/components.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ Components
deployment
mscolab
demodata
kml_guide


Loading