Skip to content

Commit da77f88

Browse files
ReimarBauerReimarBauer
authored
Merge pull request #1164 from Open-MSS/merged_stable_into_development
Merged stable into development
2 parents 9a873bb + e7d069b commit da77f88

File tree

8 files changed

+50
-15
lines changed

8 files changed

+50
-15
lines changed

‎CHANGES.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
Changelog
22
=========
33

4+
Version 5.0.1
5+
~~~~~~~~~~~~~
6+
7+
Bug fix release
8+
9+
All changes:
10+
https://github.com/Open-MSS/MSS/milestone/64?closed=1
11+
412
Version 5.0.0
513
~~~~~~~~~~~~~
614

‎docs/installation.rst‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ If you do prefer to use over 7K open-source packages install Anaconda.
2929

3030
We recommend to install this for the local user. This does not require administrator permissions.
3131

32-
32+
As **Beginner** start with an installation of Miniconda
3333
- `Get Miniconda <https://docs.conda.io/projects/conda/en/latest/user-guide/install/>`_
34-
- `Get Anaconda <https://docs.continuum.io/anaconda/install/>`_
35-
- `Get Miniforge <https://github.com/conda-forge/miniforge/>`_
34+
35+
If you are an Advanced User you know that `Anaconda <https://docs.continuum.io/anaconda/install/>`_
36+
or `Miniforge <https://github.com/conda-forge/miniforge/>`_ are compatible too.
3637

3738

3839
conda-forge channel

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ import mss_chem_plots
8585
#base_dir = os.path.abspath(os.path.dirname(mslib.mswms.__file__))
8686
#xml_template_location = os.path.join(base_dir, "xml_templates")
8787

88+
# Path to store an optional gallery
89+
_gallerypath = r"/path/to/data/mss/gallery"
8890
_datapath = r"/path/to/data/mss/testdata"
8991

