PaiGramTeam/PamGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PamGram.git synced 2024-11-22 06:17:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

⬆️ Update psutil requirement from ^5.9.6 to ^6.0.0

Browse Source
This commit is contained in:
xtaodada 2024-06-19 21:20:02 +08:00
parent e9588a91a9
commit 818ae227d3
Signed by: xtaodada
GPG Key ID: 4CBB3F4FA8C85659
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pdm.lock
View File

@ -5,7 +5,7 @@
groups = ["default", "pyro", "test"] groups = ["default", "pyro", "test"]
strategy = ["cross_platform", "inherit_metadata"] strategy = ["cross_platform", "inherit_metadata"]
lock_version = "4.4.1" lock_version = "4.4.1"
content_hash = "sha256:bcf58b6023eabde23bbfc83fa03d034e2dbd15a8a4b79759f401d8aa9b54cd7c" content_hash = "sha256:c8914b9e7aadc361e91860d10dd140b8661601d138111682205ad84e83a04656"
[[package]] [[package]]
name = "aiocsv" name = "aiocsv"
@ -1711,18 +1711,19 @@ files = [
[[package]] [[package]]
name = "psutil" name = "psutil"
version = "5.9.8" version = "6.0.0"
requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
summary = "Cross-platform lib for process and system monitoring in Python." summary = "Cross-platform lib for process and system monitoring in Python."
groups = ["default"] groups = ["default"]
files = [ files = [
{file = "psutil-5.9.8-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:aee678c8720623dc456fa20659af736241f575d79429a0e5e9cf88ae0605cc81"}, {file = "psutil-6.0.0-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:c588a7e9b1173b6e866756dde596fd4cad94f9399daf99ad8c3258b3cb2b47a0"},
{file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cb6403ce6d8e047495a701dc7c5bd788add903f8986d523e3e20b98b733e421"}, {file = "psutil-6.0.0-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6ed2440ada7ef7d0d608f20ad89a04ec47d2d3ab7190896cd62ca5fc4fe08bf0"},
{file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d06016f7f8625a1825ba3732081d77c94589dca78b7a3fc072194851e88461a4"}, {file = "psutil-6.0.0-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5fd9a97c8e94059b0ef54a7d4baf13b405011176c3b6ff257c247cae0d560ecd"},
{file = "psutil-5.9.8-cp37-abi3-win32.whl", hash = "sha256:bc56c2a1b0d15aa3eaa5a60c9f3f8e3e565303b465dbf57a1b730e7a2b9844e0"}, {file = "psutil-6.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2e8d0054fc88153ca0544f5c4d554d42e33df2e009c4ff42284ac9ebdef4132"},
{file = "psutil-5.9.8-cp37-abi3-win_amd64.whl", hash = "sha256:8db4c1b57507eef143a15a6884ca10f7c73876cdf5d51e713151c1236a0e68cf"}, {file = "psutil-6.0.0-cp37-abi3-win32.whl", hash = "sha256:a495580d6bae27291324fe60cea0b5a7c23fa36a7cd35035a16d93bdcf076b9d"},
{file = "psutil-5.9.8-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8"}, {file = "psutil-6.0.0-cp37-abi3-win_amd64.whl", hash = "sha256:33ea5e1c975250a720b3a6609c490db40dae5d83a4eb315170c4fe0d8b1f34b3"},
{file = "psutil-5.9.8.tar.gz", hash = "sha256:6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c"}, {file = "psutil-6.0.0-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:ffe7fc9b6b36beadc8c322f84e1caff51e8703b88eee1da46d1e3a6ae11b4fd0"},
{file = "psutil-6.0.0.tar.gz", hash = "sha256:8faae4f310b6d969fa26ca0545338b21f73c6b15db7c4a8d934a5482faa818f2"},
] ]
[[package]] [[package]]
@ -2356,7 +2357,7 @@ name = "starrailrelicscore"
version = "0.1.1" version = "0.1.1"
requires_python = ">=3.8" requires_python = ">=3.8"
git = "https://github.com/PaiGramTeam/StarRailRelicScore" git = "https://github.com/PaiGramTeam/StarRailRelicScore"
revision = "df81151f024300ad6bc02edac3dae6597e213f13" revision = "1b9e9f0af766d6b54b5585cbda0052009364db3e"
summary = "StarRail Relic Score Cal" summary = "StarRail Relic Score Cal"
groups = ["default"] groups = ["default"]
dependencies = [ dependencies = [

5
plugins/starrail/player_cards.py
View File

@ -481,6 +481,7 @@ class RenderTemplate:
score = self.cal_avatar_relic_score() score = self.cal_avatar_relic_score()
artifact_total_score: float = 0 artifact_total_score: float = 0
artifact_total_score_label = "N/A"
artifacts = self.find_artifacts() artifacts = self.find_artifacts()
if score and score.relics: if score and score.relics:
relic_map = {relic.tid: relic for relic in artifacts} relic_map = {relic.tid: relic for relic in artifacts}
@ -490,8 +491,8 @@ class RenderTemplate:
artifact.set_score(relic) artifact.set_score(relic)
artifact_total_score = score.total_score artifact_total_score = score.total_score
artifact_total_score = round(artifact_total_score, 1) artifact_total_score = round(artifact_total_score, 1)
artifact_total_score_label: str = score.total_rating artifact_total_score_label: str = score.total_rating
weapon = None weapon = None
weapon_detail = None weapon_detail = None

2
pyproject.toml
View File

@ -44,7 +44,7 @@ dependencies = [
"playwright==1.44.0", "playwright==1.44.0",
"aiosqlite[sqlite]<1.0.0,>=0.20.0", "aiosqlite[sqlite]<1.0.0,>=0.20.0",
"simnet @ git+https://github.com/PaiGramTeam/SIMNet", "simnet @ git+https://github.com/PaiGramTeam/SIMNet",
"psutil<6.0.0,>=5.9.6", "psutil<7.0.0,>=6.0.0",
"starrail-damage-cal<2.0.0,>=1.6.1", "starrail-damage-cal<2.0.0,>=1.6.1",
"starrailrelicscore @ git+https://github.com/PaiGramTeam/StarRailRelicScore", "starrailrelicscore @ git+https://github.com/PaiGramTeam/StarRailRelicScore",
"influxdb-client[async,ciso]>=1.43.0", "influxdb-client[async,ciso]>=1.43.0",

4
requirements.txt
View File

@ -64,7 +64,7 @@ pillow==10.3.0
platformdirs==4.2.2 platformdirs==4.2.2
playwright==1.44.0 playwright==1.44.0
pluggy==1.5.0 pluggy==1.5.0
psutil==5.9.8 psutil==6.0.0
pyaes==1.6.1 pyaes==1.6.1
pycparser==2.22; platform_python_implementation != "PyPy" pycparser==2.22; platform_python_implementation != "PyPy"
pydantic==1.10.16 pydantic==1.10.16
@ -97,7 +97,7 @@ sqlalchemy==2.0.30
sqlmodel==0.0.19 sqlmodel==0.0.19
starlette==0.37.2 starlette==0.37.2
starrail-damage-cal==1.6.1 starrail-damage-cal==1.6.1
starrailrelicscore @ git+https://github.com/PaiGramTeam/StarRailRelicScore@df81151f024300ad6bc02edac3dae6597e213f13 starrailrelicscore @ git+https://github.com/PaiGramTeam/StarRailRelicScore@1b9e9f0af766d6b54b5585cbda0052009364db3e
tgcrypto==1.2.5 tgcrypto==1.2.5
thefuzz==0.22.1 thefuzz==0.22.1
tomli==2.0.1; python_version < "3.11" tomli==2.0.1; python_version < "3.11"