Skip to content

Commit 40fb6df

Browse files
authored
Merge pull request #134 from Apricot-S/develop
v5.0.4
2 parents d8069e7 + 95b2d18 commit 40fb6df

File tree

11 files changed

+97
-210
lines changed

11 files changed

+97
-210
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"image": "mcr.microsoft.com/devcontainers/rust:2-1-trixie",
88
"features": {
99
"ghcr.io/devcontainers/features/python:1": {
10-
"version": "3.12",
10+
"version": "3.10",
1111
"installTools": false
1212
},
1313
"ghcr.io/va-h/devcontainers-features/uv:1": {}

.devcontainer/post-create.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ sudo chown -R vscode:vscode /workspaces/xiangting-py
2121

2222
chmod +x scripts/*.sh
2323

24-
python3 -m venv .venv # for `maturin develop`
24+
export UV_LINK_MODE=copy
2525
uv sync

.github/workflows/CI.yml

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,14 @@ jobs:
2727
target: x86_64
2828
- runner: ubuntu-24.04
2929
target: aarch64
30-
python-version:
31-
- "3.12"
32-
- "3.13"
33-
- "3.13t"
34-
- "3.14"
35-
- "3.14t"
30+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.13t", "3.14", "3.14t", "pypy3.11", "graalpy3.12"]
3631
steps:
3732
- uses: actions/checkout@v6
33+
with:
34+
persist-credentials: false
3835
- uses: actions/setup-python@v6
3936
with:
40-
python-version: ${{ matrix.python-version }}
37+
python-version: "3.14"
4138
- uses: Swatinem/rust-cache@v2
4239
- name: Build wheels
4340
uses: PyO3/maturin-action@v1
@@ -61,17 +58,14 @@ jobs:
6158
target: x86_64
6259
- runner: ubuntu-24.04
6360
target: aarch64
64-
python-version:
65-
- "3.12"
66-
- "3.13"
67-
- "3.13t"
68-
- "3.14"
69-
- "3.14t"
61+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.13t", "3.14", "3.14t", "pypy3.11", "graalpy3.12"]
7062
steps:
7163
- uses: actions/checkout@v6
64+
with:
65+
persist-credentials: false
7266
- uses: actions/setup-python@v6
7367
with:
74-
python-version: ${{ matrix.python-version }}
68+
python-version: "3.14"
7569
- uses: Swatinem/rust-cache@v2
7670
- name: Build wheels
7771
uses: PyO3/maturin-action@v1
@@ -93,17 +87,14 @@ jobs:
9387
platform:
9488
- runner: windows-latest
9589
target: x64
96-
python-version:
97-
- "3.12"
98-
- "3.13"
99-
- "3.13t"
100-
- "3.14"
101-
- "3.14t"
90+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.13t", "3.14", "3.14t"]
10291
steps:
10392
- uses: actions/checkout@v6
93+
with:
94+
persist-credentials: false
10495
- uses: actions/setup-python@v6
10596
with:
106-
python-version: ${{ matrix.python-version }}
97+
python-version: "3.14"
10798
architecture: ${{ matrix.platform.target }}
10899
- uses: Swatinem/rust-cache@v2
109100
- name: Build wheels
@@ -125,17 +116,14 @@ jobs:
125116
platform:
126117
- runner: macos-15
127118
target: aarch64
128-
python-version:
129-
- "3.12"
130-
- "3.13"
131-
- "3.13t"
132-
- "3.14"
133-
- "3.14t"
119+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.13t", "3.14", "3.14t", "pypy3.11", "graalpy3.12"]
134120
steps:
135121
- uses: actions/checkout@v6
122+
with:
123+
persist-credentials: false
136124
- uses: actions/setup-python@v6
137125
with:
138-
python-version: ${{ matrix.python-version }}
126+
python-version: "3.14"
139127
- uses: Swatinem/rust-cache@v2
140128
- name: Build wheels
141129
uses: PyO3/maturin-action@v1
@@ -153,6 +141,8 @@ jobs:
153141
runs-on: ubuntu-latest
154142
steps:
155143
- uses: actions/checkout@v6
144+
with:
145+
persist-credentials: false
156146
- uses: actions/setup-python@v6
157147
with:
158148
python-version: 3.x

.github/workflows/docs.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,22 @@ on:
1111
pull_request:
1212
branches:
1313
- main
14+
- develop
1415
paths:
1516
- docs/**
1617
- src/**
1718
- .github/workflows/docs.yml
1819

20+
permissions:
21+
contents: read
22+
1923
jobs:
2024
build-docs:
2125
runs-on: ubuntu-latest
2226
steps:
2327
- uses: actions/checkout@v6
28+
with:
29+
persist-credentials: false
2430

2531
- name: Set up Python
2632
uses: actions/setup-python@v6
@@ -51,6 +57,7 @@ jobs:
5157
path: docs/_build/html
5258

5359
deploy:
60+
if: github.event_name == 'push'
5461
needs: build-docs
5562
permissions:
5663
pages: write

Cargo.lock

Lines changed: 55 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)