Skip to content

Commit 2935fe7

Browse files
authored
Merge pull request #4651 from dev-hato/massongit-patch-1_3
uv lockを使ってsudden-deathをアップデートする
2 parents eb472f5 + e814abe commit 2935fe7

3 files changed

Lines changed: 7 additions & 30 deletions

File tree

pyproject.toml

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,7 @@ name = "hato-bot"
33
version = "3.0.5"
44
description = "愛嬌のあるBot"
55
requires-python = "==3.13.1"
6-
dependencies = [
7-
"python-dotenv==1.0.1",
8-
"requests==2.32.3",
9-
"Pillow>=7.1.2",
10-
"opencv-python==4.10.0.84",
11-
"slack-bolt==1.22.0",
12-
"slack-sdk==3.34.0",
13-
"gitpython==3.1.44",
14-
"pandas==2.2.3",
15-
"matplotlib==3.10.0",
16-
"openai==1.59.5",
17-
"discord.py==2.4.0",
18-
"misskey.py==4.1.0",
19-
"websockets==14.1",
20-
"flask==3.1.0",
21-
"markupsafe==3.0.2",
22-
"numpy==2.2.1",
23-
"emoji==2.14.0",
24-
"puremagic==1.28",
25-
"audioop-lts==0.2.1",
26-
"psycopg[binary,pool]==3.2.3",
27-
"sudden-death==0.0.1",
28-
]
6+
dependencies = [ "python-dotenv==1.0.1", "requests==2.32.3", "Pillow>=7.1.2", "opencv-python==4.10.0.84", "slack-bolt==1.22.0", "slack-sdk==3.34.0", "gitpython==3.1.44", "pandas==2.2.3", "matplotlib==3.10.0", "openai==1.59.5", "discord.py==2.4.0", "misskey.py==4.1.0", "websockets==14.1", "flask==3.1.0", "markupsafe==3.0.2", "numpy==2.2.1", "emoji==2.14.0", "puremagic==1.28", "audioop-lts==0.2.1", "psycopg[binary,pool]==3.2.3", "sudden-death==0.0.1",]
297

308
[dependency-groups]
319
dev = [ "autopep8==2.3.1", "requests-mock==1.12.1", "pylint==3.3.3", "sqlfluff==3.3.0", "mypy==1.14.1", "flake8==7.1.1", "isort==5.13.2", "pre-commit==4.0.1", "importlib-metadata==8.5.0", "toml==0.10.2", "types-toml==0.10.8.20240310", "pyink==24.10.0",]
@@ -35,5 +13,6 @@ dev = [ "autopep8==2.3.1", "requests-mock==1.12.1", "pylint==3.3.3", "sqlfluff==
3513
name = "pypi"
3614
url = "https://pypi.org/simple"
3715

38-
[tool.uv.sources]
39-
sudden-death = { git = "https://github.com/dev-hato/sudden-death", branch = "master" }
16+
[tool.uv.sources.sudden-death]
17+
git = "https://github.com/dev-hato/sudden-death"
18+
branch = "master"

scripts/pr_format/pr_format/format.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ tag_version="$(yq '.jobs.pr-super-lint.steps[-1].uses | line_comment' .github/wo
66
pyink_version="$(docker run --rm --entrypoint '' "ghcr.io/${tag_name}-${tag_version}" /bin/sh -c 'pyink --version' | grep pyink | awk '{ print $2 }')"
77
sed -i -e "s/pyink==.*\"/pyink==${pyink_version}\"/g" pyproject.toml
88
uv sync --dev
9-
sudden_death_url="$(yq .tool.uv.sources.sudden-death.git pyproject.toml)"
109

11-
if [ "$sudden_death_url" != 'null' ]; then
12-
sudden_death_branch="$(yq .tool.uv.sources.sudden-death.branch pyproject.toml)"
13-
uv add "git+$sudden_death_url" --branch "$sudden_death_branch"
10+
if [ "$(yq .tool.uv.sources.sudden-death.git pyproject.toml)" != 'null' ]; then
11+
uv lock --upgrade-package sudden-death
1412
fi
1513

1614
uv tool run autopep8 --exit-code --in-place --recursive .

uv.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)