diff --git a/hrudelinCore b/hrudelinCore index 8523d22dc5031077c333c1ed452f8c96d4878d9d..29a156acadc76980b65c11c33bac98ac8fae49a0 160000 --- a/hrudelinCore +++ b/hrudelinCore @@ -1 +1 @@ -Subproject commit 8523d22dc5031077c333c1ed452f8c96d4878d9d +Subproject commit 29a156acadc76980b65c11c33bac98ac8fae49a0 diff --git a/hrudelin_dockwidget.py b/hrudelin_dockwidget.py index 336fd63d4e4883a7513cfb5d49868e6387f4e436..cf948c52ae688bcdd90855878ab3e7f288f55533 100644 --- a/hrudelin_dockwidget.py +++ b/hrudelin_dockwidget.py @@ -20,7 +20,6 @@ from pathlib import Path import tempfile, configparser from zipfile import ZipFile from collections import defaultdict -from multiprocessing import cpu_count import numpy as np from osgeo import gdal, ogr, osr from osgeo.gdalnumeric import * @@ -44,6 +43,14 @@ import processing from hrudelin.pluginUtils import layerstools from hrudelin.pluginUtils.tools import isWindows, isMac, which, prepareGrassEnv +from multiprocessing import cpu_count +import multiprocessing +# fix python bin path for dumb windows +if isWindows: + path = os.path.abspath(os.path.join(sys.exec_prefix, '../../bin/pythonw3.exe')) + multiprocessing.set_executable(path) + sys.argv = [None] + prepareGrassEnv() from hrudelin.hrudelinCore.modules.hrudelin_1_init import main as main1 from hrudelin.hrudelinCore.modules.hrudelin_2_basins import main as main2 diff --git a/version.sh b/version.sh index c60c3804f40f15ad590e169e910cf492c73e6a53..05a35461391326f3eaebe052c4b3c46ca1576b05 100755 --- a/version.sh +++ b/version.sh @@ -4,12 +4,15 @@ if [ -z $version ]; then version=`cat version.txt` fi -rm -rf /tmp/irip -mkdir /tmp/irip -cp -r * /tmp/irip/ +rm -f hrudelin*.zip +rm -rf /tmp/hrudelin +mkdir /tmp/hrudelin +cp -r * /tmp/hrudelin/ cd /tmp -find irip -name "*.pyc" -delete -sed -i 's/^version=.*/version='$version'/' irip/metadata.txt -zip -q -r irip-$version.zip irip +rm -f hrudelin/*.sh hrudelin/version.txt +find hrudelin -name "*.pyc" -delete +find hrudelin -name "__pycache__" -delete +sed -i 's/^version=.*/version='$version'/' hrudelin/metadata.txt +zip -q -r hrudelin-$version.zip hrudelin cd - -mv /tmp/irip-$version.zip . +mv /tmp/hrudelin-$version.zip .