Skip to content

Commit

Permalink
Merge branch 'stable' into merge_stable_to_develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@ReimarBauer
ReimarBauer committed Apr 20, 2024
2 parents 2ef6f5e + 2129162 commit 4c2725b
Show file tree
Hide file tree
Showing 196 changed files with 288 additions and 208 deletions.
2 changes: 1 addition & 1 deletion NOTICE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Mission Support System (MSS)

:copyright: Copyright 2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
:copyright: Copyright 2011-2014 Marc Rautenhaus (mr)
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.


Expand Down
2 changes: 1 addition & 1 deletion conftest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2016-2017 Reimar Bauer
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ def get_tutorial_images():
# General information about the project.
project = 'MSS - Mission Support System'
copyright = \
'2016-2023 by the MSS team, see AUTHORS, ' \
'2016-2024 by the MSS team, see AUTHORS, ' \
'2011-2014 Marc Rautenhaus, ' \
'2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V., '
'2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.'

author = 'see AUTHORS file'
# The version info for the project you're documenting, acts as replacement for
Expand Down
2 changes: 1 addition & 1 deletion docs/dependencies.rst
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Dependencies
============

.. include:: ../NOTICE
.. include:: ../NOTICE
2 changes: 1 addition & 1 deletion docs/gallery/plot_examples/HS_template.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
This file is part of MSS.
:copyright: Copyright 2021-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2021-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docs/gallery/plot_examples/VS_template.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
This file is part of MSS.
:copyright: Copyright 2021-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2021-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docs/global.rst.inc
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.. _`conda-forge`: https://conda-forge.github.io/
.. _`Anaconda`: https://www.continuum.io/why-anaconda
.. _`Anaconda`: https://www.continuum.io/why-anaconda
2 changes: 1 addition & 1 deletion docs/mssautoplot.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ Store this mss_autoplot.json in a path, e.g. “$HOME/.config/msui”

**/$HOME/.config/msui/mssautoplot.json**

.. literalinclude:: samples/config/msui/mssautoplot.json.sample
.. literalinclude:: samples/config/msui/mssautoplot.json.sample
2 changes: 1 addition & 1 deletion docs/samples/automation/retriever.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
This file is part of MSS.
:copyright: Copyright 2020 Joern Ungermann
:copyright: Copyright 2020-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2020-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/config/mscolab/mscolab_settings.py.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of mss.

:copyright: Copyright 2019 Shivashis Padhi
:copyright: Copyright 2019-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2019-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/config/mswms/mswms_auth.py.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

:copyright: 2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
:copyright: 2011-2014 Marc Rautenhaus
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/config/mswms/mswms_settings.py.chem_plots
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2017-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/config/mswms/mswms_settings.py.demodata
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2017-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/config/mswms/mswms_settings.py.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

:copyright: 2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
:copyright: 2011-2014 Marc Rautenhaus
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/nginx/sites-available/mss_proxy.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ server {
proxy_redirect off;
proxy_pass http://127.0.0.1:8087;
}
}
}
2 changes: 1 addition & 1 deletion docs/samples/plugins/navaid.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
This file is part of MSS.
:copyright: Copyright 2022 by the MSS team, see AUTHORS.
:copyright: Copyright 2022-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion localbuild/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ localbuild is mainly a copy of the build instructions from
https://github.com/conda-forge/mss-feedstock/tree/master/recipe

You may want to copy this directory to a different directory on your system
and alter it for your needs.
and alter it for your needs.
8 changes: 0 additions & 8 deletions localbuild/meta.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@ build:
skip: true # [py<310]
number: 1000
script: "{{ PYTHON }} -m pip install . --no-deps -vv" # [not win]
entry_points:
- msui = mslib.msui.msui:main
- mss = mslib.msui.mss:main
- mswms = mslib.mswms.mswms:main
- mswms_demodata = mslib.mswms.demodata:main
- mscolab = mslib.mscolab.mscolab:main
- mssautoplot = mslib.utils.mssautoplot:main
- msidp = mslib.msidp.idp:main # [not win]

requirements:
build:
Expand Down
2 changes: 1 addition & 1 deletion mslib/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
:copyright: Copyright 2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
:copyright: Copyright 2011-2014 Marc Rautenhaus (mr)
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/index.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of mss.
:copyright: Copyright 2020 Reimar Bauer
:copyright: Copyright 2020-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2020-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/mscolab/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
This file is part of MSS.
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/mscolab/app/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
This file is part of MSS.
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/mscolab/chat_manager.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2019 Shivashis Padhi
:copyright: Copyright 2019-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2019-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/mscolab/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2019 Shivashis Padhi
:copyright: Copyright 2019-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2019-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/mscolab/file_manager.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2019 Shivashis Padhi
:copyright: Copyright 2019-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2019-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/mscolab/forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2023 Nilupul Manodya
:copyright: Copyright 2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2023-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/mscolab/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2019 Shivashis Padhi
:copyright: Copyright 2019-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2019-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/mscolab/mscolab.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2019 Shivashis Padhi
:copyright: Copyright 2019-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2019-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/mscolab/seed.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2019 Shivashis Padhi
:copyright: Copyright 2019-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2019-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/mscolab/server.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2019 Shivashis Padhi
:copyright: Copyright 2019-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2019-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/mscolab/sockets_manager.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2019 Shivashis Padhi
:copyright: Copyright 2019-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2019-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/mscolab/utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2019 Shivashis Padhi
:copyright: Copyright 2019-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2019-2024 by the MSS team, see AUTHORS.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion mslib/msui/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
:copyright: Copyright 2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
:copyright: Copyright 2011-2014 Marc Rautenhaus (mr)
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/msui/aircrafts.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2016-2017 Joern Ungermann
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/msui/airdata_dockwidget.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2021 May Bär
:copyright: Copyright 2021-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2021-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/msui/constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
:copyright: Copyright 2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
:copyright: Copyright 2011-2014 Marc Rautenhaus (mr), Tongxi Lou (tl)
:copyright: Copyright 2016-2017 Reimar Bauer
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/msui/editor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2020 Vaibhav Mehra <[email protected]>
:copyright: Copyright 2020-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2020-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/msui/flighttrack.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
:copyright: Copyright 2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
:copyright: Copyright 2011-2014 Marc Rautenhaus (mr)
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/msui/hexagon_dockwidget.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2016-2017 Joern Ungermann, Stefan Ensmann
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/msui/icons/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
This file is part of MSS.
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/msui/kmloverlay_dockwidget.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2017 Joern Ungermann
:copyright: Copyright 2017-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2017-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/msui/linearview.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This file is part of MSS.
:copyright: Copyright 2021 May Baer
:copyright: Copyright 2021-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2021-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/msui/mpl_map.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
:copyright: Copyright 2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
:copyright: Copyright 2011-2014 Marc Rautenhaus (mr)
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion mslib/msui/mpl_pathinteractor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
:copyright: Copyright 2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
:copyright: Copyright 2011-2014 Marc Rautenhaus (mr)
:copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
:copyright: Copyright 2016-2024 by the MSS team, see AUTHORS.
:license: APACHE-2.0, see LICENSE for details.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Loading

0 comments on commit 4c2725b

Please sign in to comment.