#273 (#321)

* add universal2 build; add python3.10 to job matrix; update classifiers in setup.py

* update cibuildwheel version; format yaml;

* fix test

Author: nikteliy

.github/build_scripts/arm64_osx.mk

@@ -0,0 +1,10 @@
+TargetCPU  :=arm64
+OS         :=osx
+CXXFLAGS   := -O3 -fPIC -pedantic -target arm64-apple-darwin
+
+# Standard part
+
+include common.mk
+
+# Override the variable to add a target flag
+SharedObjectLinkerName :=g++ -shared -fPIC --target=arm64-apple-darwin

.github/workflows/build-and-test-arm64.yml

@@ -1,4 +1,4 @@
-name: build-and-test-wheels
+name: build-and-test-wheels-arm64
 on:
   push:
     branches: [master]
@@ -25,6 +25,7 @@ jobs:
         if: steps.snap7-archive.outputs.cache-hit != 'true'
         run: |
           wget -O snap7-full-1.4.2.7z --content-disposition -c ${{ env.snap7-archive-url }}
+
       - name: Extract archive
         run: 7z x snap7-full-1.4.2.7z
 
@@ -41,7 +42,7 @@ jobs:
           platforms: arm64
 
       - name: Build wheels
-        uses: joerick/cibuildwheel@v1.11.0
+        uses: pypa/cibuildwheel@v2.1.3
         with:
           output-dir: wheelhouse
         env:
@@ -56,29 +57,34 @@ jobs:
       - name: Repack wheel
         run: bash .github/build_scripts/repack_wheel.sh wheelhouse dist wheelhouse/${{ runner.os }}
 
-      - name: upload artifacts
+      - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: wheelhouse/*/*.whl
+
   test-wheel:
-    name: testing wheel
+    name: Testing wheel
     needs: arm64-build
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
         with:
           name: wheels
           path: wheelhouse
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
         with:
           platforms: arm64
+
       - name: Run tests in docker:arm64v8
         run: |
           docker run --rm --interactive -v $PWD/test:/test -v $PWD/wheelhouse:/wheelhouse "arm64v8/python:${{ matrix.python-version }}-buster" /bin/bash -s <<EOF 

.github/workflows/build-and-test.yml

@@ -41,7 +41,8 @@ jobs:
       - name: Repack wheel
         run: .github/build_scripts/repack_wheel_windows.ps1 Win64 wheelhouse/${{ runner.os }}
 
-      - uses: actions/upload-artifact@v2
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: wheelhouse/*/*.whl
@@ -72,11 +73,12 @@ jobs:
           mkdir src
           cp snap7-full-1.4.2/release/Wrappers/c-cpp/snap7.h src
           cp .github/build_scripts/dummy.c ./
+
       - name: Build pure python wheel
         run: python3 setup.py bdist_wheel --plat-name=manylinux1_x86_64
 
       - name: Build platform wheel
-        uses: joerick/cibuildwheel@v1.11.0
+        uses: pypa/cibuildwheel@v2.1.3
         with:
           output-dir: wheelhouse
         env:
@@ -88,15 +90,15 @@ jobs:
       - name: Repack wheel
         run: bash .github/build_scripts/repack_wheel.sh wheelhouse dist wheelhouse/${{ runner.os }}
 
-      - name: upload artifacts
+      - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: wheelhouse/*/*.whl
 
   osx-build:
     name: Build wheel for osx
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -121,43 +123,46 @@ jobs:
           mkdir src
           cp snap7-full-1.4.2/release/Wrappers/c-cpp/snap7.h src
           cp .github/build_scripts/dummy.c ./
+          cp .github/build_scripts/arm64_osx.mk snap7-full-1.4.2/build/osx/
           pushd snap7-full-1.4.2/build/osx/
           make -f x86_64_osx.mk all
-          cp ../bin/x86_64-osx/libsnap7.dylib  /usr/local/lib
+          make -f arm64_osx.mk all
+          lipo -create -output /usr/local/lib/libsnap7.dylib ../bin/x86_64-osx/libsnap7.dylib ../bin/arm64-osx/libsnap7.dylib
           install_name_tool -id /usr/local/lib/libsnap7.dylib /usr/local/lib/libsnap7.dylib
 
       - name: Install cibuildwheel
-        run: python3 -m pip install cibuildwheel==1.10.0 wheel --upgrade
+        run: python3 -m pip install cibuildwheel wheel --upgrade
 
       - name: Build pure python wheel
-        run: python3 setup.py bdist_wheel --plat-name=macosx_10_9_x86_64
+        run: python3 setup.py bdist_wheel --plat-name=macosx_10_9_universal2
 
       - name: Build platform wheel
-        uses: joerick/cibuildwheel@v1.11.0
+        uses: pypa/cibuildwheel@v2.1.3
         with:
           output-dir: wheelhouse
         env:
-          CIBW_BUILD: cp36-macosx_x86_64
+          CIBW_BUILD: cp38-macosx_universal2
+          CIBW_ARCHS_MACOS: universal2
           CIBW_BUILD_VERBOSITY: 1
           CIBW_ENVIRONMENT: "BUILD_WHEEL_WITH_EXTENSION=1"
 
       - name: Repack wheel
         run: bash .github/build_scripts/repack_wheel.sh wheelhouse dist wheelhouse/${{ runner.os }}
 
-      - name: upload artifacts
+      - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: wheelhouse/*/*.whl
 
   test-wheels:
-    name: testing wheels
+    name: Testing wheels
     needs: [windows-build, linux-build, osx-build]
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -172,12 +177,13 @@ jobs:
           python3 -m pip install --upgrade pip
           python3 -m pip install pytest
 
-      - uses: actions/download-artifact@v2
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
         with:
           name: wheels
           path: wheelhouse
 
-      - name: install python-snap7
+      - name: Install python-snap7
         run: python3 -m pip install $(ls wheelhouse/${{ runner.os }}/*.whl)
 
       - name: Run pytest

.github/workflows/linux.yml

@@ -1,15 +1,15 @@
 name: Linux Test all Pythons
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/test-pypi-packages.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

setup.py

@@ -49,6 +49,8 @@ def read(fname):
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",        
     ],
     python_requires='>=3.6',
     extras_require=extras_require,

test/test_client.py

@@ -599,6 +599,8 @@ def test_wait_as_completion_timeouted(self, timeout=0, tries=500):
             except Snap7Exception as s7_err:
                 if not s7_err.args[0] == b'CLI : Job Timeout':
                     self.fail(f"While waiting another error appeared: {s7_err}")
+                # Wait for a thread to finish
+                time.sleep(0.1)
                 return
             except BaseException:
                 self.fail(f"While waiting another error appeared:>>>>>>>> {res2}")