Merge pull request #60 from icgood/platforms

Publish arm64 and amd64 docker images

Author: icgood

.github/workflows/docker-build.yml

@@ -14,9 +14,13 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
+        if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -39,6 +43,7 @@ jobs:
         with:
           context: .
           file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/python-check.yml

@@ -1,24 +1,24 @@
 name: check
 
 on:
-  push:
-    branches: [ main ]
   pull_request:
     branches: [ main ]
+  push:
+    branches: [ main ]
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        platform: [ubuntu-latest, windows-latest]
 
     runs-on: ${{ matrix.platform }}
 
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: |
           3.8

.github/workflows/python-doc.yml

@@ -1,10 +1,10 @@
 name: doc
 
 on:
-  push:
-    branches: [ main ]
   pull_request:
     branches: [ main ]
+  push:
+    branches: [ main ]
   release:
     types: [ published ]
 
@@ -15,7 +15,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.12'
     - name: Install build tools
@@ -26,7 +26,7 @@ jobs:
         hatch run doc:build
     - name: Deploy to GitHub Pages
       if: github.event_name == 'release'
-      uses: peaceiris/actions-gh-pages@v3
+      uses: peaceiris/actions-gh-pages@v4
       with:
         github_token: ${{ github.token }}
         publish_dir: ./doc/build/html

.github/workflows/python-publish.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.12'
     - name: Install build tools

README.md

@@ -6,7 +6,7 @@ PROXY protocol library with [asyncio][2] server implementation.
 [![build](https://github.com/icgood/proxy-protocol/actions/workflows/python-check.yml/badge.svg)](https://github.com/icgood/proxy-protocol/actions/workflows/python-check.yml)
 [![PyPI](https://img.shields.io/pypi/v/proxy-protocol.svg)](https://pypi.python.org/pypi/proxy-protocol)
 [![PyPI](https://img.shields.io/pypi/pyversions/proxy-protocol.svg)](https://pypi.python.org/pypi/proxy-protocol)
-![platforms](https://img.shields.io/badge/platform-linux%20%7C%20macOS%20%7C%20windows-blueviolet)
+![platforms](https://img.shields.io/badge/platform-linux%20%7C%20windows-blueviolet)
 [![PyPI](https://img.shields.io/pypi/l/proxy-protocol.svg)](https://pypi.python.org/pypi/proxy-protocol)
 
 #### [Specification](https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt)

docker/Dockerfile

@@ -1,13 +1,10 @@
-FROM python:3.12-alpine
+FROM python:3.12-slim
 
 WORKDIR /src
 COPY . .
 
-RUN pip install -U pip wheel setuptools hatch typing-extensions
-
-RUN apk --update add --virtual build-dependencies python3-dev build-base \
-  && hatch env create docker \
-  && apk del build-dependencies
+RUN pip install hatch
+RUN hatch env create docker
 
 ENTRYPOINT ["hatch", "-e", "docker", "run", "proxyprotocol-server"]
 CMD ["--help"]

proxyprotocol/__about__.py

@@ -1,2 +1,2 @@
 #: The package version string.
-__version__ = '0.11.2'
+__version__ = '0.11.3'

pyproject.toml

@@ -97,11 +97,13 @@ module = 'crc32c.*'
 ignore_missing_imports = true
 
 [tool.ruff]
+line-length = 79
+
+[tool.ruff.lint]
 select = ['ANN', 'B', 'E', 'F', 'N', 'S', 'W']
 ignore = ['ANN101', 'ANN102', 'ANN401', 'S101']
-line-length = 79
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "test/*" = ['ANN', 'S104']
 
 [tool.autopep8]
@@ -127,7 +129,7 @@ features = ['dev', 'crc32c']
 [tool.hatch.envs.default.scripts]
 run-pytest = 'py.test --cov-report=term-missing --cov=proxyprotocol'
 run-mypy = 'mypy proxyprotocol test'
-run-ruff = 'ruff proxyprotocol test'
+run-ruff = 'ruff check proxyprotocol test'
 run-autopep8 = 'autopep8 --exit-code -dr proxyprotocol test'
 check = ['run-pytest', 'run-autopep8', 'run-mypy', 'run-ruff']