Bump version: v1.4.1

* add linux32 to i686 builds

* Add test. Fix bug with space.

* Apply suggestions from code review

apply suggestions

Co-authored-by: Joe Rickerby <joerick@mac.com>

* change uname to platform.machine

Co-authored-by: Joe Rickerby <joerick@mac.com>

README.md

@@ -77,7 +77,7 @@ env:
     # Note: TWINE_PASSWORD is set to a PyPI API token in Travis settings
 
 install:
-  - python3 -m pip install cibuildwheel==1.4.0
+  - python3 -m pip install cibuildwheel==1.4.1
 
 script:
   # build the wheels, put them into './wheelhouse'
@@ -143,6 +143,14 @@ This is similar to static linking, so it might have some licence implications. C
 Changelog
 =========
 
+### 1.4.1
+
+_4 May 2020_
+
+- 🐛 Fix a bug causing programs running inside the i686 manylinux images to
+  think they were running x86_64 and target the wrong architecture. (#336,
+  #338)
+
 ### 1.4.0
 
 _2 May 2020_

cibuildwheel/__init__.py

@@ -1 +1 @@
-__version__ = '1.4.0'
+__version__ = '1.4.1'

cibuildwheel/linux.py

@@ -109,6 +109,7 @@ def build(options: BuildOptions):
         container_name = 'cibuildwheel-{}'.format(uuid.uuid4())
 
         try:
+            shell_cmd = ['linux32', '/bin/bash'] if platform_tag.endswith("i686") else ['/bin/bash']
             call(['docker', 'create',
                   '--env', 'CIBUILDWHEEL',
                   '--name', container_name,
@@ -136,7 +137,7 @@ def build(options: BuildOptions):
                         )
 
                 call(
-                    ['docker', 'exec', '-i', container_name, '/bin/bash'],
+                    ['docker', 'exec', '-i', container_name] + shell_cmd,
                     universal_newlines=True,
                     input='''
                         # give xtrace output an extra level of indent inside docker

examples/appveyor-minimal.yml

@@ -12,7 +12,7 @@ stack: python 3.7
 init:
 - cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH%
 
-install: python -m pip install cibuildwheel==1.4.0
+install: python -m pip install cibuildwheel==1.4.1
 
 build_script: python -m cibuildwheel --output-dir wheelhouse
 

examples/azure-pipelines-minimal.yml

@@ -5,7 +5,7 @@ jobs:
     - task: UsePythonVersion@0
     - bash: |
         python3 -m pip install --upgrade pip
-        pip3 install cibuildwheel==1.4.0
+        pip3 install cibuildwheel==1.4.1
         cibuildwheel --output-dir wheelhouse .
     - task: PublishBuildArtifacts@1
       inputs: {pathtoPublish: 'wheelhouse'}
@@ -16,7 +16,7 @@ jobs:
     - task: UsePythonVersion@0
     - bash: |
         python3 -m pip install --upgrade pip
-        pip3 install cibuildwheel==1.4.0
+        pip3 install cibuildwheel==1.4.1
         cibuildwheel --output-dir wheelhouse .
     - task: PublishBuildArtifacts@1
       inputs: {pathtoPublish: 'wheelhouse'}
@@ -29,7 +29,7 @@ jobs:
       displayName: Install Visual C++ for Python 2.7
     - bash: |
         python -m pip install --upgrade pip
-        pip install cibuildwheel==1.4.0
+        pip install cibuildwheel==1.4.1
         cibuildwheel --output-dir wheelhouse .
     - task: PublishBuildArtifacts@1
       inputs: {pathtoPublish: 'wheelhouse'}

examples/circleci-minimal.yml

@@ -11,7 +11,7 @@ jobs:
       - run:
           name: Build the Linux wheels.
           command: |
-            pip3 install --user cibuildwheel==1.4.0
+            pip3 install --user cibuildwheel==1.4.1
             cibuildwheel --output-dir wheelhouse
       - store_artifacts:
           path: wheelhouse/
@@ -25,7 +25,7 @@ jobs:
       - run:
           name: Build the OS X wheels.
           command: |
-            pip3 install --user cibuildwheel==1.4.0
+            pip3 install --user cibuildwheel==1.4.1
             cibuildwheel --output-dir wheelhouse
       - store_artifacts:
           path: wheelhouse/

examples/github-minimal.yml

@@ -20,7 +20,7 @@ jobs:
 
     - name: Install cibuildwheel
       run: |
-        python -m pip install cibuildwheel==1.4.0
+        python -m pip install cibuildwheel==1.4.1
 
     - name: Install Visual C++ for Python 2.7
       if: startsWith(matrix.os, 'windows')

examples/travis-ci-deploy-only.yml

@@ -25,7 +25,7 @@ env:
     # Note: TWINE_PASSWORD is set to a PyPI API token in Travis settings
 
 install:
-  - python3 -m pip install cibuildwheel==1.4.0
+  - python3 -m pip install cibuildwheel==1.4.1
 
 script:
   # build the wheels, put them into './wheelhouse'

examples/travis-ci-minimal.yml

@@ -26,7 +26,7 @@ jobs:
         - ln -s /c/Python38/python.exe /c/Python38/python3.exe
 
 install:
-  - python3 -m pip install cibuildwheel==1.4.0
+  - python3 -m pip install cibuildwheel==1.4.1
 
 script:
   # build the wheels, put them into './wheelhouse'

examples/travis-ci-test-and-deploy.yml

@@ -56,7 +56,7 @@ jobs:
     - stage: deploy
       name: Build and deploy Linux wheels
       services: docker
-      install: python3 -m pip install cibuildwheel==1.4.0
+      install: python3 -m pip install cibuildwheel==1.4.1
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: |
         python3 -m pip install twine
@@ -66,7 +66,7 @@ jobs:
       name: Build and deploy macOS wheels
       os: osx
       language: shell
-      install: python3 -m pip install cibuildwheel==1.4.0
+      install: python3 -m pip install cibuildwheel==1.4.1
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: |
         python3 -m pip install twine
@@ -76,7 +76,7 @@ jobs:
       name: Build and deploy Windows wheels
       os: windows
       language: shell
-      install: python3 -m pip install cibuildwheel==1.4.0
+      install: python3 -m pip install cibuildwheel==1.4.1
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: |
         python3 -m pip install twine

mkdocs.yml

@@ -28,6 +28,8 @@ markdown_extensions:
       permalink: True
   - attr_list
   - admonition
+  - pymdownx.magiclink:
+      repo_url_shortener: True
 
 plugins:
   - importmarkdown

requirements-dev.txt

@@ -2,6 +2,7 @@
 -e ./docs/mkdocs_include_markdown_plugin
 pytest
 mkdocs==1.0.4
+pymdown-extensions
 pip-tools
 requests
 click

setup.py

@@ -13,7 +13,7 @@ with io.open(os.path.join(this_directory, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name='cibuildwheel',
-    version='1.4.0',
+    version='1.4.1',
     install_requires=['bashlex!=0.13'],
     description="Build Python wheels on CI with minimal configuration.",
     long_description=long_description,

test/02_test/test/spam_test.py

@@ -1,6 +1,8 @@
 from __future__ import print_function
 import os
+import platform
 import sys
+import struct
 from unittest import TestCase
 
 import spam
@@ -43,3 +45,12 @@ class TestSpam(TestCase):
             print("=[listdir]2", os.listdir(os.path.join(virtualenv_path, 'bin')))
         self.assertTrue(path_contains(virtualenv_path, sys.executable))
         self.assertTrue(path_contains(virtualenv_path, spam.__file__))
+
+    def test_uname(self):
+        if platform.system() == "Windows":
+            return
+        # if we're running in 32-bit Python, check that the machine is i686.
+        # See #336 for more info.
+        bits = struct.calcsize("P") * 8
+        if bits == 32:
+            self.assertEqual(platform.machine(), "i686")