Skip to content

Commit

Permalink
Merge pull request #2351 from Open-MSS/merge_stable_to_develop
Browse files Browse the repository at this point in the history
Merge stable to develop
  • Loading branch information
ReimarBauer authored May 14, 2024
2 parents 037ba61 + 0b6d7c1 commit bc9b5c5
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 13 deletions.
8 changes: 8 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Changelog
=========

Version 8.3.5
~~~~~~~~~~~~~

Bug fix release:

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

Version 8.3.4
~~~~~~~~~~~~~

Expand Down
5 changes: 5 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ authors:
given-names: "Christian"
email: "[email protected]"
orcid: "https://orcid.org/0000-0001-5329-0054"
- affiliation: "Forschungszentrum Jülich GmbH"
family-names: "Riße"
given-names: "Matthias"
email: "[email protected]"
orcid: "https://orcid.org/0009-0006-6081-9327"
- affiliation: "Universität Hamburg"
family-names: "Rautenhaus"
given-names: "Marc"
Expand Down
3 changes: 2 additions & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ As **Beginner** start with an installation of Miniforge3

If you use already Mambaforge please read the `FAQ <https://github.com/conda-forge/miniforge#faq>`__



Install MSS
~~~~~~~~~~~

Expand All @@ -63,7 +65,6 @@ versions for dependencies. ::
(mssenv) $ msui



Mamba Server based installation example
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down
13 changes: 2 additions & 11 deletions mslib/msui/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,8 @@
# ToDo refactor to generic functions, keep only constants
HOME = os.path.expanduser(f"~{os.path.sep}")
MSUI_CONFIG_PATH = os.getenv("MSUI_CONFIG_PATH", os.path.join(HOME, ".config", "msui"))
if '://' in MSUI_CONFIG_PATH:
try:
_fs = fs.open_fs(MSUI_CONFIG_PATH)
except fs.errors.CreateFailed:
_fs.makedirs(MSUI_CONFIG_PATH)
except fs.opener.errors.UnsupportedProtocol:
logging.error('FS url "%s" not supported', MSUI_CONFIG_PATH)
else:
_dir = os.path.expanduser(MSUI_CONFIG_PATH)
if not os.path.exists(_dir):
os.makedirs(_dir)
# Make sure that MSUI_CONFIG_PATH exists
_ = fs.open_fs(MSUI_CONFIG_PATH, create=True)

GRAVATAR_DIR_PATH = fs.path.join(MSUI_CONFIG_PATH, "gravatars")

Expand Down
2 changes: 1 addition & 1 deletion mslib/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
See the License for the specific language governing permissions and
limitations under the License.
"""
__version__ = u'8.3.4'
__version__ = u'8.3.5'

0 comments on commit bc9b5c5

Please sign in to comment.