9092
data = {

‎docs/samples/config/wms/mss_wms_settings.py.demodata‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ import mslib.mswms
8484
#base_dir = os.path.abspath(os.path.dirname(mslib.mswms.__file__))
8585
#xml_template_location = os.path.join(base_dir, "xml_templates")
8686

87+
# Path to store an optional gallery
88+
_gallerypath = r"/path/to/data/mss/gallery"
8789
_datapath = r"/path/to/data/mss/testdata"
8890

8991
data = {

‎docs/samples/config/wms/mss_wms_settings.py.sample‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ import mslib.mswms
5555
# SETTINGS ###
5656
#
5757

58+
# Path to store an optional gallery
59+
_gallerypath = r"/path/to/data/mss/gallery"
5860

5961
# Paths to data directories. Process callables (the functions that are
6062
# executed by the dispatcher system) can access these paths, hence

‎mslib/static/templates/index.html‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,25 @@
1919
</div>
2020
</div>
2121
<div id="carouselExampleIndicators" class="carousel slide" data-ride="carousel">
22-
2322
<div class="carousel-inner">
2423
<div class="carousel-item active">
25-
<img class="rounded mx-auto d-block" src="/mss_theme/img/polstracc_2016.jpeg" alt="Polstracc 2016">
24+
<img class="rounded mx-auto d-block img-responsive" src="mss_theme/img/polstracc_2016.jpeg" width="592" alt="Polstracc 2016">
2625
</div>
2726

2827
<div class="carousel-item">
29-
<img class="rounded mx-auto d-block" src="/mss_theme/img/emerge_2017.jpeg" alt="Emerge 2017">
28+
<img class="rounded mx-auto d-block img-responsive" src="mss_theme/img/emerge_2017.jpeg" width="592" alt="Emerge 2017">
3029
</div>
3130
<div class="carousel-item">
32-
<img class="rounded mx-auto d-block" src="/mss_theme/img/stratoclim_2017.jpeg" alt="Stratoclim 2017">
31+
<img class="rounded mx-auto d-block img-responsive" src="mss_theme/img/stratoclim_2017.jpeg" width="592" alt="Stratoclim 2017">
3332
</div>
3433
<div class="carousel-item">
35-
<img class="rounded mx-auto d-block" src="/mss_theme/img/wise_2017.jpeg" alt="Stratoclim 2017">
34+
<img class="rounded mx-auto d-block img-responsive" src="mss_theme/img/wise_2017.jpeg" width="592" alt="Stratoclim 2017">
3635
</div>
3736
<div class="carousel-item">
38-
<img class="rounded mx-auto d-block" src="/mss_theme/img/southtrac_2019.jpeg" alt="Southtrac 2019">
37+
<img class="rounded mx-auto d-block img-responsive" src="mss_theme/img/southtrac_2019.jpeg" width="592" alt="Southtrac 2019">
3938
</div>
4039
<div class="carousel-item">
41-
<img class="rounded mx-auto d-block" src="/mss_theme/img/cirrus_hl_2021.png" alt="Cirrus HL 2021">
40+
<img class="rounded mx-auto d-block img-responsive" src="mss_theme/img/cirrus_hl_2021.png" width="592" alt="Cirrus HL 2021">
4241
</div>
4342
</div>
4443
<a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">

‎mslib/utils/__init__.py‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,19 @@
5757
from mslib.msui.constants import MSS_CONFIG_PATH
5858

5959

60+
def subprocess_startupinfo():
61+
"""
62+
config options to hide windows terminals on subprocess call
63+
"""
64+
startupinfo = None
65+
if os.name == 'nt':
66+
# thx to https://gist.github.com/nitely/3862493
67+
startupinfo = subprocess.STARTUPINFO()
68+
startupinfo.dwFlags = subprocess.CREATE_NEW_CONSOLE | subprocess.STARTF_USESHOWWINDOW
69+
startupinfo.wShowWindow = subprocess.SW_HIDE
70+
return startupinfo
71+
72+
6073
def parse_iso_datetime(string):
6174
try:
6275
result = isodate.parse_datetime(string)
@@ -762,7 +775,8 @@ def __init__(self, parent=None):
762775

763776
# Check if mamba is installed
764777
try:
765-
subprocess.run(["mamba"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
778+
subprocess.run(["mamba"], startupinfo=subprocess_startupinfo(),
779+
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
766780
self.command = "mamba"
767781
except FileNotFoundError:
768782
pass
@@ -786,7 +800,9 @@ def _check_version(self):
786800
"""
787801
# Don't notify on updates if mss is in a git repo, as you are most likely a developer
788802
try:
789-
git = subprocess.run(["git", "rev-parse", "--is-inside-work-tree"], stdout=subprocess.PIPE,
803+
git = subprocess.run(["git", "rev-parse", "--is-inside-work-tree"],
804+
startupinfo=subprocess_startupinfo(),
805+
stdout=subprocess.PIPE,
790806
stderr=subprocess.STDOUT, encoding="utf8")
791807
if "true" in git.stdout:
792808
self.is_git_env = True
@@ -795,7 +811,8 @@ def _check_version(self):
795811

796812
# Return if conda is not installed
797813
try:
798-
subprocess.run(["conda"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
814+
subprocess.run(["conda"], startupinfo=subprocess_startupinfo(),
815+
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
799816
except FileNotFoundError:
800817
return
801818

@@ -858,7 +875,11 @@ def _execute_command(self, command):
858875
"""
859876
Handles proper execution of conda subprocesses and logging
860877
"""
861-
process = subprocess.Popen(command.split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, encoding="utf8")
878+
process = subprocess.Popen(command.split(),
879+
startupinfo=subprocess_startupinfo(),
880+
stdout=subprocess.PIPE,
881+
stderr=subprocess.STDOUT,
882+
encoding="utf8")
862883
self.on_log_update.emit(" ".join(process.args) + "\n")
863884

864885
text = ""

‎mslib/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
See the License for the specific language governing permissions and
2525
limitations under the License.
2626
"""
27-
__version__ = u'5.0.0.'
27+
__version__ = u'5.0.1.'

0 commit comments

Comments
 (0)