Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 56 additions & 47 deletions .github/workflows/distribute.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

env:
UNIX_PYTHON_VERSIONS: 3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.7 pypy3.8 pypy3.9 pypy3.10
WINDOWS_PYTHON_VERSIONS: 3.7 3.8 3.9 3.10 3.11 3.12
WINDOWS_PYTHON_VERSIONS: 3.8 3.9 3.10 3.11 3.12

permissions:
contents: read
Expand All @@ -38,44 +38,44 @@ jobs:
sccache: 'true'
manylinux: auto
- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheels
name: wheels-linux-${{ matrix.target }}
path: dist

linux-musl:
runs-on: ubuntu-latest
strategy:
matrix:
platform: [
{ target: "x86_64-unknown-linux-musl", image_tag: "x86_64-musl" },
{ target: "i686-unknown-linux-musl", image_tag: "i686-musl" },
{ target: "aarch64-unknown-linux-musl", image_tag: "aarch64-musl" },
{ target: "armv7-unknown-linux-musleabihf", image_tag: "armv7-musleabihf" },
{ target: "powerpc64le-unknown-linux-musl", image_tag: "powerpc64le-musl" },
]
container:
image: docker://messense/rust-musl-cross:${{ matrix.platform.image_tag }}
env:
CFLAGS_armv7_unknown_linux_musleabihf: '-mfpu=vfpv3-d16'
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Build wheels - linux-musl
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --interpreter ${{ env.UNIX_PYTHON_VERSIONS }}
sccache: 'true'
manylinux: musllinux_1_1
container: off
- name: Upload wheels
uses: actions/upload-artifact@v3
with:
name: wheels
path: dist
# linux-musl:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# platform: [
# { target: "x86_64-unknown-linux-musl", image_tag: "x86_64-musl" },
# { target: "i686-unknown-linux-musl", image_tag: "i686-musl" },
# { target: "aarch64-unknown-linux-musl", image_tag: "aarch64-musl" },
# { target: "armv7-unknown-linux-musleabihf", image_tag: "armv7-musleabihf" },
# { target: "powerpc64le-unknown-linux-musl", image_tag: "powerpc64le-musl" },
# ]
# container:
# image: docker://messense/rust-musl-cross:${{ matrix.platform.image_tag }}
# env:
# CFLAGS_armv7_unknown_linux_musleabihf: '-mfpu=vfpv3-d16'
# steps:
# - uses: actions/checkout@v3
# - uses: actions/setup-python@v4
# with:
# python-version: '3.10'
# - name: Build wheels - linux-musl
# uses: PyO3/maturin-action@v1
# with:
# target: ${{ matrix.platform.target }}
# args: --release --out dist --interpreter ${{ env.UNIX_PYTHON_VERSIONS }}
# sccache: 'true'
# manylinux: musllinux_1_1
# container: off
# - name: Upload wheels
# uses: actions/upload-artifact@v4
# with:
# name: wheels-musl-${{ matrix.target }}
# path: dist

windows:
runs-on: windows-latest
Expand All @@ -95,9 +95,9 @@ jobs:
args: --release --out dist --interpreter ${{ env.WINDOWS_PYTHON_VERSIONS }}
sccache: 'true'
- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheels
name: wheels-windows-${{ matrix.target }}
path: dist

macos:
Expand All @@ -117,9 +117,9 @@ jobs:
args: --release --out dist --interpreter ${{ env.UNIX_PYTHON_VERSIONS }}
sccache: 'true'
- name: Upload wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheels
name: wheels-macos-${{ matrix.target }}
path: dist

sdist:
Expand All @@ -132,24 +132,33 @@ jobs:
command: sdist
args: --out dist
- name: Upload sdist
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheels
name: wheels-sdist
path: dist

merge:
runs-on: ubuntu-latest
# needs: [linux, linux-musl, windows, macos, sdist]
needs: [linux, windows, macos, sdist]
steps:
- name: Merge Artifacts
uses: actions/upload-artifact/merge@v4
with:
name: wheels
pattern: wheels-*

release:
name: Release
runs-on: ubuntu-latest
if: "startsWith(github.ref, 'refs/tags/')"
needs: [linux, linux-musl, windows, macos, sdist]
needs: merge
steps:
- uses: actions/download-artifact@v3
with:
name: wheels
- uses: actions/download-artifact@v4
- name: Publish to PyPI
uses: PyO3/maturin-action@v1
env:
MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
with:
command: upload
args: --skip-existing *
args: --skip-existing wheels/*
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 0.4.0-beta.1

- biscuit-rust 6.0.0-beta.3

# 0.3.2

- build wheels for more python versions (#28):
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "biscuit-python"
version = "0.3.2"
version = "0.4.0-beta.1"
edition = "2021"

[lib]
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[project]
name="biscuit_auth"
name="biscuit-python"
description="Python bindings for the biscuit auth platform"
readme="README.md"
license= { file = "LICENSE" }
Expand Down