From 86e88b31817c38b74baaac516897f03d07b4fca2 Mon Sep 17 00:00:00 2001 From: Test User Date: Wed, 11 Jul 2018 12:24:13 +0200 Subject: [PATCH 1/3] [skip ci] updated version information after successful test of v2.0.2-226-g6ed1e316 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1df89bc24..f889e902a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-221-g497a18b1 +v2.0.2-226-g6ed1e316 From e08b73259235c0af61d685edf2578d51cab97b30 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 12 Jul 2018 10:33:05 +0200 Subject: [PATCH 2/3] it's a byte string in python3 --- lib/damask/util.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/damask/util.py b/lib/damask/util.py index a9761d942..413f955e9 100644 --- a/lib/damask/util.py +++ b/lib/damask/util.py @@ -1,5 +1,4 @@ # -*- coding: UTF-8 no BOM -*- - import sys,time,random,threading,os,subprocess,shlex import numpy as np from optparse import Option @@ -94,13 +93,12 @@ def execute(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, stdin = subprocess.PIPE) - out,error = [i.replace("\x08","") for i in (process.communicate() if streamIn is None - else process.communicate(streamIn.read()))] + out,error = [i.replace(b"\x08",b"") for i in (process.communicate() if streamIn is None + else process.communicate(streamIn.read()))] os.chdir(initialPath) if process.returncode != 0: raise RuntimeError('{} failed with returncode {}'.format(cmd,process.returncode)) return out,error - def coordGridAndSize(coordinates): """Determines grid count and overall physical size along each dimension of an ordered array of coordinates""" dim = coordinates.shape[1] From 6f3de6efe8d4b46d8c7747abeb5acfaafc8489bc Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 13 Jul 2018 19:06:38 +0200 Subject: [PATCH 3/3] [skip ci] updated version information after successful test of v2.0.2-228-ge08b7325 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index f889e902a..8a75e99ff 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-226-g6ed1e316 +v2.0.2-228-ge08b7325