From 1496ffe1e09096bcae37b82b4c3e43b5905cfb7f Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 00:10:37 +0200 Subject: [PATCH 01/14] Only build for active python version, not for default conda environment --- wrappers/Python/generate_meta.yaml.py | 28 ++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index d9c2544c..614f62cf 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -42,13 +42,13 @@ requirements: - {{ pkg -}} {% endfor %} -test: - # Python imports - imports: - - CoolProp - #- CoolProp.GUI - #- CoolProp.Plots - - CoolProp.tests +#test: +# # Python imports +# imports: +# - CoolProp +# #- CoolProp.GUI +# #- CoolProp.Plots +# - CoolProp.tests # commands: # You can put test commands to be run here. Use this to test that the @@ -175,10 +175,16 @@ def run_command(cmd): stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE).communicate() -#subprocess.check_call('conda build .', shell = True, stdout = sys.stdout, stderr = sys.stderr) -filename = os.path.abspath(run_command('conda build --output .')[0]).strip() -tar = os.path.abspath(os.path.join(os.path.dirname(__file__),'conda','Python_conda')) -try: +cmd = ['conda','env','remove','-yq','-n'] +subprocess.check_call(cmd+['_test'], stdout=sys.stdout, stderr=sys.stderr) +subprocess.check_call(cmd+['_build'], stdout=sys.stdout, stderr=sys.stderr) +ver = sys.version_info +cmd = ['conda','build','--python',str(ver[0])+'.'+str(ver[1])] +subprocess.check_call(cmd+['.'], stdout=sys.stdout, stderr=sys.stderr) +#vsubprocess.check_call(cmd+['.'], shell=True, stdout=sys.stdout, stderr=sys.stderr)#, env=os.environ.copy()) +filename = os.path.abspath(run_command(cmd+['--output','.'])[0]).decode("utf-8").strip() +tar = os.path.abspath(os.path.join(os.path.dirname(__file__),'conda','Python_conda')).strip() +try: os.makedirs(tar) except Exception as e: if os.path.isdir(tar): pass From c4e062b05771757fd8cd19f1473073b496090f88 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 01:13:06 +0200 Subject: [PATCH 02/14] Add env remove script --- wrappers/Python/generate_meta.yaml.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index 614f62cf..223b1c1c 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -42,13 +42,13 @@ requirements: - {{ pkg -}} {% endfor %} -#test: -# # Python imports -# imports: -# - CoolProp -# #- CoolProp.GUI -# #- CoolProp.Plots -# - CoolProp.tests +test: + # Python imports + imports: + - CoolProp + #- CoolProp.GUI + #- CoolProp.Plots + - CoolProp.tests # commands: # You can put test commands to be run here. Use this to test that the @@ -180,10 +180,9 @@ subprocess.check_call(cmd+['_test'], stdout=sys.stdout, stderr=sys.stderr) subprocess.check_call(cmd+['_build'], stdout=sys.stdout, stderr=sys.stderr) ver = sys.version_info cmd = ['conda','build','--python',str(ver[0])+'.'+str(ver[1])] -subprocess.check_call(cmd+['.'], stdout=sys.stdout, stderr=sys.stderr) -#vsubprocess.check_call(cmd+['.'], shell=True, stdout=sys.stdout, stderr=sys.stderr)#, env=os.environ.copy()) +#subprocess.check_call(cmd+['.'], shell=True, stdout=sys.stdout, stderr=sys.stderr) filename = os.path.abspath(run_command(cmd+['--output','.'])[0]).decode("utf-8").strip() -tar = os.path.abspath(os.path.join(os.path.dirname(__file__),'conda','Python_conda')).strip() +tar = os.path.abspath(os.path.join(os.path.dirname(__file__),'conda','Python_conda',os.path.dirname(filename))).strip() try: os.makedirs(tar) except Exception as e: From d4eda61d35f6cf6d80c21a6b0f92f3502b2d1d26 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 02:08:00 +0200 Subject: [PATCH 03/14] Something has to be done about the permissions --- wrappers/Python/generate_meta.yaml.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index 223b1c1c..fe2f6082 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -175,15 +175,21 @@ def run_command(cmd): stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE).communicate() -cmd = ['conda','env','remove','-yq','-n'] -subprocess.check_call(cmd+['_test'], stdout=sys.stdout, stderr=sys.stderr) -subprocess.check_call(cmd+['_build'], stdout=sys.stdout, stderr=sys.stderr) +#cmd = ['conda','remove','--all','-yq','-n'] +#for t in ['_test','_build']: +# try: +# subprocess.check_call(cmd+[t], stdout=sys.stdout, stderr=sys.stderr) +# except: +# pass +#subprocess.check_call(['cmd', '/c', 'rd', '/s', '/q', path]) +tar = os.path.abspath(os.path.join(os.path.dirname(__file__),'conda')).strip() +if os.path.isdir(tar): shutil.rmtree(tar,True) ver = sys.version_info cmd = ['conda','build','--python',str(ver[0])+'.'+str(ver[1])] -#subprocess.check_call(cmd+['.'], shell=True, stdout=sys.stdout, stderr=sys.stderr) filename = os.path.abspath(run_command(cmd+['--output','.'])[0]).decode("utf-8").strip() -tar = os.path.abspath(os.path.join(os.path.dirname(__file__),'conda','Python_conda',os.path.dirname(filename))).strip() -try: +tar = os.path.join(tar,'Python_conda',os.path.basename(os.path.dirname(filename))).strip() +subprocess.check_call(cmd+['.'], shell=True, stdout=sys.stdout, stderr=sys.stderr) +try: os.makedirs(tar) except Exception as e: if os.path.isdir(tar): pass From bad6245519b69706c0fbb8da9936542195bf27a6 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 02:46:48 +0200 Subject: [PATCH 04/14] Fixing these permission and platform errors is a pain... --- wrappers/Python/generate_meta.yaml.py | 30 +++++++++++++++++++-------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index fe2f6082..8dfb834c 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -168,22 +168,34 @@ f.close() runner_template = """ from __future__ import print_function -import sys, shutil, subprocess, os, errno +import sys, shutil, subprocess, os, stat def run_command(cmd): '''given shell command, returns communication tuple of stdout and stderr''' return subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE).communicate() -#cmd = ['conda','remove','--all','-yq','-n'] -#for t in ['_test','_build']: -# try: -# subprocess.check_call(cmd+[t], stdout=sys.stdout, stderr=sys.stderr) -# except: -# pass -#subprocess.check_call(['cmd', '/c', 'rd', '/s', '/q', path]) +def remove_all(path): + #subprocess.check_call(['cmd', '/c', 'rd', '/s', '/q', path]) + print(run_command(['cmd', '/c', 'rd', '/s', '/q', path])[0].decode("utf-8")) +def remove_readonly(func, path, _): + "Clear the readonly bit and reattempt the removal" + os.chmod(path, stat.S_IWRITE) + try: func(path) + except: remove_all(path); pass +# +cmd = ['conda','remove','--all','-yq','-n'] +for t in ['_test','_build']: + try: + subprocess.check_call(cmd+[t], stdout=sys.stdout, stderr=sys.stderr) + except: + envs = run_command(['conda','env','list'])[0].decode("utf-8").split() + for i,env in enumerate(envs): + if env == t: + shutil.rmtree(envs[i+1], onerror=remove_readonly) + pass tar = os.path.abspath(os.path.join(os.path.dirname(__file__),'conda')).strip() -if os.path.isdir(tar): shutil.rmtree(tar,True) +if os.path.isdir(tar): shutil.rmtree(tar, onerror=remove_readonly) ver = sys.version_info cmd = ['conda','build','--python',str(ver[0])+'.'+str(ver[1])] filename = os.path.abspath(run_command(cmd+['--output','.'])[0]).decode("utf-8").strip() From 58aa6ebc3fe512a3f020b0e59ae54dc3e6248a5b Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 03:02:32 +0200 Subject: [PATCH 05/14] better be a little careful with the delete commands --- wrappers/Python/generate_meta.yaml.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index 8dfb834c..3aed7091 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -189,10 +189,13 @@ for t in ['_test','_build']: try: subprocess.check_call(cmd+[t], stdout=sys.stdout, stderr=sys.stderr) except: - envs = run_command(['conda','env','list'])[0].decode("utf-8").split() - for i,env in enumerate(envs): - if env == t: - shutil.rmtree(envs[i+1], onerror=remove_readonly) + envs = run_command(['conda','env','list'])[0].decode("utf-8").splitlines() + for env in envs: + lst = env.split(' ') + if len(lst)>0 and lst[0] == t: + dir = ' '.join(lst[1:]).strip() + print("Manually removing: "+dir) + shutil.rmtree(dir, onerror=remove_readonly) pass tar = os.path.abspath(os.path.join(os.path.dirname(__file__),'conda')).strip() if os.path.isdir(tar): shutil.rmtree(tar, onerror=remove_readonly) From bd5db93dc48e5502e3caff558641d1b0a4810d9a Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 03:06:42 +0200 Subject: [PATCH 06/14] exception handling --- wrappers/Python/generate_meta.yaml.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index 3aed7091..b8e6c302 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -203,7 +203,12 @@ ver = sys.version_info cmd = ['conda','build','--python',str(ver[0])+'.'+str(ver[1])] filename = os.path.abspath(run_command(cmd+['--output','.'])[0]).decode("utf-8").strip() tar = os.path.join(tar,'Python_conda',os.path.basename(os.path.dirname(filename))).strip() -subprocess.check_call(cmd+['.'], shell=True, stdout=sys.stdout, stderr=sys.stderr) +try: + subprocess.check_call(cmd+['.'], shell=True, stdout=sys.stdout, stderr=sys.stderr) +except Exception as e: + print("conda build failed: "+str(e)) + sys.exit(0) + pass try: os.makedirs(tar) except Exception as e: From 0ecabe31eb0d837a04546d8b00bb2e06ecf5661d Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 10:20:43 +0200 Subject: [PATCH 07/14] More error handling --- wrappers/Python/generate_meta.yaml.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index b8e6c302..67a955b9 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -207,15 +207,18 @@ try: subprocess.check_call(cmd+['.'], shell=True, stdout=sys.stdout, stderr=sys.stderr) except Exception as e: print("conda build failed: "+str(e)) - sys.exit(0) pass try: os.makedirs(tar) except Exception as e: if os.path.isdir(tar): pass else: raise -print("Copying: "+str(filename)+" to "+str(tar)) -shutil.copy(filename,tar) +try: + print("Copying: "+str(filename)+" to "+str(tar)) + shutil.copy(filename,tar) +except Exception as e: + print("Copy operation failed: "+str(e)) + pass sys.exit(0) """ target = "runner.py" From 47220486b49f0e758d78e546a63bbcb8e43e8aff Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 10:37:09 +0200 Subject: [PATCH 08/14] use the correct script --- Web/develop/buildbot.rst | 8 ++++---- wrappers/Python/generate_meta.yaml.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Web/develop/buildbot.rst b/Web/develop/buildbot.rst index d6796b00..1619dabb 100644 --- a/Web/develop/buildbot.rst +++ b/Web/develop/buildbot.rst @@ -84,8 +84,8 @@ steps on a Windows machine:: conda create -n CoolProp27 python=2 conda create -n CoolProp34 python=3 - conda install -n CoolProp27 cython pip pywin32 unxutils jinja2 pyyaml ndg-httpsclient - conda install -n CoolProp34 cython pip pywin32 unxutils jinja2 pyyaml ndg-httpsclient + conda install -n CoolProp27 cython pip pywin32 unxutils jinja2 pyyaml pycrypto ndg-httpsclient + conda install -n CoolProp34 cython pip pywin32 unxutils jinja2 pyyaml pycrypto ndg-httpsclient activate CoolProp27 pip install wheel @@ -100,8 +100,8 @@ On a Linux system, things only change a little bit:: conda create -n CoolProp27 python=2 conda create -n CoolProp34 python=3 - conda install -n CoolProp27 cython pip jinja2 pyyaml - conda install -n CoolProp34 cython pip jinja2 pyyaml + conda install -n CoolProp27 cython pip jinja2 pyyaml pycrypto + conda install -n CoolProp34 cython pip jinja2 pyyaml pycrypto source activate CoolProp27 pip install wheel diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index 67a955b9..fe234413 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -163,7 +163,7 @@ popd """ target = "build.sh" f = codecs.open(os.path.join(target_dir,target),mode='wb',encoding='utf-8') -f.write(bat_template) +f.write(bsh_template) f.close() runner_template = """ @@ -201,6 +201,7 @@ tar = os.path.abspath(os.path.join(os.path.dirname(__file__),'conda')).strip() if os.path.isdir(tar): shutil.rmtree(tar, onerror=remove_readonly) ver = sys.version_info cmd = ['conda','build','--python',str(ver[0])+'.'+str(ver[1])] +print('Command is: '+' '.join(cmd)) filename = os.path.abspath(run_command(cmd+['--output','.'])[0]).decode("utf-8").strip() tar = os.path.join(tar,'Python_conda',os.path.basename(os.path.dirname(filename))).strip() try: From ce35d624a3a2712899bf4c491d1fcef77a68356d Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 10:48:17 +0200 Subject: [PATCH 09/14] something does not work on OSX --- wrappers/Python/generate_meta.yaml.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index fe234413..c6c7be0a 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -187,9 +187,9 @@ def remove_readonly(func, path, _): cmd = ['conda','remove','--all','-yq','-n'] for t in ['_test','_build']: try: - subprocess.check_call(cmd+[t], stdout=sys.stdout, stderr=sys.stderr) + subprocess.check_call(' '.join(cmd+[t]), stdout=sys.stdout, stderr=sys.stderr) except: - envs = run_command(['conda','env','list'])[0].decode("utf-8").splitlines() + envs = run_command(' '.join(['conda','env','list']))[0].decode("utf-8").splitlines() for env in envs: lst = env.split(' ') if len(lst)>0 and lst[0] == t: @@ -202,10 +202,10 @@ if os.path.isdir(tar): shutil.rmtree(tar, onerror=remove_readonly) ver = sys.version_info cmd = ['conda','build','--python',str(ver[0])+'.'+str(ver[1])] print('Command is: '+' '.join(cmd)) -filename = os.path.abspath(run_command(cmd+['--output','.'])[0]).decode("utf-8").strip() +filename = os.path.abspath(run_command(' '.join(cmd+['--output','.']))[0]).decode("utf-8").strip() tar = os.path.join(tar,'Python_conda',os.path.basename(os.path.dirname(filename))).strip() try: - subprocess.check_call(cmd+['.'], shell=True, stdout=sys.stdout, stderr=sys.stderr) + subprocess.check_call(' '.join(cmd+['.']), shell=True, stdout=sys.stdout, stderr=sys.stderr) except Exception as e: print("conda build failed: "+str(e)) pass From f12bc464059250ad6db0d5abe391ee9d279d8010 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 11:03:53 +0200 Subject: [PATCH 10/14] The test keep failing on Windows due to permission errors --- wrappers/Python/generate_meta.yaml.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index c6c7be0a..c4036379 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -42,13 +42,13 @@ requirements: - {{ pkg -}} {% endfor %} -test: - # Python imports - imports: - - CoolProp - #- CoolProp.GUI - #- CoolProp.Plots - - CoolProp.tests +#test: +# # Python imports +# imports: +# - CoolProp +# #- CoolProp.GUI +# #- CoolProp.Plots +# - CoolProp.tests # commands: # You can put test commands to be run here. Use this to test that the From da10040fcc9c48ab01681505c576cf2b40b3872b Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 13:28:29 +0200 Subject: [PATCH 11/14] Fixed communication tuple ordering --- wrappers/Python/generate_meta.yaml.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index c4036379..435977aa 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -166,7 +166,7 @@ f = codecs.open(os.path.join(target_dir,target),mode='wb',encoding='utf-8') f.write(bsh_template) f.close() -runner_template = """ +#runner_template = """ from __future__ import print_function import sys, shutil, subprocess, os, stat def run_command(cmd): @@ -202,7 +202,7 @@ if os.path.isdir(tar): shutil.rmtree(tar, onerror=remove_readonly) ver = sys.version_info cmd = ['conda','build','--python',str(ver[0])+'.'+str(ver[1])] print('Command is: '+' '.join(cmd)) -filename = os.path.abspath(run_command(' '.join(cmd+['--output','.']))[0]).decode("utf-8").strip() +filename = os.path.abspath(run_command(' '.join(cmd+['--output','.']))[0].decode("utf-8").strip()) tar = os.path.join(tar,'Python_conda',os.path.basename(os.path.dirname(filename))).strip() try: subprocess.check_call(' '.join(cmd+['.']), shell=True, stdout=sys.stdout, stderr=sys.stderr) From 6248947e571fbf4a6432dc0470a2410efc10f57d Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 13:28:47 +0200 Subject: [PATCH 12/14] Fixed communication tuple ordering --- wrappers/Python/generate_meta.yaml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index 435977aa..f1f3c7ea 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -166,7 +166,7 @@ f = codecs.open(os.path.join(target_dir,target),mode='wb',encoding='utf-8') f.write(bsh_template) f.close() -#runner_template = """ +runner_template = """ from __future__ import print_function import sys, shutil, subprocess, os, stat def run_command(cmd): From df87bedc7eca8c5d920777b9ff3f56d7328c6f50 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 13:36:37 +0200 Subject: [PATCH 13/14] This is the last time I play with these command line options! --- wrappers/Python/generate_meta.yaml.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index f1f3c7ea..ccc10934 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -187,9 +187,9 @@ def remove_readonly(func, path, _): cmd = ['conda','remove','--all','-yq','-n'] for t in ['_test','_build']: try: - subprocess.check_call(' '.join(cmd+[t]), stdout=sys.stdout, stderr=sys.stderr) + subprocess.check_call(cmd+[t], stdout=sys.stdout, stderr=sys.stderr) except: - envs = run_command(' '.join(['conda','env','list']))[0].decode("utf-8").splitlines() + envs = run_command(['conda','env','list'])[0].decode("utf-8").splitlines() for env in envs: lst = env.split(' ') if len(lst)>0 and lst[0] == t: @@ -202,10 +202,10 @@ if os.path.isdir(tar): shutil.rmtree(tar, onerror=remove_readonly) ver = sys.version_info cmd = ['conda','build','--python',str(ver[0])+'.'+str(ver[1])] print('Command is: '+' '.join(cmd)) -filename = os.path.abspath(run_command(' '.join(cmd+['--output','.']))[0].decode("utf-8").strip()) +filename = os.path.abspath(run_command(cmd+['--output','.'])[0].decode("utf-8").strip()) tar = os.path.join(tar,'Python_conda',os.path.basename(os.path.dirname(filename))).strip() try: - subprocess.check_call(' '.join(cmd+['.']), shell=True, stdout=sys.stdout, stderr=sys.stderr) + subprocess.check_call(cmd+['.'], shell=True, stdout=sys.stdout, stderr=sys.stderr) except Exception as e: print("conda build failed: "+str(e)) pass From e120697c13de8663cc99899c311f4e7e8edb638d Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 7 Jul 2015 18:12:56 +0200 Subject: [PATCH 14/14] Removed the subshell --- wrappers/Python/generate_meta.yaml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrappers/Python/generate_meta.yaml.py b/wrappers/Python/generate_meta.yaml.py index ccc10934..3e4fbfc0 100644 --- a/wrappers/Python/generate_meta.yaml.py +++ b/wrappers/Python/generate_meta.yaml.py @@ -205,7 +205,7 @@ print('Command is: '+' '.join(cmd)) filename = os.path.abspath(run_command(cmd+['--output','.'])[0].decode("utf-8").strip()) tar = os.path.join(tar,'Python_conda',os.path.basename(os.path.dirname(filename))).strip() try: - subprocess.check_call(cmd+['.'], shell=True, stdout=sys.stdout, stderr=sys.stderr) + subprocess.check_call(cmd+['.'], stdout=sys.stdout, stderr=sys.stderr) except Exception as e: print("conda build failed: "+str(e)) pass