Merge pull request #91 from miloserdova-l/feature/win32-wheel

Windows 32bit wheel

Author: anastasiia-kornilova

.github/workflows/wheels.yml

@@ -91,11 +91,13 @@ jobs:
 
 
   build_wheel_windows:
-    name: Build wheel on Windows 64bit
+    name: Build wheel on Windows ${{ matrix.arch }}
     needs: build
     runs-on: windows-2019
     strategy:
       fail-fast: false
+      matrix:
+        arch: [x64, x86]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -107,29 +109,35 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.6
+          architecture: ${{ matrix.arch }}
 
       - name: Setup Python 3.7
         uses: actions/setup-python@v2
         with:
           python-version: 3.7
+          architecture: ${{ matrix.arch }}
 
       - name: Setup Python 3.8
         uses: actions/setup-python@v2
         with:
           python-version: 3.8
+          architecture: ${{ matrix.arch }}
 
       - name: Setup Python 3.9
         uses: actions/setup-python@v2
         with:
           python-version: 3.9
+          architecture: ${{ matrix.arch }}
 
       - name: Setup Python 3.10
         uses: actions/setup-python@v2
         with:
           python-version: '3.10'
+          architecture: ${{ matrix.arch }}
 
       - name: Build wheel
-        run: .\scripts\build-wheels-windows.cmd
+        run: .\scripts\build-wheels-windows.cmd ${{ matrix.arch }}
+
       - uses: actions/upload-artifact@v2
         with:
           path: .\dist
@@ -143,16 +151,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-latest, windows-latest, windows-2019]
         python: ['3.6', '3.7', '3.8', '3.9', '3.10']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Setup Python ${{ matrix.python }}
+        if: ${{ matrix.os != 'windows-2019' }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python }}
+
+      - name: Setup Python ${{ matrix.python }}
+        if: ${{ matrix.os == 'windows-2019' }}
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
+          architecture: x86
 
       - name: Download artifacts
         uses: actions/download-artifact@v2
@@ -172,10 +188,24 @@ jobs:
         run: |
           python -m pip install .\artifact\$(dir artifact -Name | findstr mrob-.*-win_amd64.whl) numpy pytest
 
-      - name: "Python unit tests"
+      - name: Install mrob & numpy on Windows 32bit
+        if: ${{ matrix.os == 'windows-2019' }}
+        run: |
+          python -m pip install .\artifact\$(dir artifact -Name | findstr mrob-.*-win32.whl) numpy
+
+      - name: Python unit tests
+        if: ${{ matrix.os != 'windows-2019' }}
         run: |
           python -m pytest mrobpy
 
+      - name: Python unit tests
+        if: ${{ matrix.os == 'windows-2019' }}
+        run: |
+          $files = Get-ChildItem -Path python_examples -Include *.py
+          foreach ($f in $files){
+            python $f.FullName || EXIT /B !ERRORLEVEL!
+          }
+
 
   publish_pypi:
     name: Publish macOS wheel to PyPI

scripts/build-wheels-windows.cmd

@@ -25,6 +25,17 @@
 
 SETLOCAL EnableDelayedExpansion
 
+If "%~1"=="x64" (
+    SET plat="x64" || EXIT /B !ERRORLEVEL!
+) else (
+    If "%~1"=="x86" (
+        SET plat="Win32" || EXIT /B !ERRORLEVEL!
+    ) else (
+        echo Illegal argument: the argument must be set to x64 or x86
+        EXIT /B 1
+    )
+) 
+
 :: Early check for build tools
 cmake --version || EXIT /B !ERRORLEVEL!
 
@@ -36,7 +47,7 @@ mkdir .\mrob || popd && EXIT /B !ERRORLEVEL!
 copy .\__init__.py .\mrob\__init__.py || popd && EXIT /B !ERRORLEVEL!
 
 
-for /D %%P in (C:\hostedtoolcache\windows\Python\3*) do CALL :build %%P\x64\python.exe || popd && EXIT /B !ERRORLEVEL!
+for /D %%P in (C:\hostedtoolcache\windows\Python\3*) do CALL :build %plat% %%P\%~1\python.exe || popd && EXIT /B !ERRORLEVEL!
 
 python -m pip install --user -q build || popd && EXIT /B !ERRORLEVEL!
 python -m build --wheel --outdir dist . || popd && EXIT /B !ERRORLEVEL!
@@ -45,6 +56,6 @@ popd
 EXIT /B 0
 
 :build
-cmake -S . -B build -G "Visual Studio 16 2019" -A "x64" -DPYTHON_EXECUTABLE:FILEPATH=%~1 -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=%cd%\mrob -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE=%cd%\mrob || EXIT /B !ERRORLEVEL!
+cmake -S . -B build -G "Visual Studio 16 2019" -A "%~1" -DPYTHON_EXECUTABLE:FILEPATH=%~2 -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=%cd%\mrob -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE=%cd%\mrob || EXIT /B !ERRORLEVEL!
 cmake --build build --config Release -j %NUMBER_OF_PROCESSORS% || EXIT /B !ERRORLEVEL!
 EXIT /B 0

setup.py

@@ -26,7 +26,7 @@
 
 try:
     from wheel.bdist_wheel import bdist_wheel as _bdist_wheel
-    import platform, os
+    import platform, os, ctypes
 
     class bdist_wheel(_bdist_wheel):
 
@@ -46,7 +46,10 @@ def get_tag(self):
                 version = os.getenv('MACOSX_DEPLOYMENT_TARGET').replace('.', '_')
                 plat = name + "_" + version + "_" + arch
             elif platform.system() == "Windows":
-                plat = "win_" + platform.machine().lower()
+                if ctypes.sizeof(ctypes.c_voidp) * 8 > 32:
+                    plat = "win_" + platform.machine().lower()
+                else:
+                    plat = "win32"
             return python, abi, plat
 
 except ImportError: