From e09405fd30582fb8022419cc24ca48e749473c3b 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 18:17:22 +0600
Subject: [PATCH] fix builds

---
 .github/actions/linux_armv7l/Dockerfile                |  2 +-
 .../Dockerfile                                         |  2 +-
 .../action.yml                                         |  4 ++--
 .../entrypoint.sh                                      |  0
 .../Dockerfile                                         |  2 +-
 .../action.yml                                         |  4 ++--
 .../entrypoint.sh                                      |  0
 .github/actions/prepare_snap7/action.yml               |  8 +++++++-
 .github/build_scripts/build_package.sh                 |  4 ++--
 .github/workflows/build-and-test-arm32v7.yml           |  2 +-
 .github/workflows/build-and-test-arm64.yml             |  6 +++---
 .github/workflows/build-and-test.yml                   | 10 +++++-----
 .github/workflows/linux.yml                            |  2 +-
 .github/workflows/osx.yml                              |  4 ++--
 pyproject.toml                                         |  2 +-
 15 files changed, 29 insertions(+), 23 deletions(-)
 rename .github/actions/{manylinux_2_24_aarch64 => manylinux_2_28_aarch64}/Dockerfile (66%)
 rename .github/actions/{manylinux_2_24_aarch64 => manylinux_2_28_aarch64}/action.yml (89%)
 rename .github/actions/{manylinux_2_24_aarch64 => manylinux_2_28_aarch64}/entrypoint.sh (100%)
 rename .github/actions/{manylinux_2_24_x86_64 => manylinux_2_28_x86_64}/Dockerfile (67%)
 rename .github/actions/{manylinux_2_24_x86_64 => manylinux_2_28_x86_64}/action.yml (89%)
 rename .github/actions/{manylinux_2_24_x86_64 => manylinux_2_28_x86_64}/entrypoint.sh (100%)

diff --git a/.github/actions/linux_armv7l/Dockerfile b/.github/actions/linux_armv7l/Dockerfile
index 6cb05aa7..432ceff3 100644
--- a/.github/actions/linux_armv7l/Dockerfile
+++ b/.github/actions/linux_armv7l/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/nikteliy/manylinux_2_24_armv7l:python3.7
+FROM ghcr.io/nikteliy/manylinux_2_24_armv7l:python3.8
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
diff --git a/.github/actions/manylinux_2_24_aarch64/Dockerfile b/.github/actions/manylinux_2_28_aarch64/Dockerfile
similarity index 66%
rename from .github/actions/manylinux_2_24_aarch64/Dockerfile
rename to .github/actions/manylinux_2_28_aarch64/Dockerfile
index 5c304e38..0a7245a5 100644
--- a/.github/actions/manylinux_2_24_aarch64/Dockerfile
+++ b/.github/actions/manylinux_2_28_aarch64/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/pypa/manylinux_2_24_aarch64:latest
+FROM quay.io/pypa/manylinux_2_28_aarch64:latest
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
diff --git a/.github/actions/manylinux_2_24_aarch64/action.yml b/.github/actions/manylinux_2_28_aarch64/action.yml
similarity index 89%
rename from .github/actions/manylinux_2_24_aarch64/action.yml
rename to .github/actions/manylinux_2_28_aarch64/action.yml
index 8235ee53..f37595fd 100644
--- a/.github/actions/manylinux_2_24_aarch64/action.yml
+++ b/.github/actions/manylinux_2_28_aarch64/action.yml
@@ -1,5 +1,5 @@
-name: 'manylinux_2_24_aarch64'
-description: 'Builds manylinux_2_24_aarch64 package'
+name: 'manylinux_2_28_aarch64'
+description: 'Builds manylinux_2_28_aarch64 package'
 inputs:
   script:
     description: 'Specifies the path to the build script'
diff --git a/.github/actions/manylinux_2_24_aarch64/entrypoint.sh b/.github/actions/manylinux_2_28_aarch64/entrypoint.sh
similarity index 100%
rename from .github/actions/manylinux_2_24_aarch64/entrypoint.sh
rename to .github/actions/manylinux_2_28_aarch64/entrypoint.sh
diff --git a/.github/actions/manylinux_2_24_x86_64/Dockerfile b/.github/actions/manylinux_2_28_x86_64/Dockerfile
similarity index 67%
rename from .github/actions/manylinux_2_24_x86_64/Dockerfile
rename to .github/actions/manylinux_2_28_x86_64/Dockerfile
index 1460d38e..29fa8881 100644
--- a/.github/actions/manylinux_2_24_x86_64/Dockerfile
+++ b/.github/actions/manylinux_2_28_x86_64/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/pypa/manylinux_2_24_x86_64:latest
+FROM quay.io/pypa/manylinux_2_28_x86_64:latest
 
 COPY  /entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
diff --git a/.github/actions/manylinux_2_24_x86_64/action.yml b/.github/actions/manylinux_2_28_x86_64/action.yml
similarity index 89%
rename from .github/actions/manylinux_2_24_x86_64/action.yml
rename to .github/actions/manylinux_2_28_x86_64/action.yml
index 72688a51..580191f4 100644
--- a/.github/actions/manylinux_2_24_x86_64/action.yml
+++ b/.github/actions/manylinux_2_28_x86_64/action.yml
@@ -1,5 +1,5 @@
-name: 'manylinux_2_24_x86_64'
-description: 'Builds manylinux_2_24_x86_64 package'
+name: 'manylinux_2_28_x86_64'
+description: 'Builds manylinux_2_28_x86_64 package'
 inputs:
   script:
     description: 'Specifies the path to the build script'
diff --git a/.github/actions/manylinux_2_24_x86_64/entrypoint.sh b/.github/actions/manylinux_2_28_x86_64/entrypoint.sh
similarity index 100%
rename from .github/actions/manylinux_2_24_x86_64/entrypoint.sh
rename to .github/actions/manylinux_2_28_x86_64/entrypoint.sh
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..094ff3da 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}
diff --git a/.github/workflows/build-and-test-arm32v7.yml b/.github/workflows/build-and-test-arm32v7.yml
index 5c91caa8..33e3bec1 100644
--- a/.github/workflows/build-and-test-arm32v7.yml
+++ b/.github/workflows/build-and-test-arm32v7.yml
@@ -61,7 +61,7 @@ jobs:
           docker run --platform linux/arm/v7 --rm --interactive -v $PWD/tests:/tests \
             -v $PWD/pyproject.toml:/pyproject.toml \
             -v $PWD/wheelhouse:/wheelhouse \
-            "arm32v7/python:${{ matrix.python-version }}-buster" /bin/bash -s <<EOF
+            "arm32v7/python:${{ matrix.python-version }}-bookworm" /bin/bash -s <<EOF
           python -m pip install pytest pytest-asyncio $(ls wheelhouse/*manylinux_2_24_armv7l.whl)
           python -m pytest tests/ -m "server or util or client or mainloop or partner"
           EOF
diff --git a/.github/workflows/build-and-test-arm64.yml b/.github/workflows/build-and-test-arm64.yml
index 0e70dcd8..e6c6a914 100644
--- a/.github/workflows/build-and-test-arm64.yml
+++ b/.github/workflows/build-and-test-arm64.yml
@@ -21,10 +21,10 @@ jobs:
           platforms: arm64
 
       - name: Build wheel
-        uses: ./.github/actions/manylinux_2_24_aarch64
+        uses: ./.github/actions/manylinux_2_28_aarch64
         with:
           script: ./.github/build_scripts/build_package.sh
-          platform: manylinux_2_24_aarch64
+          platform: manylinux_2_28_aarch64
           makefile: aarch64-linux-gnu.mk
           python: /opt/python/cp38-cp38/bin/python
 
@@ -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 }}-buster" /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 pytest-asyncio
           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 105ccf33..405099f6 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -16,10 +16,10 @@ jobs:
         uses: ./.github/actions/prepare_snap7
 
       - name: Build wheel
-        uses: ./.github/actions/manylinux_2_24_x86_64
+        uses: ./.github/actions/manylinux_2_28_x86_64
         with:
           script: ./.github/build_scripts/build_package.sh
-          platform: manylinux_2_24_x86_64
+          platform: manylinux_2_28_x86_64
           makefile: x86_64_linux.mk
           python: /opt/python/cp38-cp38/bin/python
           wheeldir: wheelhouse/${{ runner.os }}/
@@ -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 }}/
 
@@ -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 }}/
 
@@ -96,7 +96,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-11]
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
     steps:
       - name: Checkout
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 6899573b..2b993a6e 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -6,7 +6,7 @@ on:
     branches: [master]
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index c90ea260..4aa96bd2 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -13,9 +13,9 @@ jobs:
       - name: Install snap7
         run: brew install snap7
       - 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 801e3db2..e65bc245 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=68.0.0", "wheel"]
+requires = ["setuptools>=69.4.2", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]