From 9a938f28659643d92f2b3a08001b9d4d2e9c8ebc Mon Sep 17 00:00:00 2001 From: Trent Hauck Date: Thu, 9 Nov 2023 07:03:21 -0800 Subject: [PATCH 1/3] build: update biobear --- .github/workflows/release.yml | 220 +++++++++++++++++----------------- Cargo.toml | 2 +- 2 files changed, 111 insertions(+), 111 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a9da6d0..89de689 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,13 +2,13 @@ name: Release on: push: - tags: - - 'v*' - workflow_dispatch: - inputs: - tag: - description: 'Tag to run for' - required: true + # tags: + # - 'v*' + # workflow_dispatch: + # inputs: + # tag: + # description: 'Tag to run for' + # required: true permissions: contents: read @@ -21,110 +21,110 @@ jobs: matrix: target: [x86_64, aarch64, armv7] steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.event.inputs.tag || github.ref }} - - uses: actions/setup-python@v4 - with: - python-version: '3.10' - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Build wheels - uses: PyO3/maturin-action@v1 - with: - target: ${{ matrix.target }} - args: --release --out dist --find-interpreter - sccache: 'true' - manylinux: auto - - name: Upload wheels - uses: actions/upload-artifact@v3 - with: - name: wheels - path: dist + - uses: actions/checkout@v3 + # with: + # ref: ${{ github.event.inputs.tag || github.ref }} + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + - name: Build wheels + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.target }} + args: --release --out dist --find-interpreter + sccache: 'true' + manylinux: auto + # - name: Upload wheels + # uses: actions/upload-artifact@v3 + # with: + # name: wheels + # path: dist - windows: - runs-on: windows-latest - strategy: - matrix: - target: [x64] - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.event.inputs.tag || github.ref }} - - uses: actions/setup-python@v4 - with: - python-version: '3.10' - architecture: ${{ matrix.target }} - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Build wheels - uses: PyO3/maturin-action@v1 - with: - target: ${{ matrix.target }} - args: --release --out dist --find-interpreter - sccache: 'true' - - name: Upload wheels - uses: actions/upload-artifact@v3 - with: - name: wheels - path: dist + # windows: + # runs-on: windows-latest + # strategy: + # matrix: + # target: [x64] + # steps: + # - uses: actions/checkout@v3 + # with: + # ref: ${{ github.event.inputs.tag || github.ref }} + # - uses: actions/setup-python@v4 + # with: + # python-version: '3.10' + # architecture: ${{ matrix.target }} + # - uses: actions-rs/toolchain@v1 + # with: + # toolchain: stable + # - name: Build wheels + # uses: PyO3/maturin-action@v1 + # with: + # target: ${{ matrix.target }} + # args: --release --out dist --find-interpreter + # sccache: 'true' + # - name: Upload wheels + # uses: actions/upload-artifact@v3 + # with: + # name: wheels + # path: dist - macos: - runs-on: macos-latest - strategy: - matrix: - target: [x86_64, aarch64] - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.event.inputs.tag || github.ref }} - - uses: actions/setup-python@v4 - with: - python-version: '3.10' - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Build wheels - uses: PyO3/maturin-action@v1 - with: - target: ${{ matrix.target }} - args: --release --out dist --find-interpreter - sccache: 'true' - - name: Upload wheels - uses: actions/upload-artifact@v3 - with: - name: wheels - path: dist + # macos: + # runs-on: macos-latest + # strategy: + # matrix: + # target: [x86_64, aarch64] + # steps: + # - uses: actions/checkout@v3 + # with: + # ref: ${{ github.event.inputs.tag || github.ref }} + # - uses: actions/setup-python@v4 + # with: + # python-version: '3.10' + # - uses: actions-rs/toolchain@v1 + # with: + # toolchain: stable + # - name: Build wheels + # uses: PyO3/maturin-action@v1 + # with: + # target: ${{ matrix.target }} + # args: --release --out dist --find-interpreter + # sccache: 'true' + # - name: Upload wheels + # uses: actions/upload-artifact@v3 + # with: + # name: wheels + # path: dist - sdist: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.event.inputs.tag || github.ref }} - - name: Build sdist - uses: PyO3/maturin-action@v1 - with: - command: sdist - args: --out dist - - name: Upload sdist - uses: actions/upload-artifact@v3 - with: - name: wheels - path: dist + # sdist: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # with: + # ref: ${{ github.event.inputs.tag || github.ref }} + # - name: Build sdist + # uses: PyO3/maturin-action@v1 + # with: + # command: sdist + # args: --out dist + # - name: Upload sdist + # uses: actions/upload-artifact@v3 + # with: + # name: wheels + # path: dist - release: - name: Release - runs-on: ubuntu-latest - needs: [linux, windows, macos, sdist] - steps: - - uses: actions/download-artifact@v3 - with: - name: wheels - - name: Publish to PyPI - uses: PyO3/maturin-action@v1 - with: - command: upload - args: --skip-existing * + # release: + # name: Release + # runs-on: ubuntu-latest + # needs: [linux, windows, macos, sdist] + # steps: + # - uses: actions/download-artifact@v3 + # with: + # name: wheels + # - name: Publish to PyPI + # uses: PyO3/maturin-action@v1 + # with: + # command: upload + # args: --skip-existing * diff --git a/Cargo.toml b/Cargo.toml index dc7580d..7b28013 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ name = "biobear" [dependencies] arrow = {version = "47", features = ["pyarrow"]} datafusion = "32" -exon = {version = "0.3.8-beta.4", features = ["all"]} +exon = {version = "0.3.9", features = ["all"]} pyo3 = "0.19" thiserror = "1.0" tokio = {version = "1", features = ["rt"]} From c3f892e36f501a75e15506b33943aa00d4febdde Mon Sep 17 00:00:00 2001 From: Trent Hauck Date: Thu, 9 Nov 2023 07:13:05 -0800 Subject: [PATCH 2/3] feat: update manylinux in maturin --- .github/workflows/release.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89de689..f2804cd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - target: [x86_64, aarch64, armv7] + target: [x86_64, aarch64] steps: - uses: actions/checkout@v3 # with: @@ -30,13 +30,25 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: stable - - name: Build wheels + + - name: Build wheels (x86) + if: matrix.target == 'x86_64' uses: PyO3/maturin-action@v1 with: target: ${{ matrix.target }} args: --release --out dist --find-interpreter sccache: 'true' manylinux: auto + + - name: Build wheels (aarch64) + if: matrix.target == 'aarch64' + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.target }} + args: --release --out dist --find-interpreter + sccache: 'true' + manylinux: 2_28 + # - name: Upload wheels # uses: actions/upload-artifact@v3 # with: From 3889b3fc81ffd12b63b17c6a29c00873410482dc Mon Sep 17 00:00:00 2001 From: Trent Hauck Date: Thu, 9 Nov 2023 07:25:02 -0800 Subject: [PATCH 3/3] refactor: fixup action for merge --- .github/workflows/release.yml | 193 +++++++++++++++++----------------- 1 file changed, 96 insertions(+), 97 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f2804cd..b91143e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,13 +2,13 @@ name: Release on: push: - # tags: - # - 'v*' - # workflow_dispatch: - # inputs: - # tag: - # description: 'Tag to run for' - # required: true + tags: + - 'v*' + workflow_dispatch: + inputs: + tag: + description: 'Tag to run for' + required: true permissions: contents: read @@ -22,8 +22,8 @@ jobs: target: [x86_64, aarch64] steps: - uses: actions/checkout@v3 - # with: - # ref: ${{ github.event.inputs.tag || github.ref }} + with: + ref: ${{ github.event.inputs.tag || github.ref }} - uses: actions/setup-python@v4 with: python-version: '3.10' @@ -48,95 +48,94 @@ jobs: args: --release --out dist --find-interpreter sccache: 'true' manylinux: 2_28 + - name: Upload wheels + uses: actions/upload-artifact@v3 + with: + name: wheels + path: dist - # - name: Upload wheels - # uses: actions/upload-artifact@v3 - # with: - # name: wheels - # path: dist - - # windows: - # runs-on: windows-latest - # strategy: - # matrix: - # target: [x64] - # steps: - # - uses: actions/checkout@v3 - # with: - # ref: ${{ github.event.inputs.tag || github.ref }} - # - uses: actions/setup-python@v4 - # with: - # python-version: '3.10' - # architecture: ${{ matrix.target }} - # - uses: actions-rs/toolchain@v1 - # with: - # toolchain: stable - # - name: Build wheels - # uses: PyO3/maturin-action@v1 - # with: - # target: ${{ matrix.target }} - # args: --release --out dist --find-interpreter - # sccache: 'true' - # - name: Upload wheels - # uses: actions/upload-artifact@v3 - # with: - # name: wheels - # path: dist + windows: + runs-on: windows-latest + strategy: + matrix: + target: [x64] + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.inputs.tag || github.ref }} + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + architecture: ${{ matrix.target }} + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + - name: Build wheels + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.target }} + args: --release --out dist --find-interpreter + sccache: 'true' + - name: Upload wheels + uses: actions/upload-artifact@v3 + with: + name: wheels + path: dist - # macos: - # runs-on: macos-latest - # strategy: - # matrix: - # target: [x86_64, aarch64] - # steps: - # - uses: actions/checkout@v3 - # with: - # ref: ${{ github.event.inputs.tag || github.ref }} - # - uses: actions/setup-python@v4 - # with: - # python-version: '3.10' - # - uses: actions-rs/toolchain@v1 - # with: - # toolchain: stable - # - name: Build wheels - # uses: PyO3/maturin-action@v1 - # with: - # target: ${{ matrix.target }} - # args: --release --out dist --find-interpreter - # sccache: 'true' - # - name: Upload wheels - # uses: actions/upload-artifact@v3 - # with: - # name: wheels - # path: dist + macos: + runs-on: macos-latest + strategy: + matrix: + target: [x86_64, aarch64] + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.inputs.tag || github.ref }} + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + - name: Build wheels + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.target }} + args: --release --out dist --find-interpreter + sccache: 'true' + - name: Upload wheels + uses: actions/upload-artifact@v3 + with: + name: wheels + path: dist - # sdist: - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v3 - # with: - # ref: ${{ github.event.inputs.tag || github.ref }} - # - name: Build sdist - # uses: PyO3/maturin-action@v1 - # with: - # command: sdist - # args: --out dist - # - name: Upload sdist - # uses: actions/upload-artifact@v3 - # with: - # name: wheels - # path: dist + sdist: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.inputs.tag || github.ref }} + - name: Build sdist + uses: PyO3/maturin-action@v1 + with: + command: sdist + args: --out dist + - name: Upload sdist + uses: actions/upload-artifact@v3 + with: + name: wheels + path: dist - # release: - # name: Release - # runs-on: ubuntu-latest - # needs: [linux, windows, macos, sdist] - # steps: - # - uses: actions/download-artifact@v3 - # with: - # name: wheels - # - name: Publish to PyPI - # uses: PyO3/maturin-action@v1 - # with: - # command: upload - # args: --skip-existing * + release: + name: Release + runs-on: ubuntu-latest + needs: [linux, windows, macos, sdist] + steps: + - uses: actions/download-artifact@v3 + with: + name: wheels + - name: Publish to PyPI + uses: PyO3/maturin-action@v1 + with: + command: upload + args: --skip-existing *