diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 52359749..83ab5de7 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7550ebbb..992f193c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,6 +4,8 @@ name: Publish on: + push: + branches: [ "update-actions" ] release: types: [created] workflow_dispatch: {} @@ -12,8 +14,8 @@ jobs: package-source: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: "3.9" - name: Prepare C files to include @@ -25,9 +27,9 @@ jobs: - name: Build source package run: python -m build --sdist - name: Upload source package - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: dist + name: dist-source path: dist/ package-wheel: @@ -49,17 +51,17 @@ jobs: - os: windows-latest arch: amd64 steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: "3.9" - name: Set up QEMU if: ${{ matrix.arch == 'aarch64' }} - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Build wheels env: CIBW_ARCHS_LINUX: ${{matrix.arch}} - CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-* + CIBW_BUILD: cp39-* cp310-* cp311-* cp312-* cp313-* CIBW_SKIP: '*-musllinux*' CIBW_BEFORE_BUILD_LINUX: pip install -r requirements-cython.txt && yum install -y zlib-devel # On windows and mac we should have z library preinstalled @@ -71,9 +73,9 @@ jobs: cibuildwheel --output-dir dist shell: bash - name: Upload wheels - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: dist + name: dist-${{ matrix.os }}-${{ matrix.arch }} path: dist/ test-wheels-windows: @@ -96,14 +98,14 @@ jobs: aiokafka_whl: dist/aiokafka-*-cp313-cp313-win_amd64.whl steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Download distributions - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: - name: dist + name: dist-windows-latest-amd64 path: dist/ - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} @@ -141,14 +143,14 @@ jobs: aiokafka_whl: dist/aiokafka-*-cp313-cp313-macosx_*_x86_64.whl steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Download distributions - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: - name: dist + name: dist-macos-13-x86_64 path: dist/ - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} @@ -184,14 +186,14 @@ jobs: aiokafka_whl: dist/aiokafka-*-cp313-cp313-macosx_*_arm64.whl steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Download distributions - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: - name: dist + name: dist-macos-latest-arm64 path: dist/ - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} @@ -227,14 +229,14 @@ jobs: aiokafka_whl: dist/aiokafka-*-cp313-cp313-manylinux*_x86_64.whl steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Download distributions - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: - name: dist + name: dist-ubuntu-latest-x86_64 path: dist/ - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} @@ -276,14 +278,14 @@ jobs: aiokafka_whl: dist/aiokafka-*-cp312-cp312-manylinux*_aarch64.whl steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up QEMU id: qemu - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Download distributions - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: - name: dist + name: dist-ubuntu-latest-aarch64 path: dist/ - name: Test Wheel run: | @@ -320,11 +322,12 @@ jobs: https://pypi.org/project/aiokafka/${{ github.ref_name }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Download distributions - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: - name: dist path: dist/ - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 + pattern: dist-* + merge-multiple: true + # - name: Publish to PyPI + # uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 589c79bd..44e53337 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,9 +18,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3.9 @@ -36,7 +36,7 @@ jobs: echo "::set-output name=dir::$(pip cache dir)" - name: Cache packages - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-py-3.9-${{ hashFiles('requirements-ci.txt') }}-${{ hashFiles('setup.py') }} @@ -76,11 +76,11 @@ jobs: python: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} @@ -91,7 +91,7 @@ jobs: echo "::set-output name=dir::$(pip cache dir)" - name: Cache packages - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-py-${{ matrix.python }}-${{ hashFiles('requirements-win-test.txt') }}-${{ hashFiles('setup.py') }} @@ -120,7 +120,7 @@ jobs: AIOKAFKA_NO_EXTENSIONS: "1" - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: file: ./coverage-ext.xml flags: unit,cext @@ -128,7 +128,7 @@ jobs: if: ${{ always() }} - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: file: ./coverage-py.xml flags: unit,purepy @@ -144,11 +144,11 @@ jobs: python: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} @@ -159,7 +159,7 @@ jobs: echo "::set-output name=dir::$(pip cache dir)" - name: Cache packages - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-py-${{ matrix.python }}-${{ hashFiles('requirements-ci.txt') }}-${{ hashFiles('setup.py') }} @@ -188,7 +188,7 @@ jobs: AIOKAFKA_NO_EXTENSIONS: "1" - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: file: ./coverage-ext.xml flags: unit,cext @@ -196,7 +196,7 @@ jobs: if: ${{ always() }} - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: file: ./coverage-py.xml flags: unit,purepy @@ -265,11 +265,11 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} @@ -285,7 +285,7 @@ jobs: echo "::set-output name=dir::$(pip cache dir)" - name: Cache packages - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-py-${{ matrix.python }}-${{ hashFiles('requirements-ci.txt') }}-${{ hashFiles('setup.py') }} @@ -317,7 +317,7 @@ jobs: KAFKA_VERSION: ${{ matrix.kafka }} - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: file: ./coverage-ext.xml flags: integration,cext @@ -325,7 +325,7 @@ jobs: if: ${{ always() }} - name: Upload coverage without cext to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: file: ./coverage-py.xml flags: integration,purepy diff --git a/Makefile b/Makefile index f0214347..e0183266 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ cov cover coverage: lint .PHONY: ci-test-unit ci-test-unit: - pytest -s --log-format="%(asctime)s %(levelname)s %(message)s" --log-level DEBUG --cov aiokafka --cov-report xml --color=yes $(FLAGS) tests + pytest -s --log-format="%(asctime)s %(levelname)s %(message)s" --log-level DEBUG --cov aiokafka --cov-report xml --color=yes $(FLAGS) tests/test_helpers.py .PHONY: ci-test-all ci-test-all: