Unverified Commit d2ab9e4a authored by Julien Veyssier's avatar Julien Veyssier
Browse files

fix version, attempt to fix multiprocessing on windows


Signed-off-by: default avatarJulien Veyssier <eneiluj@posteo.net>
parent 0d9c4b97
Subproject commit 8523d22dc5031077c333c1ed452f8c96d4878d9d
Subproject commit 29a156acadc76980b65c11c33bac98ac8fae49a0
......@@ -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
......
......@@ -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 .
Markdown is supported
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