Skip to content

Commit 36e30ff

Browse files
committed
Merge branch 'dev' into xml_playsound
2 parents d623512 + 3217e7d commit 36e30ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2182
-310
lines changed

.devcontainer.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,18 @@
4444
},
4545
// Add the IDs of extensions you want installed when the container is created.
4646
"features": {
47-
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
47+
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
48+
"ghcr.io/devcontainers/features/rust:1": {}
4849
},
4950
"image": "mcr.microsoft.com/devcontainers/base:debian",
5051
"name": "Deebot client",
5152
// Use 'forwardPorts' to make a list of ports inside the container available locally.
5253
// "forwardPorts": [],
5354
// Use 'postCreateCommand' to run commands after the container is created.
54-
"postCreateCommand": "curl -LsSf https://astral.sh/uv/install.sh | sh && uv sync --frozen --dev && pre-commit install",
55+
"postCreateCommand": "scripts/setup.sh",
5556
"postStartCommand": "uv sync --dev",
5657
"remoteEnv": {
57-
"PATH": "/home/vscode/.cargo/bin:/workspaces/client.py/.venv/bin:${containerEnv:PATH}"
58+
"PATH": "/home/vscode/.local/bin:/home/vscode/.cargo/bin:/workspaces/client.py/.venv/bin:${containerEnv:PATH}"
5859
},
5960
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
6061
"remoteUser": "vscode",

.github/renovate.json

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
"addLabels": ["github_actions"],
2222
"matchManagers": ["github-actions"],
2323
"rangeStrategy": "pin"
24+
},
25+
{
26+
"addLabels": ["rust"],
27+
"matchManagers": ["cargo"]
2428
}
2529
],
2630
"rebaseWhen": "behind-base-branch"

.github/workflows/ci.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name: CI
33
on:
44
push:
55
branches:
6-
- main
76
- dev
87
pull_request:
98

@@ -19,7 +18,7 @@ jobs:
1918
uses: actions/checkout@v4
2019

2120
- name: 🏗 Install uv and Python
22-
uses: astral-sh/setup-uv@v4
21+
uses: astral-sh/setup-uv@v5
2322
with:
2423
enable-cache: true
2524
cache-dependency-glob: "uv.lock"
@@ -33,7 +32,7 @@ jobs:
3332
run: uv run --frozen mypy deebot_client/
3433

3534
- name: Pylint review
36-
run: uv run --frozen pylint deebot_client/
35+
run: uv run --frozen pylint deebot_client/**/*.py
3736

3837
- name: Verify no getLogger usages
3938
run: scripts/check_getLogger.sh
@@ -51,7 +50,7 @@ jobs:
5150
uses: actions/checkout@v4
5251

5352
- name: 🏗 Install uv and Python ${{ matrix.python-version }}
54-
uses: astral-sh/setup-uv@v4
53+
uses: astral-sh/setup-uv@v5
5554
with:
5655
enable-cache: true
5756
cache-dependency-glob: "uv.lock"

.github/workflows/codeql-analysis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ name: "CodeQL"
1414
on:
1515
push:
1616
branches:
17-
- main
1817
- dev
1918
pull_request:
2019
schedule:

.github/workflows/python-publish.yml

+40-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,40 @@ on:
1313
types: [published]
1414

1515
jobs:
16+
wheels:
17+
name: Build wheels
18+
runs-on: ubuntu-latest
19+
strategy:
20+
matrix:
21+
python-version:
22+
- "3.12"
23+
- "3.13"
24+
linux-compatibility:
25+
- "manylinux_2_34"
26+
- "musllinux_1_2"
27+
steps:
28+
- name: ⤵️ Check out code from GitHub
29+
uses: actions/[email protected]
30+
- name: 🏗 Set up uv and Python ${{ matrix.python-version }}
31+
uses: astral-sh/setup-uv@v5
32+
with:
33+
enable-cache: true
34+
python-version: ${{ matrix.python-version }}
35+
- name: 🏗 Set package version
36+
run: |
37+
sed -i "s/^version = \".*\"/version = \"${{ github.event.release.tag_name }}\"/" pyproject.toml
38+
- name: 📦 Build package
39+
run: uv build --wheel --config-settings build-args='--compatibility ${{ matrix.linux-compatibility }}'
40+
- name: ⬆️ Upload wheels
41+
uses: actions/upload-artifact@v4
42+
with:
43+
name: wheels-${{ matrix.python-version }}-${{ matrix.linux-compatibility }}
44+
path: dist
45+
1646
release:
1747
name: Releasing to PyPi
1848
runs-on: ubuntu-latest
49+
needs: ["wheels"]
1950
environment:
2051
name: release
2152
url: https://pypi.org/manage/project/deebot-client/
@@ -26,14 +57,20 @@ jobs:
2657
- name: ⤵️ Check out code from GitHub
2758
uses: actions/[email protected]
2859
- name: 🏗 Set up uv
29-
uses: astral-sh/setup-uv@v4
60+
uses: astral-sh/setup-uv@v5
3061
with:
3162
enable-cache: true
3263
- name: 🏗 Set package version
3364
run: |
3465
sed -i "s/^version = \".*\"/version = \"${{ github.event.release.tag_name }}\"/" pyproject.toml
35-
- name: 📦 Build package
36-
run: uv build
66+
- name: 📦 Build source package
67+
run: uv build --sdist
68+
- name: ⬇️ Download wheels
69+
uses: actions/download-artifact@v4
70+
with:
71+
pattern: wheels-*
72+
path: dist
73+
merge-multiple: true
3774
- name: 🚀 Publish to PyPi
3875
run: uv publish
3976
- name: ✍️ Sign published artifacts

.github/workflows/release-drafter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release Drafter
33
on:
44
push:
55
branches:
6-
- main
6+
- dev
77

88
jobs:
99
update_release_draft:

.gitignore

+6-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,9 @@ nosetests.xml
2121
.*_cache
2222

2323
test.py
24-
.env
24+
.env
25+
26+
/target
27+
28+
# rust so
29+
*.cpython*.so

.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ default_language_version:
1111

1212
repos:
1313
- repo: https://github.com/astral-sh/ruff-pre-commit
14-
rev: v0.8.3
14+
rev: v0.8.4
1515
hooks:
1616
- id: ruff
1717
args:
1818
- --fix
1919
- --unsafe-fixes
2020
- id: ruff-format
2121
- repo: https://github.com/asottile/pyupgrade
22-
rev: v3.19.0
22+
rev: v3.19.1
2323
hooks:
2424
- id: pyupgrade
2525
args:

.python-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.13.0
1+
3.13

Cargo.lock

+201
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)