restructure testing, update osx

.github/workflows/docker.yml

@@ -9,7 +9,7 @@ env:
   IMAGE_NAME: python-snap7
 jobs:
   build-and-push-container-image:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     permissions:
       packages: write
       contents: read

.github/workflows/linux-build-test-amd64.yml

@@ -0,0 +1,68 @@
+name: Build and test wheels AMD64
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+jobs:
+  linux-build-amd64:
+    name: Build wheel for linux AMD64
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Prepare snap7 archive
+        uses: ./.github/actions/prepare_snap7
+
+      - name: Build wheel
+        uses: ./.github/actions/manylinux_2_28_x86_64
+        with:
+          script: ./.github/build_scripts/build_package.sh
+          platform: manylinux_2_28_x86_64
+          makefile: x86_64_linux.mk
+          python: /opt/python/cp38-cp38/bin/python
+          wheeldir: wheelhouse/${{ runner.os }}/
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-${{ runner.os }}
+          path: wheelhouse/${{ runner.os }}/*.whl
+
+
+
+  linux-test-amd64:
+    name: Testing wheels for linux/amd64
+    needs: linux-build-amd64
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: ["ubuntu-24.04", "ubuntu-22.04", "ubuntu-20.04"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: wheels-${{ runner.os }}
+          path: wheelhouse
+
+      - name: Install python-snap7
+        run: |
+            python3 -m venv venv
+            venv/bin/pip install --upgrade pip
+            venv/bin/pip install pytest
+            venv/bin/pip install wheelhouse/*.whl
+
+      - name: Run tests
+        run: |
+            venv/bin/pytest -m "server or util or client or mainloop"
+            sudo venv/bin/pytest -m partner

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

@@ -34,7 +34,7 @@ jobs:
           name: wheels
           path: wheelhouse/*.whl
 
-  test-wheels-arm64:
+  linux-test-arm64:
     name: Testing wheel for arm64
     needs: linux-build-arm64
     runs-on: ubuntu-20.04

.github/workflows/linux-test-with-deb.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12"]
-        runs-on: ["ubuntu-20.04", "ubuntu-22.04"]
+        runs-on: ["ubuntu-20.04", "ubuntu-22.04", "ubuntu-24.04"]
     runs-on: ${{ matrix.runs-on }}
     steps:
       - name: Checkout

.github/workflows/osx-build-test-amd64.yml

@@ -0,0 +1,78 @@
+name: Build and test wheels AMD64
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+jobs:
+
+
+  osx-build:
+    name: Build wheel for OSX
+    runs-on: macos-12
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Prepare snap7 archive
+        uses: ./.github/actions/prepare_snap7
+
+      - name: Prepare files
+        run: |
+          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
+          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
+          popd
+          mkdir -p snap7/lib/
+          cp /usr/local/lib/libsnap7.dylib snap7/lib/
+
+      - name: Build wheel
+        run: |
+          python3 -m build . --wheel -C="--build-option=--plat-name=macosx_10_9_universal2"
+          mkdir -p wheelhouse/${{ runner.os }}/
+          cp dist/*.whl wheelhouse/${{ runner.os }}/
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-${{ runner.os }}
+          path: wheelhouse/${{ runner.os }}/*.whl
+
+
+  osx-test:
+    name: Testing wheels for OSX
+    needs: osx-build
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-14, macos-12]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: wheels-${{ runner.os }}
+          path: wheelhouse
+
+      - name: Install python-snap7
+        run: |
+            python3 -m venv venv
+            venv/bin/pip install --upgrade pip
+            venv/bin/pip install pytest
+            venv/bin/pip install wheelhouse/*.whl
+
+      - name: Run tests
+        run: |
+            venv/bin/pytest -m "server or util or client or mainloop"
+            sudo venv/bin/pytest -m partner

.github/workflows/osx-test-with-brew.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         python-version: [ "3.9", "3.10", "3.11", "3.12" ]
-        runs-on: [ "macos-14", "macos-11" ]
+        runs-on: [ "macos-14", "macos-12" ]
     runs-on: ${{ matrix.runs-on }}
     steps:
       - name: Checkout

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

@@ -5,7 +5,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, ubuntu-20.04, macos-14, macos-11, windows-2022, windows-2019]
+        os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, macos-14, macos-12, windows-2022, windows-2019]
         python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
       - name: Checkout