Skip to content

Commit

Permalink
build: lower minimum version requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
mtshiba committed Sep 10, 2023
1 parent 965418b commit a08003d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 15 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ jobs:
strategy:
matrix:
include:
# - target: armv7-unknown-linux-gnueabihf
# os: ubuntu-latest
# - target: aarch64-unknown-linux-gnu
# os: ubuntu-latest
# - target: aarch64-apple-darwin
# os: macos-latest
- target: x86_64-unknown-linux-gnu
platform: linux
os: ubuntu-latest
Expand All @@ -45,8 +39,6 @@ jobs:
- target: x86_64-pc-windows-msvc
platform: windows
os: windows-latest
# - target: i686-pc-windows-msvc
# os: windows-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand All @@ -56,12 +48,11 @@ jobs:
- name: setup-tools
run: |
rustup update stable
pip3 install twine build cibuildwheel setuptools-rust
pip3 install twine build cibuildwheel setuptools-rust tomli
rustup target add ${{ matrix.target }}
- name: build
run: cibuildwheel --output-dir dist --platform ${{ matrix.platform }}
env:
# CIBW_BUILD: '${{ matrix.python-version }}-*'
# rust doesn't seem to be available for musl linux on i686
CIBW_SKIP: '*-musllinux_i686'
CIBW_ENVIRONMENT: 'PATH="$HOME/.cargo/bin:$PATH" CARGO_TERM_COLOR="always"'
Expand All @@ -70,7 +61,6 @@ jobs:
CIBW_BEFORE_BUILD_LINUX: >
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y &&
rustup show
# CIBW_TEST_SKIP: '*-macosx_arm64 *-macosx_universal2:arm64'
# CIBW_BUILD_VERBOSITY: 1
- name: upload
run: |
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = ["setuptools", "setuptools-rust", "wheel"]
requires = ["setuptools", "setuptools-rust", "wheel", "tomli"]
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
import os
import shlex
from glob import glob
import tomllib
import shutil

from setuptools import setup, Command
from setuptools_rust import RustBin
import tomli

class Clean(Command):
user_options = []
Expand All @@ -23,7 +23,7 @@ def run(self):
long_description = fp.read()

with open("Cargo.toml", "rb") as fp:
toml = tomllib.load(fp)
toml = tomli.load(fp)
name = toml["package"]["name"]
description = toml["package"]["description"]
version = toml["workspace"]["package"]["version"]
Expand Down Expand Up @@ -54,7 +54,7 @@ def run(self):
long_description_content_type="text/markdown",
version=version,
license=license,
python_requires=">=3.11",
python_requires=">=3",
rust_extensions=[
RustBin("pylyzer", args=cargo_args, cargo_manifest_args=["--locked"])
],
Expand Down

0 comments on commit a08003d

Please sign in to comment.