diff --git a/CHANGES.rst b/CHANGES.rst
index bcdb02b1e..2f1e87f88 100755
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,14 @@
Changelog
=========
+Version 5.0.1
+~~~~~~~~~~~~~
+
+Bug fix release
+
+All changes:
+https://github.com/Open-MSS/MSS/milestone/64?closed=1
+
Version 5.0.0
~~~~~~~~~~~~~
diff --git a/docs/installation.rst b/docs/installation.rst
index 7a88805cb..3f02d78d0 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -29,10 +29,11 @@ If you do prefer to use over 7K open-source packages install Anaconda.
We recommend to install this for the local user. This does not require administrator permissions.
-
+As **Beginner** start with an installation of Miniconda
- `Get Miniconda `_
-- `Get Anaconda `_
-- `Get Miniforge `_
+
+If you are an Advanced User you know that `Anaconda `_
+or `Miniforge `_ are compatible too.
conda-forge channel
diff --git a/docs/samples/config/wms/mss_wms_settings.py.chem_plots b/docs/samples/config/wms/mss_wms_settings.py.chem_plots
index 8a8471f22..99308165d 100644
--- a/docs/samples/config/wms/mss_wms_settings.py.chem_plots
+++ b/docs/samples/config/wms/mss_wms_settings.py.chem_plots
@@ -85,6 +85,8 @@ import mss_chem_plots
#base_dir = os.path.abspath(os.path.dirname(mslib.mswms.__file__))
#xml_template_location = os.path.join(base_dir, "xml_templates")
+# Path to store an optional gallery
+_gallerypath = r"/path/to/data/mss/gallery"
_datapath = r"/path/to/data/mss/testdata"
data = {
diff --git a/docs/samples/config/wms/mss_wms_settings.py.demodata b/docs/samples/config/wms/mss_wms_settings.py.demodata
index 301d0cf7b..7b28c3f31 100644
--- a/docs/samples/config/wms/mss_wms_settings.py.demodata
+++ b/docs/samples/config/wms/mss_wms_settings.py.demodata
@@ -84,6 +84,8 @@ import mslib.mswms
#base_dir = os.path.abspath(os.path.dirname(mslib.mswms.__file__))
#xml_template_location = os.path.join(base_dir, "xml_templates")
+# Path to store an optional gallery
+_gallerypath = r"/path/to/data/mss/gallery"
_datapath = r"/path/to/data/mss/testdata"
data = {
diff --git a/docs/samples/config/wms/mss_wms_settings.py.sample b/docs/samples/config/wms/mss_wms_settings.py.sample
index d33b63865..92df55587 100644
--- a/docs/samples/config/wms/mss_wms_settings.py.sample
+++ b/docs/samples/config/wms/mss_wms_settings.py.sample
@@ -55,6 +55,8 @@ import mslib.mswms
# SETTINGS ###
#
+# Path to store an optional gallery
+_gallerypath = r"/path/to/data/mss/gallery"
# Paths to data directories. Process callables (the functions that are
# executed by the dispatcher system) can access these paths, hence
diff --git a/mslib/static/templates/index.html b/mslib/static/templates/index.html
index e14086a66..653b9864f 100644
--- a/mslib/static/templates/index.html
+++ b/mslib/static/templates/index.html
@@ -19,26 +19,25 @@
-
diff --git a/mslib/utils/__init__.py b/mslib/utils/__init__.py
index a74c01156..0a4b803c6 100644
--- a/mslib/utils/__init__.py
+++ b/mslib/utils/__init__.py
@@ -57,6 +57,19 @@
from mslib.msui.constants import MSS_CONFIG_PATH
+def subprocess_startupinfo():
+ """
+ config options to hide windows terminals on subprocess call
+ """
+ startupinfo = None
+ if os.name == 'nt':
+ # thx to https://gist.github.com/nitely/3862493
+ startupinfo = subprocess.STARTUPINFO()
+ startupinfo.dwFlags = subprocess.CREATE_NEW_CONSOLE | subprocess.STARTF_USESHOWWINDOW
+ startupinfo.wShowWindow = subprocess.SW_HIDE
+ return startupinfo
+
+
def parse_iso_datetime(string):
try:
result = isodate.parse_datetime(string)
@@ -762,7 +775,8 @@ def __init__(self, parent=None):
# Check if mamba is installed
try:
- subprocess.run(["mamba"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+ subprocess.run(["mamba"], startupinfo=subprocess_startupinfo(),
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
self.command = "mamba"
except FileNotFoundError:
pass
@@ -786,7 +800,9 @@ def _check_version(self):
"""
# Don't notify on updates if mss is in a git repo, as you are most likely a developer
try:
- git = subprocess.run(["git", "rev-parse", "--is-inside-work-tree"], stdout=subprocess.PIPE,
+ git = subprocess.run(["git", "rev-parse", "--is-inside-work-tree"],
+ startupinfo=subprocess_startupinfo(),
+ stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, encoding="utf8")
if "true" in git.stdout:
self.is_git_env = True
@@ -795,7 +811,8 @@ def _check_version(self):
# Return if conda is not installed
try:
- subprocess.run(["conda"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+ subprocess.run(["conda"], startupinfo=subprocess_startupinfo(),
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
except FileNotFoundError:
return
@@ -858,7 +875,11 @@ def _execute_command(self, command):
"""
Handles proper execution of conda subprocesses and logging
"""
- process = subprocess.Popen(command.split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, encoding="utf8")
+ process = subprocess.Popen(command.split(),
+ startupinfo=subprocess_startupinfo(),
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ encoding="utf8")
self.on_log_update.emit(" ".join(process.args) + "\n")
text = ""
diff --git a/mslib/version.py b/mslib/version.py
index b47befcf8..41eef1092 100644
--- 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'5.0.0.'
+__version__ = u'5.0.1.'
+ 
+ 
+ 
+ 
+ 
+ 