Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 642491f410 | |||
| c9f1a72dc8 | |||
| d4f712e826 | |||
| a8cd1bc89d | |||
| e5bd157c62 | |||
| 63e32758c4 | |||
| 4b2f5f5ba7 | |||
| 068f538643 | |||
| b1b647d1ea |
@@ -17,7 +17,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Python setup
|
||||
uses: actions/setup-python@v4
|
||||
uses: actions/setup-python@v5.1.1
|
||||
with:
|
||||
python-version: ${{ matrix.python_version }}
|
||||
architecture: x64
|
||||
@@ -63,7 +63,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Python setup
|
||||
uses: actions/setup-python@v4
|
||||
uses: actions/setup-python@v5.1.1
|
||||
with:
|
||||
python-version: ${{ matrix.python_version }}
|
||||
architecture: ${{ matrix.target }}
|
||||
@@ -99,7 +99,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Python setup
|
||||
uses: actions/setup-python@v4
|
||||
uses: actions/setup-python@v5.1.1
|
||||
with:
|
||||
python-version: ${{ matrix.python_version }}
|
||||
architecture: x64
|
||||
@@ -137,7 +137,7 @@ jobs:
|
||||
name: wheels
|
||||
|
||||
- name: Python setup
|
||||
uses: actions/setup-python@v4
|
||||
uses: actions/setup-python@v5.1.1
|
||||
with:
|
||||
python-version: ${{ matrix.python_version }}
|
||||
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
* @tsunyoku @cmyui
|
||||
|
||||
# Infrastructure
|
||||
/.github/* @cmyui
|
||||
/tf/* @cmyui
|
||||
/chart/* @cmyui
|
||||
Generated
+3
-3
@@ -4,12 +4,12 @@ version = 3
|
||||
|
||||
[[package]]
|
||||
name = "akatsuki-pp"
|
||||
version = "0.9.5"
|
||||
source = "git+https://github.com/osuAkatsuki/akatsuki-pp-rs?rev=96421f54f435bd5c6aa2d90730512e5672b14609#96421f54f435bd5c6aa2d90730512e5672b14609"
|
||||
version = "1.0.1"
|
||||
source = "git+https://github.com/osuAkatsuki/akatsuki-pp-rs?rev=b96019f50aa7d09bcbde60016481a69df04315e4#b96019f50aa7d09bcbde60016481a69df04315e4"
|
||||
|
||||
[[package]]
|
||||
name = "akatsuki-pp-py"
|
||||
version = "0.9.9"
|
||||
version = "1.0.5"
|
||||
dependencies = [
|
||||
"akatsuki-pp",
|
||||
"pyo3",
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "akatsuki-pp-py"
|
||||
version = "0.9.9"
|
||||
version = "1.0.5"
|
||||
description = "osu! difficulty and pp calculation for all modes"
|
||||
authors = ["Max Ohn <ohn.m@hotmail.de>", "tsunyoku <tsunyoku@gmail.com>"]
|
||||
license = "MIT"
|
||||
@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
|
||||
|
||||
[dependencies]
|
||||
pyo3 = { version = "0.17", features = ["extension-module", "macros"] }
|
||||
akatsuki-pp = { git = "https://github.com/osuAkatsuki/akatsuki-pp-rs", rev = "96421f54f435bd5c6aa2d90730512e5672b14609" }
|
||||
akatsuki-pp = { git = "https://github.com/osuAkatsuki/akatsuki-pp-rs", rev = "b96019f50aa7d09bcbde60016481a69df04315e4" }
|
||||
|
||||
[profile.release]
|
||||
lto = "fat"
|
||||
|
||||
+5
-2
@@ -4,7 +4,7 @@ build-backend = "maturin"
|
||||
|
||||
[project]
|
||||
name = "akatsuki-pp-py"
|
||||
version = "0.9.9"
|
||||
version = "1.0.5"
|
||||
requires-python = ">=3.7"
|
||||
description = "osu! difficulty and pp calculation for all modes"
|
||||
classifiers = [
|
||||
@@ -17,7 +17,10 @@ classifiers = [
|
||||
"Programming Language :: Python :: Implementation :: PyPy",
|
||||
]
|
||||
packages = [{ include = "akatsuki_pp_py" }]
|
||||
authors = [{ name = "Max Ohn", email = "ohn.m@hotmail.de" }, { name = "tsunyoku", email = "tsunyoku@gmail.com" }]
|
||||
authors = [
|
||||
{ name = "Max Ohn", email = "ohn.m@hotmail.de" },
|
||||
{ name = "tsunyoku", email = "tsunyoku@gmail.com" },
|
||||
]
|
||||
readme = "README.md"
|
||||
license = { file = "LICENSE" }
|
||||
repository = "https://github.com/osuAkatsuki/akatsuki-pp-py"
|
||||
|
||||
@@ -268,6 +268,8 @@ impl PyCalculator {
|
||||
n_spinners: attrs.difficulty.n_spinners,
|
||||
stars: attrs.difficulty.stars,
|
||||
max_combo: attrs.difficulty.max_combo,
|
||||
aim_difficult_strain_count: 0.0,
|
||||
speed_difficult_strain_count: 0.0,
|
||||
},
|
||||
pp: attrs.pp,
|
||||
pp_acc: attrs.pp_acc,
|
||||
|
||||
+7
-1
@@ -1,10 +1,10 @@
|
||||
use std::fmt::{Debug, Display, Formatter, Result as FmtResult};
|
||||
|
||||
use pyo3::{pyclass, pymethods};
|
||||
use akatsuki_pp::{
|
||||
catch::CatchDifficultyAttributes, mania::ManiaDifficultyAttributes,
|
||||
osu::OsuDifficultyAttributes, taiko::TaikoDifficultyAttributes, DifficultyAttributes,
|
||||
};
|
||||
use pyo3::{pyclass, pymethods};
|
||||
|
||||
#[pyclass(name = "DifficultyAttributes")]
|
||||
#[derive(Clone, Debug)]
|
||||
@@ -91,6 +91,8 @@ impl Debug for BorrowedDifficultyAttributes<'_> {
|
||||
n_spinners,
|
||||
stars,
|
||||
max_combo,
|
||||
aim_difficult_strain_count,
|
||||
speed_difficult_strain_count,
|
||||
} = attrs;
|
||||
|
||||
debug.field("mode", &0_u8);
|
||||
@@ -109,6 +111,8 @@ impl Debug for BorrowedDifficultyAttributes<'_> {
|
||||
n_spinners,
|
||||
stars,
|
||||
max_combo,
|
||||
aim_difficult_strain_count,
|
||||
speed_difficult_strain_count,
|
||||
}
|
||||
}
|
||||
Self::Taiko(attrs) => {
|
||||
@@ -230,4 +234,6 @@ getters! {
|
||||
n_tiny_droplets as usize: (Catch),
|
||||
ar as f64: (Osu, Catch),
|
||||
hit_window as f64: (Taiko, Mania),
|
||||
aim_difficult_strain_count as f64: (Osu),
|
||||
speed_difficult_strain_count as f64: (Osu),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user