Skip to content

Commit

Permalink
Fix maturin breaking change and specify fixed version
Browse files Browse the repository at this point in the history
  • Loading branch information
ijl committed Dec 29, 2024
1 parent e5ddb0b commit 9a4ef46
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/artifact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: actions/checkout@v4

- run: python3 -m pip install --user --upgrade pip "maturin>=1,<2" wheel
- run: python3 -m pip install --user --upgrade pip "maturin==1.7.8" wheel

- name: Vendor dependencies
run: |
Expand Down Expand Up @@ -287,6 +287,7 @@ jobs:
LDFLAGS: "-Wl,--as-needed"
RUSTFLAGS: "-C lto=fat -Z mir-opt-level=4 -Z threads=2 -D warnings -C target-feature=-crt-static"
with:
maturin-version: 1.7.8
rust-toolchain: "${{ env.RUST_TOOLCHAIN }}"
rustup-components: rust-src
target: "${{ matrix.platform.target }}"
Expand Down Expand Up @@ -391,6 +392,7 @@ jobs:
LDFLAGS: "-Wl,--as-needed"
RUSTFLAGS: "${{ matrix.target.rustflags }}"
with:
maturin-version: 1.7.8
target: "${{ matrix.target.target }}"
rust-toolchain: "${{ env.RUST_TOOLCHAIN }}"
rustup-components: rust-src
Expand Down Expand Up @@ -448,7 +450,7 @@ jobs:
curl -LsSf https://astral.sh/uv/install.sh | sh
uv venv --python python${{ matrix.python.version }}
uv pip install --upgrade "maturin>=1,<2" -r test/requirements.txt -r integration/requirements.txt
uv pip install --upgrade "maturin==1.7.8" -r test/requirements.txt -r integration/requirements.txt
mkdir .cargo
cp ci/config.toml .cargo/config.toml
Expand Down Expand Up @@ -522,7 +524,7 @@ jobs:
curl -LsSf https://astral.sh/uv/install.sh | sh
uv venv --python python${{ matrix.python.version }}
uv pip install --upgrade "maturin>=1,<2" -r test/requirements.txt -r integration/requirements.txt
uv pip install --upgrade "maturin==1.7.8" -r test/requirements.txt -r integration/requirements.txt
mkdir .cargo
cp ci/config.toml .cargo/config.toml
Expand Down Expand Up @@ -597,7 +599,7 @@ jobs:
run: |
cargo fetch --target "${{ matrix.platform.target }}" &
python.exe -m pip install --upgrade pip "maturin>=1,<2" wheel
python.exe -m pip install --upgrade pip "maturin==1.7.8" wheel
python.exe -m pip install -r test\requirements.txt -r integration\requirements.txt
mkdir .cargo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/debug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
with:
python-version: '${{ matrix.python.version }}'

- run: python -m pip install --user --upgrade pip "maturin>=1,<2" wheel
- run: python -m pip install --user --upgrade pip "maturin==1.7.8" wheel

- uses: actions/checkout@v4

Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[project]
name = "orjson"
version = "3.10.12"
repository = "https://github.com/ijl/orjson"
requires-python = ">=3.8"
classifiers = [
Expand Down Expand Up @@ -30,7 +31,7 @@ Changelog = "https://github.com/ijl/orjson/blob/master/CHANGELOG.md"

[build-system]
build-backend = "maturin"
requires = ["maturin>=1,<2"]
requires = ["maturin==1.7.8"]

[tool.maturin]
python-source = "pysrc"
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-r bench/requirements.txt
-r integration/requirements.txt
-r test/requirements.txt
maturin
maturin==1.7.8
mypy==1.13.0
ruff==0.8.0
2 changes: 1 addition & 1 deletion script/install-fedora
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ rm -rf "${VENV}"
uv venv --python "${PYTHON}" "${VENV}"
source "${VENV}/bin/activate"

uv pip install --upgrade "maturin>=1,<2" -r test/requirements.txt -r integration/requirements.txt
uv pip install --upgrade "maturin==1.7.8" -r test/requirements.txt -r integration/requirements.txt

0 comments on commit 9a4ef46

Please sign in to comment.