Merge pull request #14 from tgarc/master
minor fixes including python3 fix
This commit is contained in:
@@ -77,7 +77,8 @@ def main():
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
project_setup_py = os.path.join(project_dir, 'setup.py')
|
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
|
# the last line of output is the name
|
||||||
package_name = name_output.strip().splitlines()[-1]
|
package_name = name_output.strip().splitlines()[-1]
|
||||||
except subprocess.CalledProcessError as err:
|
except subprocess.CalledProcessError as err:
|
||||||
|
|||||||
@@ -46,6 +46,8 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
|
|||||||
|
|
||||||
for platform_tag, docker_image in platforms:
|
for platform_tag, docker_image in platforms:
|
||||||
platform_configs = [c for c in python_configurations if c.identifier.endswith(platform_tag)]
|
platform_configs = [c for c in python_configurations if c.identifier.endswith(platform_tag)]
|
||||||
|
if not platform_configs:
|
||||||
|
continue
|
||||||
|
|
||||||
bash_script = '''
|
bash_script = '''
|
||||||
set -o errexit
|
set -o errexit
|
||||||
@@ -113,7 +115,11 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
|
|||||||
'/bin/bash'],
|
'/bin/bash'],
|
||||||
stdin=subprocess.PIPE, universal_newlines=True)
|
stdin=subprocess.PIPE, universal_newlines=True)
|
||||||
|
|
||||||
|
try:
|
||||||
docker_process.communicate(bash_script)
|
docker_process.communicate(bash_script)
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
docker_process.kill()
|
||||||
|
docker_process.wait()
|
||||||
|
|
||||||
if docker_process.returncode != 0:
|
if docker_process.returncode != 0:
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|||||||
Reference in New Issue
Block a user