Commit 34d48eb9 authored by Benjamin Jakimow's avatar Benjamin Jakimow
Browse files

increased QgsMinimumVerison to 3.14


fixed about- and changelog doc issues
modified CONTRIBUTORS.rst

Signed-off-by: Benjamin Jakimow's avatarBenjamin Jakimow <benjamin.jakimow@geo.hu-berlin.de>
parent df66ab65
"Benjamin Jakimow"
Earth Observation Lab, Humboldt-Universität zu Berlin, Germany
* Benjamin Jakimow <benjamin.jakimow@geo.hu-berlin.de>
* Patrick Hostert <patrick.hostert@geo.hu-berlin.de>
Earth Observation and Geoinformation Science Lab, University of Greifswald, Germany
* Sebastian van der Linden <sebastian.linden@uni-greifswald.de>
* Fabian Thiel <fabian.thiel@uni-greifswald.de>
......@@ -54,7 +54,7 @@ DIR_UI = DIR / 'ui'
DIR_DOCS = DIR_REPO / 'doc'
DIR_EXAMPLES = DIR_REPO / 'example'
PATH_EXAMPLE_TIMESERIES = DIR_EXAMPLES / 'ExampleTimeSeries.csv'
PATH_LICENSE = DIR_REPO / 'LICENSE.md'
PATH_LICENSE = DIR_REPO / 'LICENSE.html'
PATH_CHANGELOG = DIR_REPO / 'CHANGELOG'
PATH_ABOUT = DIR_REPO / 'ABOUT.html'
DIR_QGIS_RESOURCES = DIR_REPO / 'qgisresources'
......@@ -70,13 +70,15 @@ def debugLog(msg: str):
if not os.environ.get('READTHEDOCS') in ['True', 'TRUE', True]:
debugLog('load crosshair')
from .externals.qps.crosshair.crosshair import CrosshairStyle, CrosshairWidget, CrosshairMapCanvasItem, CrosshairDialog, getCrosshairStyle
from .externals.qps.crosshair.crosshair import CrosshairStyle, CrosshairWidget, CrosshairMapCanvasItem, \
CrosshairDialog, getCrosshairStyle
debugLog('load plotstyling')
from .externals.qps.plotstyling.plotstyling import PlotStyle, PlotStyleDialog, PlotStyleButton, PlotStyleWidget
debugLog('load classification')
from .externals.qps.classification.classificationscheme import ClassificationScheme, ClassInfo, ClassificationSchemeComboBox, ClassificationSchemeWidget, ClassificationSchemeDialog, hasClassification
from .externals.qps.classification.classificationscheme import ClassificationScheme, ClassInfo, \
ClassificationSchemeComboBox, ClassificationSchemeWidget, ClassificationSchemeDialog, hasClassification
debugLog('load models')
from .externals.qps.models import Option, OptionListModel, TreeNode, TreeModel, TreeView
......
......@@ -17,9 +17,9 @@
***************************************************************************
"""
import sys, os, pathlib
import pathlib
import sys
from qgis.gui import QgisInterface
def run():
# add site-packages to sys.path
......@@ -48,7 +48,6 @@ def run():
qgsApp.exitQgis()
if __name__ == '__main__':
run()
......@@ -189,7 +189,7 @@
<enum>QFrame::NoFrame</enum>
</property>
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="pageAbout">
<property name="sizePolicy">
......@@ -222,6 +222,9 @@
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
......@@ -377,7 +380,7 @@
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="placeholderText">
......
......@@ -51,7 +51,7 @@ MD.mHomepage = eotimeseriesviewer.HOMEPAGE
MD.mAbout = ''
MD.mTracker = eotimeseriesviewer.ISSUE_TRACKER
MD.mRepository = eotimeseriesviewer.REPOSITORY
MD.mQgisMinimumVersion = '3.12'
MD.mQgisMinimumVersion = '3.14'
MD.mEmail = eotimeseriesviewer.MAIL
########## End of config section
......@@ -137,7 +137,7 @@ def create_plugin(include_testdata: bool = False,
files.extend(list(scantree(DIR_REPO / 'tests', pattern=re.compile(r'\.py$'))))
files.extend(list(scantree(DIR_REPO / 'example', pattern=re.compile(r'\.(gpkg|csv|tif|xml|py)$'))))
files.append(DIR_REPO / '__init__.py')
files.append(DIR_REPO / 'CHANGELOG')
files.append(DIR_REPO / 'CHANGELOG.rst')
files.append(DIR_REPO / 'ABOUT.html')
files.append(DIR_REPO / 'CONTRIBUTORS.rst')
files.append(DIR_REPO / 'LICENSE.md')
......@@ -170,7 +170,7 @@ def create_plugin(include_testdata: bool = False,
qgisresources = pathlib.Path(DIR_REPO) / 'qgisresources'
shutil.copytree(qgisresources, PLUGIN_DIR / 'qgisresources')
createCHANGELOG(PLUGIN_DIR)
createHTMLDocuments(PLUGIN_DIR)
import scripts.update_docs
scripts.update_docs.update_documentation()
......@@ -245,22 +245,27 @@ def rst2html(pathMD: pathlib.Path) -> str:
return html
def createCHANGELOG(dirPlugin:pathlib.Path):
def createHTMLDocuments(dirPlugin: pathlib.Path):
"""
Reads the CHANGELOG.rst and creates the deploy/CHANGELOG (without extension!) for the QGIS Plugin Manager
:return:
"""
pathMD = DIR_REPO / 'CHANGELOG.rst'
pathCL = dirPlugin / 'CHANGELOG'
pathCL2 = DIR_REPO / 'CHANGELOG'
os.makedirs(pathCL.parent, exist_ok=True)
pathHTML = dirPlugin / 'CHANGELOG'
#pathCL2 = DIR_REPO / 'CHANGELOG'
os.makedirs(pathHTML.parent, exist_ok=True)
# make html compact
html_cleaned = rst2html(pathMD)
with open(pathCL, 'w', encoding='utf-8') as f:
with open(pathHTML, 'w', encoding='utf-8') as f:
f.write(''.join(html_cleaned))
with open(pathCL2, 'w', encoding='utf-8') as f:
pathMD = DIR_REPO / 'LICENSE.md'
pathHTML = dirPlugin / 'LICENSE.html'
html_cleaned = rst2html(pathMD)
with open(pathHTML, 'w', encoding='utf-8') as f:
f.write(''.join(html_cleaned))
......
......@@ -7,7 +7,7 @@ def convert_changelog():
"""
Converts <repo>/CHANGELOG.rst to <repo>/doc/source/changelog.rst
"""
pathSrc = DIR_REPO / 'CHANGELOG'
pathSrc = DIR_REPO / 'CHANGELOG.rst'
pathDst = DIR_DOCS / 'source' / 'changelog.rst'
assert pathSrc.is_file()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment