Skip to content

Commit d51b193

Browse files
authored
Prepare for 1.4 (gijzelaerr#477)
* cleanup and restructure * enable python 3.12 * fix typing * update most EOL deps * all failing checks hopefully pass now * update precommit hook versions * fixing some problems * fix ruff error * again fix all problems
1 parent 7fb4bcb commit d51b193

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3054
-3214
lines changed

.github/actions/linux_armv7l/Dockerfile

-6
This file was deleted.

.github/actions/manylinux_2_24_aarch64/action.yml

-28
This file was deleted.

.github/actions/manylinux_2_24_x86_64/entrypoint.sh

-7
This file was deleted.

.github/actions/manylinux_2_24_aarch64/Dockerfile .github/actions/manylinux_2_28_aarch64/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/pypa/manylinux_2_24_aarch64:latest
1+
FROM quay.io/pypa/manylinux_2_28_aarch64:latest
22

33
COPY entrypoint.sh /entrypoint.sh
44
RUN chmod +x /entrypoint.sh

.github/actions/linux_armv7l/action.yml .github/actions/manylinux_2_28_aarch64/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: 'linux_armv7l'
2-
description: 'Builds linux_armv7l package'
1+
name: 'manylinux_2_28_aarch64'
2+
description: 'Builds manylinux_2_28_aarch64 package'
33
inputs:
44
script:
55
description: 'Specifies the path to the build script'

.github/actions/manylinux_2_24_x86_64/Dockerfile .github/actions/manylinux_2_28_x86_64/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/pypa/manylinux_2_24_x86_64:latest
1+
FROM quay.io/pypa/manylinux_2_28_x86_64:latest
22

33
COPY /entrypoint.sh /entrypoint.sh
44
RUN chmod +x /entrypoint.sh

.github/actions/manylinux_2_24_x86_64/action.yml .github/actions/manylinux_2_28_x86_64/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: 'manylinux_2_24_x86_64'
2-
description: 'Builds manylinux_2_24_x86_64 package'
1+
name: 'manylinux_2_28_x86_64'
2+
description: 'Builds manylinux_2_28_x86_64 package'
33
inputs:
44
script:
55
description: 'Specifies the path to the build script'

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

-67
This file was deleted.

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -7,52 +7,52 @@ on:
77
jobs:
88
linux-build-aarch64:
99
name: Build wheel for linux arm64
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-20.04
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414

1515
- name: Prepare snap7 archive
1616
uses: ./.github/actions/prepare_snap7
1717

1818
- name: Set up QEMU
19-
uses: docker/setup-qemu-action@v2
19+
uses: docker/setup-qemu-action@v3
2020
with:
2121
platforms: arm64
2222

2323
- name: Build wheel
24-
uses: ./.github/actions/manylinux_2_24_aarch64
24+
uses: ./.github/actions/manylinux_2_28_aarch64
2525
with:
2626
script: ./.github/build_scripts/build_package.sh
27-
platform: manylinux_2_24_aarch64
27+
platform: manylinux_2_28_aarch64
2828
makefile: aarch64-linux-gnu.mk
2929
python: /opt/python/cp38-cp38/bin/python
3030

3131
- name: Upload artifacts
32-
uses: actions/upload-artifact@v3
32+
uses: actions/upload-artifact@v4
3333
with:
3434
name: wheels
3535
path: wheelhouse/*.whl
3636

3737
test-wheels-aarch64:
3838
name: Testing wheel
3939
needs: linux-build-aarch64
40-
runs-on: ubuntu-latest
40+
runs-on: ubuntu-20.04
4141
strategy:
4242
matrix:
43-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
43+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
4444
steps:
4545
- name: Checkout
46-
uses: actions/checkout@v3
46+
uses: actions/checkout@v4
4747

4848
- name: Download artifacts
49-
uses: actions/download-artifact@v3
49+
uses: actions/download-artifact@v4
5050
with:
5151
name: wheels
5252
path: wheelhouse
5353

5454
- name: Set up QEMU
55-
uses: docker/setup-qemu-action@v2
55+
uses: docker/setup-qemu-action@v3
5656
with:
5757
platforms: arm64
5858

@@ -61,8 +61,8 @@ jobs:
6161
docker run --rm --interactive -v $PWD/tests:/tests \
6262
-v $PWD/pyproject.toml:/pyproject.toml \
6363
-v $PWD/wheelhouse:/wheelhouse \
64-
"arm64v8/python:${{ matrix.python-version }}-buster" /bin/bash -s <<EOF
64+
"arm64v8/python:${{ matrix.python-version }}-bullseye" /bin/bash -s <<EOF
6565
python3 -m pip install $(ls wheelhouse/*_aarch64.whl)
66-
python3 -m pip install pytest pytest-asyncio
66+
python3 -m pip install pytest
6767
python -m pytest tests/ -m "server or util or client or mainloop or partner"
6868
EOF

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,35 @@ on:
77
jobs:
88
linux-build-86_64:
99
name: Build wheel for linux x86_64
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-20.04
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414

1515
- name: Prepare snap7 archive
1616
uses: ./.github/actions/prepare_snap7
1717

1818
- name: Build wheel
19-
uses: ./.github/actions/manylinux_2_24_x86_64
19+
uses: ./.github/actions/manylinux_2_28_x86_64
2020
with:
2121
script: ./.github/build_scripts/build_package.sh
22-
platform: manylinux_2_24_x86_64
22+
platform: manylinux_2_28_x86_64
2323
makefile: x86_64_linux.mk
2424
python: /opt/python/cp38-cp38/bin/python
2525
wheeldir: wheelhouse/${{ runner.os }}/
2626

2727
- name: Upload artifacts
28-
uses: actions/upload-artifact@v3
28+
uses: actions/upload-artifact@v4
2929
with:
3030
name: wheels
3131
path: wheelhouse/*/*.whl
3232

3333
windows-build:
3434
name: Build wheel for windows
35-
runs-on: windows-latest
35+
runs-on: windows-2022
3636
steps:
3737
- name: Checkout
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939

4040
- name: Prepare snap7 archive
4141
uses: ./.github/actions/prepare_snap7
@@ -49,17 +49,17 @@ jobs:
4949
cp dist/*.whl wheelhouse/${{ runner.os }}/
5050
5151
- name: Upload artifacts
52-
uses: actions/upload-artifact@v3
52+
uses: actions/upload-artifact@v4
5353
with:
5454
name: wheels
5555
path: wheelhouse/*/*.whl
5656

5757
osx-build:
5858
name: Build wheel for osx
59-
runs-on: macos-11
59+
runs-on: macos-14
6060
steps:
6161
- name: Checkout
62-
uses: actions/checkout@v3
62+
uses: actions/checkout@v4
6363

6464
- name: Prepare snap7 archive
6565
uses: ./.github/actions/prepare_snap7
@@ -84,7 +84,7 @@ jobs:
8484
8585
8686
- name: Upload artifacts
87-
uses: actions/upload-artifact@v3
87+
uses: actions/upload-artifact@v4
8888
with:
8989
name: wheels
9090
path: wheelhouse/*/*.whl
@@ -96,24 +96,24 @@ jobs:
9696
runs-on: ${{ matrix.os }}
9797
strategy:
9898
matrix:
99-
os: [ubuntu-latest, windows-latest, macos-latest]
100-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
99+
os: [ubuntu-20.04, windows-2022, macos-14]
100+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
101101
steps:
102102
- name: Checkout
103-
uses: actions/checkout@v3
103+
uses: actions/checkout@v4
104104

105105
- name: Set up Python ${{ matrix.python-version }}
106-
uses: actions/setup-python@v4
106+
uses: actions/setup-python@v5
107107
with:
108108
python-version: ${{ matrix.python-version }}
109109

110110
- name: Install pytest
111111
run: |
112112
python3 -m pip install --upgrade pip
113-
python3 -m pip install pytest pytest-asyncio
113+
python3 -m pip install pytest
114114
115115
- name: Download artifacts
116-
uses: actions/download-artifact@v3
116+
uses: actions/download-artifact@v4
117117
with:
118118
name: wheels
119119
path: wheelhouse

.github/workflows/doc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-20.04
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
- name: Install Debian packages
1414
run: |
1515
sudo apt-get update -qq

.github/workflows/docker.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ env:
77
IMAGE_NAME: ${{ github.repository }}
88
jobs:
99
build-and-push-image:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-20.04
1111
steps:
1212
- name: Extract metadata (tags, labels) for Docker
1313
id: meta
14-
uses: docker/metadata-action@v4
14+
uses: docker/metadata-action@v5
1515
with:
1616
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
1717

1818
- name: Login to GitHub Container Registry
19-
uses: docker/login-action@v2
19+
uses: docker/login-action@v3
2020
with:
2121
registry: ${{ env.REGISTRY }}
2222
username: ${{ github.actor }}
2323
password: ${{ secrets.GITHUB_TOKEN }}
2424

2525
- name: Build container image
26-
uses: docker/build-push-action@v4
26+
uses: docker/build-push-action@v5
2727
with:
2828
push: true
2929
tags: ${{ steps.meta.outputs.tags }}

.github/workflows/linux.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ jobs:
99
runs-on: ubuntu-20.04
1010
strategy:
1111
matrix:
12-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
12+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
- name: Install Debian packages
1717
run: |
1818
sudo apt-get update -qq
1919
sudo apt-get install -y software-properties-common
2020
sudo add-apt-repository -y ppa:gijzelaar/snap7
2121
sudo apt-get update -qq
2222
sudo apt-get install -y libsnap7-dev libsnap7-1
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Set up Python ${{ matrix.python-version }}
25-
uses: actions/setup-python@v4
25+
uses: actions/setup-python@v5
2626
with:
2727
python-version: ${{ matrix.python-version }}
2828
- name: Install dependencies

.github/workflows/mypy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-20.04
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
- name: Install Debian packages
1414
run: |
1515
sudo apt-get update -qq

0 commit comments

Comments
 (0)