diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index 99fea065..7f040614 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -109,8 +109,6 @@ def main(): project_setup_py = os.path.join(project_dir, 'setup.py') 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: if not os.path.exists(project_setup_py): print('cibuildwheel: Could not find setup.py at root of project', file=sys.stderr) @@ -121,14 +119,8 @@ def main(): file=sys.stderr) exit(err.returncode) - if package_name == '' or package_name == 'UNKNOWN': - print('cibuildwheel: Invalid package name "%s". Check your setup.py' % package_name, - file=sys.stderr) - exit(2) - build_options = dict( project_dir=project_dir, - package_name=package_name, output_dir=output_dir, test_command=test_command, test_requires=test_requires, diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index ee221443..c907c6b6 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -9,7 +9,7 @@ except ImportError: from pipes import quote as shlex_quote -def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, build_verbosity, build_selector, environment, manylinux1_images): +def build(project_dir, output_dir, test_command, test_requires, before_build, build_verbosity, build_selector, environment, manylinux1_images): try: subprocess.check_call(['docker', '--version']) except: @@ -102,7 +102,6 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be chown {uid}:{gid} "/output/$(basename "$delocated_wheel")" done '''.format( - package_name=package_name, pybin_paths=' '.join(c.path+'/bin' for c in platform_configs), test_requires=' '.join(test_requires), test_command=shlex_quote( diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 906da91a..ccdd3780 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -10,7 +10,7 @@ except ImportError: from .util import prepare_command, get_build_verbosity_extra_flags -def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, build_verbosity, build_selector, environment): +def build(project_dir, output_dir, test_command, test_requires, before_build, build_verbosity, build_selector, environment): PythonConfiguration = namedtuple('PythonConfiguration', ['version', 'identifier', 'url']) python_configurations = [ PythonConfiguration(version='2.7', identifier='cp27-macosx_10_6_intel', url='https://www.python.org/ftp/python/2.7.15/python-2.7.15-macosx10.6.pkg'), diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 51d428ce..f5a4ffb8 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -10,7 +10,7 @@ from glob import glob from .util import prepare_command, get_build_verbosity_extra_flags -def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, build_verbosity, build_selector, environment): +def build(project_dir, output_dir, test_command, test_requires, before_build, build_verbosity, build_selector, environment): # run_with_env is a cmd file that sets the right environment variables to run_with_env = os.path.join(tempfile.gettempdir(), 'appveyor_run_with_env.cmd') if not os.path.exists(run_with_env):