Skip to content

Commit 569736e

Browse files
authored
Merge branch 'main' into ctty/storage-trait
2 parents b2c41fc + d3d3127 commit 569736e

File tree

3 files changed

+42
-12
lines changed

3 files changed

+42
-12
lines changed

.github/workflows/bindings_python_ci.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,21 @@ jobs:
5656
runs-on: ubuntu-latest
5757
steps:
5858
- uses: actions/checkout@v5
59+
- uses: astral-sh/setup-uv@v6
60+
with:
61+
version: "0.9.3"
62+
enable-cache: true
5963
- name: Install tools
6064
run: |
61-
pip install ruff
65+
uv tool install ruff
6266
- name: Check format
6367
working-directory: "bindings/python"
6468
run: |
65-
ruff format . --diff
69+
uvx ruff format . --diff
6670
- name: Check style
6771
working-directory: "bindings/python"
6872
run: |
69-
ruff check .
73+
uvx ruff check .
7074
7175
test:
7276
runs-on: ${{ matrix.os }}
@@ -86,15 +90,15 @@ jobs:
8690
working-directory: "bindings/python"
8791
command: build
8892
args: --out dist --sdist
89-
- name: Install uv
90-
shell: bash
91-
run: |
92-
python -m pip install uv==0.9.3
93+
- uses: astral-sh/setup-uv@v6
94+
with:
95+
version: "0.9.3"
96+
enable-cache: true
9397
- name: Sync dependencies
9498
working-directory: "bindings/python"
9599
shell: bash
96100
run: |
97-
uv sync --group dev --no-install-project
101+
make install
98102
- name: Install built wheel
99103
working-directory: "bindings/python"
100104
shell: bash
@@ -104,4 +108,4 @@ jobs:
104108
working-directory: "bindings/python"
105109
shell: bash
106110
run: |
107-
uv run --group dev --no-sync pytest
111+
make test

bindings/python/Makefile

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
19+
install:
20+
uv sync --group dev --no-install-project
21+
22+
build:
23+
uv run maturin develop
24+
25+
test:
26+
uv run --no-sync pytest

bindings/python/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ pip install uv==0.9.3
3232
Set up the development environment:
3333

3434
```shell
35-
uv sync --group dev
35+
make install
3636
```
3737

3838
## Build
3939

4040
```shell
41-
uv run --group dev maturin develop
41+
make build
4242
```
4343

4444
## Test
4545

4646
```shell
47-
uv run --group dev pytest
47+
make test
4848
```

0 commit comments

Comments
 (0)