Merge origin/master into min-macosx-deployment-target

test/08_manylinuxXXXX_only/cibuildwheel_test.py

@@ -12,7 +12,7 @@ def test(manylinux_image):
 
     if utils.platform != 'linux':
         pytest.skip('the docker test is only relevant to the linux build')
-    elif platform.machine not in ['x86_64', 'i686']:
+    elif platform.machine() not in ['x86_64', 'i686']:
         if manylinux_image in ['manylinux1', 'manylinux2010']:
             pytest.skip("manylinux1 and 2010 doesn't exist for non-x86 architectures")
 

test/12_dependency_versions/cibuildwheel_test.py

@@ -0,0 +1,125 @@
+import os
+import re
+import pytest
+import textwrap
+import cibuildwheel.util
+
+import utils
+
+VERSION_REGEX = r'([\w-]+)==([^\s]+)'
+
+
+def get_versions_from_constraint_file(constraint_file):
+    with open(constraint_file, encoding='utf8') as f:
+        constraint_file_text = f.read()
+
+    versions = {}
+
+    for package, version in re.findall(VERSION_REGEX, constraint_file_text):
+        versions[package] = version
+
+    return versions
+
+
+@pytest.mark.parametrize('python_version', ['2.7', '3.5', '3.8'])
+def test_pinned_versions(python_version):
+    if utils.platform == 'linux':
+        pytest.skip('linux doesn\'t pin individual tool versions, it pins manylinux images instead')
+
+    project_dir = os.path.dirname(__file__)
+
+    build_environment = {}
+
+    if python_version == '2.7':
+        constraint_filename = 'constraints-python27.txt'
+        build_pattern = '[cp]p27-*'
+    elif python_version == '3.5':
+        constraint_filename = 'constraints-python35.txt'
+        build_pattern = '[cp]p35-*'
+    else:
+        constraint_filename = 'constraints.txt'
+        build_pattern = '[cp]p38-*'
+
+    constraint_file = os.path.join(cibuildwheel.util.resources_dir, constraint_filename)
+    constraint_versions = get_versions_from_constraint_file(constraint_file)
+
+    for package in ['pip', 'setuptools', 'wheel', 'virtualenv']:
+        env_name = 'EXPECTED_{}_VERSION'.format(package.upper())
+        build_environment[env_name] = constraint_versions[package]
+
+    cibw_environment_option = ' '.join(
+        ['{}={}'.format(k, v) for k, v in build_environment.items()]
+    )
+
+    # build and test the wheels
+    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
+        'CIBW_BUILD': build_pattern,
+        'CIBW_ENVIRONMENT': cibw_environment_option,
+    })
+
+    # also check that we got the right wheels
+    if python_version == '2.7':
+        expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
+                           if '-cp27' in w or '-pp27' in w]
+    elif python_version == '3.5':
+        expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
+                           if '-cp35' in w or '-pp35' in w]
+    elif python_version == '3.8':
+        expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
+                           if '-cp38' in w or '-pp38' in w]
+    else:
+        raise ValueError('unhandled python version')
+
+    assert set(actual_wheels) == set(expected_wheels)
+
+
+@pytest.mark.parametrize('python_version', ['2.7', '3.x'])
+def test_dependency_constraints_file(tmp_path, python_version):
+    if utils.platform == 'linux':
+        pytest.skip('linux doesn\'t pin individual tool versions, it pins manylinux images instead')
+
+    project_dir = os.path.dirname(__file__)
+
+    tool_versions = {
+        'pip': '20.0.2',
+        'setuptools': '44.0.0' if python_version == '2.7' else '46.0.0',
+        'wheel': '0.34.2',
+        'virtualenv': '20.0.10',
+    }
+
+    constraints_file = tmp_path / 'constraints.txt'
+    constraints_file.write_text(textwrap.dedent(
+        '''
+            pip=={pip}
+            setuptools=={setuptools}
+            wheel=={wheel}
+            virtualenv=={virtualenv}
+        '''.format(**tool_versions)
+    ))
+
+    build_environment = {}
+
+    for package_name, version in tool_versions.items():
+        env_name = 'EXPECTED_{}_VERSION'.format(package_name.upper())
+        build_environment[env_name] = version
+
+    cibw_environment_option = ' '.join(
+        ['{}={}'.format(k, v) for k, v in build_environment.items()]
+    )
+
+    # build and test the wheels
+    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
+        'CIBW_BUILD': '[cp]p27-*' if python_version == '2.7' else '[cp]p3?-*',
+        'CIBW_ENVIRONMENT': cibw_environment_option,
+        'CIBW_DEPENDENCY_VERSIONS': str(constraints_file),
+    })
+
+    # also check that we got the right wheels
+    if python_version == '2.7':
+        expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
+                           if '-cp27' in w or '-pp27' in w]
+    else:
+        expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
+                           if '-cp27' not in w and '-pp27' not in w]
+
+    assert set(actual_wheels) == set(expected_wheels)

test/12_dependency_versions/setup.py

@@ -0,0 +1,31 @@
+import os
+import subprocess
+from setuptools import (
+    Extension,
+    setup,
+)
+
+versions_output_text = subprocess.check_output(
+    ['pip', 'freeze', '--all', '-qq'],
+    universal_newlines=True,
+)
+versions = versions_output_text.strip().splitlines()
+
+# `versions` now looks like:
+# ['pip==x.x.x', 'setuptools==x.x.x', 'wheel==x.x.x']
+
+print('Gathered versions', versions)
+
+for package_name in ['pip', 'setuptools', 'wheel']:
+    env_name = 'EXPECTED_{}_VERSION'.format(package_name.upper())
+    expected_version = os.environ[env_name]
+
+    assert '{}=={}'.format(package_name, expected_version) in versions, (
+        'error: {} version should equal {}'.format(package_name, expected_version)
+    )
+
+setup(
+    name="spam",
+    ext_modules=[Extension('spam', sources=['spam.c'])],
+    version="0.1.0",
+)

test/12_dependency_versions/spam.c

@@ -0,0 +1,48 @@
+#include <Python.h>
+
+static PyObject *
+spam_system(PyObject *self, PyObject *args)
+{
+    const char *command;
+    int sts;
+
+    if (!PyArg_ParseTuple(args, "s", &command))
+        return NULL;
+    sts = system(command);
+    return PyLong_FromLong(sts);
+}
+
+/* Module initialization */
+
+#if PY_MAJOR_VERSION >= 3
+    #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
+    #define MOD_DEF(m, name, doc, methods, module_state_size) \
+        static struct PyModuleDef moduledef = { \
+            PyModuleDef_HEAD_INIT, name, doc, module_state_size, methods, }; \
+        m = PyModule_Create(&moduledef);
+    #define MOD_RETURN(m) return m;
+#else
+    #define MOD_INIT(name) PyMODINIT_FUNC init##name(void)
+    #define MOD_DEF(m, name, doc, methods, module_state_size) \
+        m = Py_InitModule3(name, methods, doc);
+    #define MOD_RETURN(m) return;
+#endif
+
+static PyMethodDef module_methods[] = {
+    {"system", (PyCFunction)spam_system, METH_VARARGS, 
+     "Execute a shell command."},
+    {NULL}  /* Sentinel */
+};
+
+MOD_INIT(spam)
+{
+    PyObject* m;
+
+    MOD_DEF(m, 
+            "spam", 
+            "Example module", 
+            module_methods,
+            -1)
+
+    MOD_RETURN(m)
+}