Merge pull request #14 from tgarc/master

minor fixes including python3 fix
This commit is contained in:
Joe Rickerby
2017-07-05 09:36:39 +01:00
committed by GitHub
2 changed files with 9 additions and 2 deletions
+2 -1
View File
@@ -77,7 +77,8 @@ def main():
try:
project_setup_py = os.path.join(project_dir, 'setup.py')
name_output = subprocess.check_output([sys.executable, project_setup_py, '--name'])
name_output = subprocess.check_output([sys.executable, project_setup_py, '--name'],
universal_newlines=True)
# the last line of output is the name
package_name = name_output.strip().splitlines()[-1]
except subprocess.CalledProcessError as err:
+7 -1
View File
@@ -46,6 +46,8 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
for platform_tag, docker_image in platforms:
platform_configs = [c for c in python_configurations if c.identifier.endswith(platform_tag)]
if not platform_configs:
continue
bash_script = '''
set -o errexit
@@ -113,7 +115,11 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
'/bin/bash'],
stdin=subprocess.PIPE, universal_newlines=True)
docker_process.communicate(bash_script)
try:
docker_process.communicate(bash_script)
except KeyboardInterrupt:
docker_process.kill()
docker_process.wait()
if docker_process.returncode != 0:
exit(1)