From d9a0ee70e2007c46e046f5bc4f9277ecd1a8bb37 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Mon, 7 Oct 2024 15:31:04 -0600 Subject: [PATCH 1/5] ci.yml: Enforce Universal2 for macOS wheels --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 217cc11cb..ae61c988e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -167,6 +167,7 @@ jobs: CIBW_SKIP: cp36-* cp37-* pp36-* pp37-* *p38-*_aarch64 cp38-*_arm64 *p39-*_aarch64 *p310-*_aarch64 pp*_aarch64 *musllinux*_aarch64 CIBW_BEFORE_ALL_LINUX: apt install -y gcc || yum install -y gcc || apk add gcc CIBW_ARCHS_LINUX: auto aarch64 + CIBW_ARCHS_MACOS: x86_64 universal2 arm64 CIBW_BUILD_VERBOSITY: 3 REQUIRE_CYTHON: 1 From bb3b50bf39510fa059bb45b481a0a4d47786f838 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Mon, 7 Oct 2024 15:32:08 -0600 Subject: [PATCH 2/5] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae61c988e..1a7143cb0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -167,7 +167,7 @@ jobs: CIBW_SKIP: cp36-* cp37-* pp36-* pp37-* *p38-*_aarch64 cp38-*_arm64 *p39-*_aarch64 *p310-*_aarch64 pp*_aarch64 *musllinux*_aarch64 CIBW_BEFORE_ALL_LINUX: apt install -y gcc || yum install -y gcc || apk add gcc CIBW_ARCHS_LINUX: auto aarch64 - CIBW_ARCHS_MACOS: x86_64 universal2 arm64 + CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" CIBW_BUILD_VERBOSITY: 3 REQUIRE_CYTHON: 1 From 224695683252efec7c970ef7a35f6f532afd8388 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Mon, 7 Oct 2024 15:39:49 -0600 Subject: [PATCH 3/5] CI: Only build wheels --- .github/workflows/ci.yml | 130 --------------------------------------- 1 file changed, 130 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a7143cb0..d825503d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,118 +11,8 @@ concurrency: cancel-in-progress: true jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v5 - with: - python-version: "3.9" - - uses: pre-commit/action@v2.0.3 - - # Make sure commit messages follow the conventional commits convention: - # https://www.conventionalcommits.org - commitlint: - name: Lint Commit Messages - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - uses: wagoid/commitlint-github-action@v5 - - test: - strategy: - fail-fast: false - matrix: - python-version: - - "3.8" - - "3.9" - - "3.10" - - "3.11" - - "3.12" - - "3.13" - - "pypy-3.8" - - "pypy-3.9" - os: - - ubuntu-latest - - macos-latest - - windows-latest - extension: - - "skip_cython" - - "use_cython" - exclude: - - os: macos-latest - extension: use_cython - - os: windows-latest - extension: use_cython - - os: windows-latest - python-version: "pypy-3.8" - - os: windows-latest - python-version: "pypy-3.9" - - os: macos-latest - python-version: "pypy-3.8" - - os: macos-latest - python-version: "pypy-3.9" - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - name: Install poetry - run: pipx install poetry - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - cache: "poetry" - allow-prereleases: true - - name: Install Dependencies no cython - if: ${{ matrix.extension == 'skip_cython' }} - env: - SKIP_CYTHON: 1 - run: poetry install --only=main,dev - - name: Install Dependencies with cython - if: ${{ matrix.extension != 'skip_cython' }} - env: - REQUIRE_CYTHON: 1 - run: poetry install --only=main,dev - - name: Test with Pytest - run: poetry run pytest --durations=20 --timeout=60 -v --cov=zeroconf --cov-branch --cov-report xml --cov-report html --cov-report term-missing tests - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 - with: - token: ${{ secrets.CODECOV_TOKEN }} - - release: - runs-on: ubuntu-latest - environment: release - if: github.ref == 'refs/heads/master' - needs: - - test - - lint - - commitlint - - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - # Run semantic release: - # - Update CHANGELOG.md - # - Update version in code - # - Create git tag - # - Create GitHub release - # - Publish to PyPI - - name: Python Semantic Release - uses: relekang/python-semantic-release@v7.34.6 - # env: - # REPOSITORY_URL: https://test.pypi.org/legacy/ - # TWINE_REPOSITORY_URL: https://test.pypi.org/legacy/ - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - pypi_token: ${{ secrets.PYPI_TOKEN }} build_wheels: - needs: [release] name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -174,23 +64,3 @@ jobs: - uses: actions/upload-artifact@v3 with: path: ./wheelhouse/*.whl - - upload_pypi: - needs: [build_wheels] - runs-on: ubuntu-latest - environment: release - - steps: - - uses: actions/download-artifact@v3 - with: - # unpacks default artifact into dist/ - # if `name: artifact` is omitted, the action will create extra parent dir - name: artifact - path: dist - - - uses: pypa/gh-action-pypi-publish@v1.5.0 - with: - user: __token__ - password: ${{ secrets.PYPI_TOKEN }} - - # To test: repository_url: https://test.pypi.org/legacy/ From 56842c31562f54de13f902c94073c0e68db62d1d Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Mon, 7 Oct 2024 15:42:07 -0600 Subject: [PATCH 4/5] Update ci.yml --- .github/workflows/ci.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d825503d8..0546882b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,17 +33,6 @@ jobs: - name: Install python-semantic-release run: pipx install python-semantic-release==7.34.6 - - name: Get Release Tag - id: release_tag - shell: bash - run: | - echo "::set-output name=newest_release_tag::$(semantic-release print-version --current)" - - - uses: actions/checkout@v3 - with: - ref: "${{ steps.release_tag.outputs.newest_release_tag }}" - fetch-depth: 0 - - name: Set up QEMU if: runner.os == 'Linux' uses: docker/setup-qemu-action@v3 From a6256143cd03aa96adb32d2fbae17fa8e3743dff Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Mon, 7 Oct 2024 15:57:13 -0600 Subject: [PATCH 5/5] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0546882b2..2323ce423 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-2019, macos-12, macos-latest] + os: [ubuntu-latest, windows-2019, macos-latest] steps: - uses: actions/checkout@v3