-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into change_mat_aa_to_mat_a
- Loading branch information
Showing
14 changed files
with
136 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
./tests/data/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# How to release | ||
|
||
Update SMODERP2D version in: | ||
|
||
- `smoderp2d/__init__.py` | ||
- `bin/qgis/smoderp2d-plugin/metadata.txt` | ||
- `pyproject.toml` | ||
|
||
Checkout the version: | ||
|
||
``` | ||
export SMODERP2D_VERSION=<version> | ||
git checkout v$SMODERP2D_VERSION | ||
``` | ||
|
||
Build the package: | ||
|
||
``` | ||
pip3 wheel . | ||
``` | ||
|
||
Upload package to PyPi: | ||
|
||
``` | ||
python3 -m twine upload smoderp2d-${SMODERP2D_VERSION}-py3-none-any.whl | ||
``` | ||
|
||
Build QGIS plugin: | ||
|
||
``` | ||
(cd ./bin/qgis/smoderp2d-plugin/; ./scripts/build_package.sh) | ||
``` | ||
|
||
Upload `bin/qgis/smoderp2d-plugin/zip_build/smoderp2d_plugin.zip` to | ||
QGIS Plugin repository. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 5 additions & 6 deletions
11
bin/qgis/smoderp2d-plugin/patches/smoderp_2D_dockwidget.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,25 @@ | ||
diff --git a/bin/qgis/smoderp2d-plugin/smoderp_2D_dockwidget.py b/bin/qgis/smoderp2d-plugin/smoderp_2D_dockwidget.py | ||
index e751fcf3..92fed2c4 100644 | ||
index 4cef0a8f..be86b6eb 100644 | ||
--- a/bin/qgis/smoderp2d-plugin/smoderp_2D_dockwidget.py | ||
+++ b/bin/qgis/smoderp2d-plugin/smoderp_2D_dockwidget.py | ||
@@ -26,6 +26,7 @@ import os | ||
@@ -27,6 +27,7 @@ import sys | ||
import glob | ||
import datetime | ||
import tempfile | ||
+import sys | ||
from pathlib import Path | ||
|
||
from PyQt5 import QtWidgets | ||
@@ -41,11 +42,12 @@ from qgis.core import ( | ||
@@ -43,10 +44,11 @@ from qgis.core import ( | ||
from qgis.utils import iface | ||
from qgis.gui import QgsMapLayerComboBox, QgsFieldComboBox | ||
|
||
+sys.path.insert(0, os.path.dirname(__file__)) | ||
from smoderp2d.runners.qgis import QGISRunner | ||
from smoderp2d.core.general import Globals, GridGlobals | ||
from smoderp2d.providers import Logger | ||
from smoderp2d.exceptions import ProviderError, ComputationAborted | ||
from smoderp2d.exceptions import ProviderError, ComputationAborted, MaxIterationExceeded | ||
-from bin.base import arguments, sections | ||
+from base import arguments, sections | ||
|
||
from .connect_grass import find_grass_bin | ||
from .custom_widgets import HistoryWidget | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,4 +23,4 @@ | |
- no | ||
""" | ||
|
||
__version__ = "2.0.0rc2" | ||
__version__ = "2.1.dev" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.