From b9401a9bf10d782a6b5b7543260e0a7488bb8e61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B5=D0=BD=D0=B8=D1=81=20=D0=9F=D0=B5=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2?= <dn.petrov@ideco.ru>
Date: Wed, 1 May 2024 20:46:19 +0600
Subject: [PATCH] fix builds

---
 .github/actions/prepare_snap7/action.yml   | 8 +++++++-
 .github/build_scripts/build_package.sh     | 6 +++---
 .github/workflows/build-and-test-arm64.yml | 2 +-
 .github/workflows/build-and-test.yml       | 6 +++---
 .github/workflows/osx.yml                  | 4 ++--
 pyproject.toml                             | 1 +
 snap7/common.py                            | 4 ++--
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.github/actions/prepare_snap7/action.yml b/.github/actions/prepare_snap7/action.yml
index 2669003c..d2757f52 100644
--- a/.github/actions/prepare_snap7/action.yml
+++ b/.github/actions/prepare_snap7/action.yml
@@ -31,4 +31,10 @@ runs:
 
       - name: Update wheel
         shell: bash
-        run: python3 -m pip install --upgrade pip wheel build
+        if: ${{ runner.os != 'macOS' }}
+        run: python3 -m pip install --upgrade pip wheel build setuptools
+
+      - name: Update wheel
+        shell: bash
+        if: ${{ runner.os == 'macOS' }}
+        run: python3 -m pip install --upgrade pip wheel build setuptools --break-system-packages
diff --git a/.github/build_scripts/build_package.sh b/.github/build_scripts/build_package.sh
index 40599006..05b19745 100755
--- a/.github/build_scripts/build_package.sh
+++ b/.github/build_scripts/build_package.sh
@@ -6,7 +6,7 @@ make -f "${INPUT_MAKEFILE}" install
 popd
 mkdir -p snap7/lib/
 cp /usr/lib/libsnap7.so snap7/lib/
-${INPUT_PYTHON} -m pip install wheel build auditwheel patchelf
-${INPUT_PYTHON} -m build . --wheel -C="--build-option=--plat-name=${INPUT_PLATFORM}"
+${INPUT_PYTHON} -m pip install --upgrade pip wheel build auditwheel patchelf setuptools
+${INPUT_PYTHON} -m build . --wheel -C="--plat-name=${INPUT_PLATFORM}"
 
-auditwheel repair dist/*${INPUT_PLATFORM}.whl --plat ${INPUT_PLATFORM} -w ${INPUT_WHEELDIR}
+auditwheel repair dist/*.whl --plat ${INPUT_PLATFORM} -w ${INPUT_WHEELDIR}
diff --git a/.github/workflows/build-and-test-arm64.yml b/.github/workflows/build-and-test-arm64.yml
index 637f66b4..9522062f 100644
--- a/.github/workflows/build-and-test-arm64.yml
+++ b/.github/workflows/build-and-test-arm64.yml
@@ -61,7 +61,7 @@ jobs:
           docker run --rm --interactive -v $PWD/tests:/tests \
             -v $PWD/pyproject.toml:/pyproject.toml \
             -v $PWD/wheelhouse:/wheelhouse \
-            "arm64v8/python:${{ matrix.python-version }}-bullseye" /bin/bash -s <<EOF
+            "arm64v8/python:${{ matrix.python-version }}-bookworm" /bin/bash -s <<EOF
           python3 -m pip install $(ls wheelhouse/*_aarch64.whl)
           python3 -m pip install pytest
           python -m pytest tests/ -m "server or util or client or mainloop or partner"
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 0260be3f..e4212115 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -44,7 +44,7 @@ jobs:
         run: |
           mkdir -p snap7/lib/
           Copy-Item .\snap7-full-1.4.2\release\Windows\Win64\snap7.dll .\snap7\lib
-          python3 -m build . --wheel -C="--build-option=--plat-name=win_amd64"
+          python3 -m build . --wheel -C="--plat-name=win_amd64"
           mkdir -p wheelhouse/${{ runner.os }}/
           cp dist/*.whl wheelhouse/${{ runner.os }}/
 
@@ -56,7 +56,7 @@ jobs:
 
   osx-build:
     name: Build wheel for osx
-    runs-on: macos-14
+    runs-on: macos-11
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -78,7 +78,7 @@ jobs:
 
       - name: Build wheel
         run: |
-          python3 -m build . --wheel -C="--build-option=--plat-name=macosx_10_9_universal2"
+          python3 -m build . --wheel -C="--plat-name=macosx_10_9_universal2"
           mkdir -p wheelhouse/${{ runner.os }}/
           cp dist/*.whl wheelhouse/${{ runner.os }}/
 
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index fa06735e..c757329b 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -15,9 +15,9 @@ jobs:
       - name: make a virtualenv
         run: python3 -m venv venv && source venv/bin/activate
       - name: Upgrade pip
-        run: python3 -m pip install --upgrade pip
+        run: python3 -m pip install --upgrade pip setuptools --break-system-packages
       - name: Install python-snap7
-        run: python3 -m pip install .[test]
+        run: python3 -m pip install -e .[test] --break-system-packages
       - name: Run pytest
         run: |
           pytest -m "server or util or client or mainloop"
diff --git a/pyproject.toml b/pyproject.toml
index 93d5b899..25cdf8bf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,6 +41,7 @@ snap7 = ["py.typed", "lib/libsnap7.so", "lib/snap7.dll", "lib/libsnap7.dylib"]
 [tool.setuptools.packages.find]
 where = ["."]
 include = ["snap7"]
+include_package_data = true
 
 [project.scripts]
 snap7-server = "snap7.server.__main__:main"
diff --git a/snap7/common.py b/snap7/common.py
index fc0f631d..e3308129 100644
--- a/snap7/common.py
+++ b/snap7/common.py
@@ -52,7 +52,7 @@ def __init__(self, lib_location: Optional[str] = None):
         )
         if not self.lib_location:
             error = f"""can't find snap7 shared library.
-            
+
 This probably means you are installing python-snap7 from source. When no binary wheel is found for you architecture, pip
 install falls back on a source install. For this to work, you need to manually install the snap7 library, which python-snap7
 uses under the hood.
@@ -60,7 +60,7 @@ def __init__(self, lib_location: Optional[str] = None):
 The shortest path to success is to try to get a binary wheel working. Probably you are running on an unsupported
 platform or python version. You are running:
 
-machine: {platform.machine()} 
+machine: {platform.machine()}
 system: {platform.system()}
 python version: {platform.python_version()}
 """