From 7ebe8fef556405e5e53ace8f3bdce92e6a72d300 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sat, 11 Apr 2020 09:39:25 +0100 Subject: [PATCH] Fix tests on windows - shebang don't work so great there! --- test/13_subdir_package/bin/before_build.py | 1 + test/13_subdir_package/bin/before_build.sh | 3 --- test/13_subdir_package/cibuildwheel_test.py | 2 +- test/13_subdir_package/src/spam/test/run_tests.py | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) create mode 100755 test/13_subdir_package/bin/before_build.py delete mode 100755 test/13_subdir_package/bin/before_build.sh diff --git a/test/13_subdir_package/bin/before_build.py b/test/13_subdir_package/bin/before_build.py new file mode 100755 index 00000000..3bc8ab16 --- /dev/null +++ b/test/13_subdir_package/bin/before_build.py @@ -0,0 +1 @@ +print('before_build.py executed!') diff --git a/test/13_subdir_package/bin/before_build.sh b/test/13_subdir_package/bin/before_build.sh deleted file mode 100755 index 3f77a8c5..00000000 --- a/test/13_subdir_package/bin/before_build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo 'before_build.sh executed.' diff --git a/test/13_subdir_package/cibuildwheel_test.py b/test/13_subdir_package/cibuildwheel_test.py index 0bfbe13b..3490247f 100644 --- a/test/13_subdir_package/cibuildwheel_test.py +++ b/test/13_subdir_package/cibuildwheel_test.py @@ -8,7 +8,7 @@ def test(): package_dir = os.path.join(project_dir, 'src', 'spam') # build the wheels actual_wheels = utils.cibuildwheel_run(project_dir, package_dir=package_dir, add_env={ - 'CIBW_BEFORE_BUILD': '{project}/bin/before_build.sh', + 'CIBW_BEFORE_BUILD': 'python {project}/bin/before_build.py', 'CIBW_TEST_COMMAND': 'python {package}/test/run_tests.py', # this shouldn't depend on the version of python, so build only # CPython 3.6 diff --git a/test/13_subdir_package/src/spam/test/run_tests.py b/test/13_subdir_package/src/spam/test/run_tests.py index abaa183d..8104e1b3 100644 --- a/test/13_subdir_package/src/spam/test/run_tests.py +++ b/test/13_subdir_package/src/spam/test/run_tests.py @@ -1 +1 @@ -print('run_tests.py called!') +print('run_tests.py executed!')