Skip to content

Commit

Permalink
Merge pull request #997 from EnMAP-Box/prepare_release_3.15
Browse files Browse the repository at this point in the history
Prepare release 3.15
  • Loading branch information
janzandr authored Oct 9, 2024
2 parents 10d4a66 + ab233a9 commit 8410fe5
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .plugin.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = EnMAP-Box 3
version = 3.15-alpha.0
version = 3.15.0
qgisMinimumVersion = 3.34
description = Imaging Spectroscopy and Remote Sensing for QGIS
tags =
Expand Down
29 changes: 16 additions & 13 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,28 @@ People who made large contributions to the EnMAP-Box (in alphabetical order).
### Earth Observation Lab, Humboldt-Universität zu Berlin, Germany

* Andreas Janz <[email protected]>
* Akpona Okujeni <[email protected]>
* Akpona Okujeni
* Benjamin Jakimow <[email protected]>
* Franz Schug <[email protected]>
* Katja Kowalski <[email protected]>
* Philippe Rufin <[email protected]>
* Marcel Schwieder <[email protected]>
* Matthias Held <[email protected]>
* Sam Cooper <[email protected]>
* Stefan Ernst <[email protected]>
* Franz Schug
* Katja Kowalski
* Philippe Rufin
* Marcel Schwieder
* Matthias Held
* Sam Cooper
* Stefan Ernst

### Earth Observation and Geoinformation Science Lab, University of Greifswald, Germany

* Fabian Thiel <[email protected]>
* Fabian Thiel
* Sebastian van der Linden <[email protected]>

### Ludwig-Maximilians-Universität München, Germany

* Matthias Wocher <[email protected]>
* Martin Danner
* Katja Berger <[email protected]>
* Matthias Wocher <[email protected]>
* Martin Danner <[email protected]>
* Stefanie Steinhauser <[email protected]>
* Tobias Hank <[email protected]>

### GFZ German Research Centre For Geosciences, Potsdam, Germany

Expand All @@ -43,6 +46,6 @@ People who made large contributions to the EnMAP-Box (in alphabetical order).
### AWI Alfred Wegener Institute for Polar and Marine Research, Bremerhaven, Germany

* Astrid Bracher <[email protected]>
* Brenner Silva <[email protected]>
* Leonardo Alvarado <leonardo.alvarado@awi.de>
* Brenner Silva
* Leonardo Alvarado <leonardo.alvarado@dlr.de>
* Mariana Altenburg Soppa <[email protected]>
8 changes: 7 additions & 1 deletion enmapbox/gui/about.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ def __init__(self, *args, **kwds):
self.labelVersion.setText(info)
self.setAboutTitle()

def loadMDAndremoveDetailsSection(p: Union[str, pathlib.Path]): # see issue #990
with open(p, 'r', encoding='utf-8') as f:
md = f.readlines()
md = [l for l in md if 'details>' not in l]
return ''.join(md)

def loadMD(p: Union[str, pathlib.Path]):
p = pathlib.Path(p)

Expand All @@ -89,7 +95,7 @@ def loadMD(p: Union[str, pathlib.Path]):
self.tbLicense.setMarkdown(loadMD(r / 'LICENSE.md'))
self.tbCredits.setMarkdown(loadMD(r / 'CREDITS.md'))
self.tbContributors.setMarkdown(loadMD(r / 'CONTRIBUTORS.md'))
self.tbChanges.setMarkdown(loadMD(r / 'CHANGELOG.md'))
self.tbChanges.setMarkdown(loadMDAndremoveDetailsSection(r / 'CHANGELOG.md'))

def setAboutTitle(self, suffix: str = None):
"""
Expand Down
4 changes: 2 additions & 2 deletions enmapbox/gui/ui/aboutdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</property>
<property name="maximumSize">
<size>
<width>1000</width>
<height>650</height>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="windowTitle">
Expand Down
5 changes: 3 additions & 2 deletions scripts/create_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,9 @@ def markdownToHTML(path_md: Union[str, pathlib.Path]) -> str:
settings_overrides=overrides)
elif path_md.name.endswith('.md'):
with open(path_md, 'r', encoding='utf-8') as f:
md = f.read()
html = markdown.markdown(md)
md = f.readlines()
md = [l for l in md if 'details>' not in l] # remove details section (see issue #990)
html = markdown.markdown(''.join(md))
else:
raise Exception(f'Unsupported file: {path_md}')
return html
Expand Down
13 changes: 8 additions & 5 deletions scripts/update_splashscreen.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,14 @@ def update_splashscreen():
tree.write(PATH_EXPORT, encoding='utf8')

# see https://inkscape.org/doc/inkscape-man.html
cmd = ['inkscape',
'--export-type=png',
'--export-area-page',
f'--export-filename={PATH_PNG}',
f'{PATH_EXPORT}']
cmd = [
# 'inkscape',
r'"C:\Program Files\Inkscape\inkscape.exe"',
'--export-type=png',
'--export-area-page',
f'--export-filename={PATH_PNG}',
f'{PATH_EXPORT}'
]

print('Run:\n' + ' '.join(cmd))
print('to export the svg as png with Inkscape (https://inkscape.org)')
Expand Down

0 comments on commit 8410fe5

Please sign in to comment.