Skip to content

Commit f5cdd34

Browse files
authored
Merge pull request #1291 from onekey-sec/renovate/lock-file-maintenance-pyproject.toml
chore(deps): lock file maintenance (pyproject.toml)
2 parents 9d29da7 + f801268 commit f5cdd34

File tree

6 files changed

+320
-533
lines changed

6 files changed

+320
-533
lines changed

.github/actions/setup-dependencies/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ inputs:
22
python-version:
33
description: "Python version to setup"
44
required: false
5-
default: "3.9"
5+
default: "3.10"
66
install-test-deps:
77
description: "Wether to install 3rd Party dependencies (for tests)"
88
required: false

.github/workflows/CI.yml

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
runs-on: ubuntu-latest
8282
strategy:
8383
matrix:
84-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
84+
python-version: ["3.10", "3.11", "3.12", "3.13"]
8585
steps:
8686
- name: Checkout source code
8787
uses: actions/checkout@v4
@@ -138,7 +138,6 @@ jobs:
138138
name: Build wheels (linux)
139139
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.*.labels.*.name, 'dependencies')
140140
needs: [check_pre_commit]
141-
runs-on: ubuntu-latest
142141
strategy:
143142
fail-fast: false
144143
matrix:
@@ -152,6 +151,7 @@ jobs:
152151
# lief is not available for this platform (and no sdist is provided)
153152
# - manylinux: musllinux_1_1
154153
# target: aarch64
154+
runs-on: ${{ matrix.platform.target == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
155155
steps:
156156
- name: Checkout source code
157157
uses: actions/checkout@v4
@@ -183,24 +183,17 @@ jobs:
183183
python3 -m venv wheel.venv
184184
source wheel.venv/bin/activate
185185
pip install dist/*.whl
186-
unblob --help
186+
unblob --version
187187
188188
- name: Check wheel (cross-manylinux)
189189
if: matrix.platform.target != 'x86_64' && startsWith(matrix.platform.manylinux, 'manylinux')
190-
uses: uraimo/run-on-arch-action@v3
191-
with:
192-
arch: ${{ matrix.platform.target }}
193-
distro: ubuntu22.04
194-
githubToken: ${{ github.token }}
195-
install: |
196-
apt-get update
197-
apt-get install -y --no-install-recommends python3-venv libmagic1
198-
run: |
199-
set -e
200-
python3 -m venv wheel.venv
201-
source wheel.venv/bin/activate
202-
pip install dist/*.whl
203-
unblob --version
190+
shell: bash
191+
run: |
192+
set -e
193+
python3 -m venv wheel.venv
194+
source wheel.venv/bin/activate
195+
pip install dist/*.whl
196+
unblob --version
204197
205198
- name: Check wheel (x86-musllinux)
206199
if: matrix.platform.target == 'x86_64' && startsWith(matrix.platform.manylinux, 'musllinux')
@@ -218,15 +211,13 @@ jobs:
218211
219212
- name: Check wheel (cross-musllinux)
220213
if: matrix.platform.target != 'x86_64' && startsWith(matrix.platform.manylinux, 'musllinux')
221-
uses: uraimo/run-on-arch-action@v3
214+
uses: addnab/docker-run-action@v3
222215
with:
223-
arch: ${{ matrix.platform.target }}
224-
distro: alpine_latest
225-
githubToken: ${{ github.token }}
226-
install: |
227-
apk add py3-pip libmagic gcc lz4 musl-dev python3-dev
216+
image: alpine:latest
217+
options: -v ${{ github.workspace }}:/io -w /io
228218
run: |
229219
set -e
220+
apk add py3-pip libmagic gcc lz4 musl-dev python3-dev
230221
python3 -m venv wheel.venv
231222
source wheel.venv/bin/activate
232223
pip install dist/*.whl

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
enable-cache: true
2020
cache-dependency-glob: "uv.lock"
21-
python-version: "3.9"
21+
python-version: "3.10"
2222

2323
- name: Install the project
2424
run: uv sync --only-group docs

Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ RUN chown -R unblob /data
66

77
WORKDIR /data/output
88

9+
# Enable backports, required to get upx package
10+
RUN printf "deb http://deb.debian.org/debian bookworm-backports main\n" \
11+
> /etc/apt/sources.list.d/backports.list
12+
913
COPY install-deps.sh /
1014
RUN sh -xeu /install-deps.sh
1115

pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ description = "Extract files from any kind of container formats"
3232
license = { text = "MIT" }
3333
name = "unblob"
3434
readme = "README.md"
35-
requires-python = ">=3.9"
35+
requires-python = ">=3.10"
3636
version = "25.5.26"
3737

3838
[project.scripts]
@@ -195,6 +195,9 @@ features = [
195195
"pyo3/extension-module", # This is an extension module
196196
]
197197

198+
[tool.uv.sources]
199+
taplo = { git = "https://github.com/tamasfe/taplo", tag = "0.10.0" }
200+
198201
[build-system]
199202
build-backend = "maturin"
200203
requires = ["maturin>=1.0,<2.0"]

0 commit comments

Comments
 (0)