From 6f84e24fbb65cecdf9beaeb4d7affb828d07b15d Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Fri, 30 Jun 2023 23:50:49 +0800 Subject: [PATCH] update require and cargo.lock --- README.md | 15 +++++----- docs/README-en.md | 6 ++-- .../Difficult_Rocket_rs/src/Cargo.lock | 28 +++++++++---------- requirement-build.txt | 2 +- requirement-dev.txt | 2 +- requirement.txt | 2 +- start.ps1 | 14 ---------- 7 files changed, 28 insertions(+), 41 deletions(-) delete mode 100644 start.ps1 diff --git a/README.md b/README.md index 005c40b..6417915 100644 --- a/README.md +++ b/README.md @@ -46,21 +46,21 @@ ## 环境需求 (测试过的 / 开发平台) - `开发平台 1 - Windows 10 x64 22H2` - - Python `3.8.10` + - Python `3.8.10` / `3.10.11` - pillow `9.5.0` - psutil `5.9.5` - rtoml `0.9.0` - - tomlkit `0.11.7` + - tomlkit `0.11.8` - defusedxml `0.7.1` - objprint `0.2.2` - viztracer `0.15.6` - vizplugins `0.1.3` - - nuitka `1.5.6` + - nuitka `1.6.6` - ordered-set `4.1.0` - - imageio `2.27.0` + - imageio `2.31.0` - wheel `0.40.0` - - setuptools `67.6.1` - - setuptools-rust `1.5.2` + - setuptools `67.8.0` + - setuptools-rust `1.6.0` - `AMD R5 5600X` - `AMD RX 550 4G` @@ -94,12 +94,13 @@ viztracer >= 0.15.6; platform_python_implementation != "PyPy" vizplugins >= 0.1.3; platform_python_implementation != "PyPy" # for compile -nuitka >= 1.6.5 +nuitka >= 1.6.6 ordered-set >= 4.1.0 imageio >= 2.31.0; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython" wheel >= 0.40.0 setuptools >= 67.8.0 setuptools-rust >= 1.6.0 + ``` ## 感谢 diff --git a/docs/README-en.md b/docs/README-en.md index 72b3b70..2efbb44 100644 --- a/docs/README-en.md +++ b/docs/README-en.md @@ -46,7 +46,7 @@ ## Environment (been tested / developed on) - `Develop platform 1 - Windows 10 x64 22H2` - - Python `3.8.10` + - Python `3.8.10` / `3.10.11` - pillow `9.5.0` - psutil `5.9.5` - rtoml `0.9.0` @@ -55,7 +55,7 @@ - objprint `0.2.2` - viztracer `0.15.6` - vizplugins `0.1.3` - - nuitka `1.6.1` + - nuitka `1.6.6` - ordered-set `4.1.0` - imageio `2.31.0` - wheel `0.40.0` @@ -94,7 +94,7 @@ viztracer >= 0.15.6; platform_python_implementation != "PyPy" vizplugins >= 0.1.3; platform_python_implementation != "PyPy" # for compile -nuitka >= 1.6.5 +nuitka >= 1.6.6 ordered-set >= 4.1.0 imageio >= 2.31.0; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython" wheel >= 0.40.0 diff --git a/mods/dr_game/Difficult_Rocket_rs/src/Cargo.lock b/mods/dr_game/Difficult_Rocket_rs/src/Cargo.lock index 59acc84..908ca0a 100644 --- a/mods/dr_game/Difficult_Rocket_rs/src/Cargo.lock +++ b/mods/dr_game/Difficult_Rocket_rs/src/Cargo.lock @@ -146,9 +146,9 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libm" @@ -339,9 +339,9 @@ checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] @@ -418,9 +418,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -517,7 +517,7 @@ checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -573,9 +573,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" dependencies = [ "proc-macro2", "quote", @@ -584,9 +584,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" [[package]] name = "thiserror" @@ -605,7 +605,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -644,9 +644,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", diff --git a/requirement-build.txt b/requirement-build.txt index 6e60e72..f2f2210 100644 --- a/requirement-build.txt +++ b/requirement-build.txt @@ -18,7 +18,7 @@ defusedxml >= 0.7.1 objprint >= 0.2.2 # for compile -nuitka >= 1.6.5 +nuitka >= 1.6.6 ordered-set >= 4.1.0 imageio >= 2.31.0; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython" wheel >= 0.40.0 diff --git a/requirement-dev.txt b/requirement-dev.txt index 67f3ae3..fccaf65 100644 --- a/requirement-dev.txt +++ b/requirement-dev.txt @@ -21,7 +21,7 @@ viztracer >= 0.15.6; platform_python_implementation != "PyPy" vizplugins >= 0.1.3; platform_python_implementation != "PyPy" # for compile -nuitka >= 1.6.5 +nuitka >= 1.6.6 ordered-set >= 4.1.0 imageio >= 2.31.0; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython" wheel >= 0.40.0 diff --git a/requirement.txt b/requirement.txt index 8d8ba55..c46e8b3 100644 --- a/requirement.txt +++ b/requirement.txt @@ -3,7 +3,7 @@ # for images # not for pypy >= 3.10 -pillow >= 9.5.0; platform_python_implementation == "PyPy" and python_version < "3.10" +pillow >= 9.5.0; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython" # for sys info psutil >= 5.9.5 diff --git a/start.ps1 b/start.ps1 deleted file mode 100644 index 3bca460..0000000 --- a/start.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -function run { - python3.11.exe -OO DR.py -} -function viz_run { - python3.11 -OO -m viztracer --output_file ./logs/viz_result.json --open --tracer_entries 10000000 DR.py -} -if ($args -eq "run") { - run -} elseif ($args -eq "viz") { - viz_run -} else { - run -} -pause