3 Commits

Author SHA1 Message Date
James Wilson 847f9c5175 update pyproject version 2024-05-12 01:05:05 +01:00
James Wilson d6aaa9d5df update crate version 2024-05-12 01:04:54 +01:00
James Wilson 5692dc1548 update pp crate 2024-05-12 01:04:09 +01:00
8 changed files with 12 additions and 27 deletions
+5 -5
View File
@@ -8,7 +8,7 @@ on:
jobs: jobs:
macos: macos:
runs-on: macos-13 runs-on: macos-latest
strategy: strategy:
matrix: matrix:
python_version: ['3.7', '3.8', '3.9', '3.10', '3.11'] python_version: ['3.7', '3.8', '3.9', '3.10', '3.11']
@@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Python setup - name: Python setup
uses: actions/setup-python@v5.1.1 uses: actions/setup-python@v4
with: with:
python-version: ${{ matrix.python_version }} python-version: ${{ matrix.python_version }}
architecture: x64 architecture: x64
@@ -63,7 +63,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Python setup - name: Python setup
uses: actions/setup-python@v5.1.1 uses: actions/setup-python@v4
with: with:
python-version: ${{ matrix.python_version }} python-version: ${{ matrix.python_version }}
architecture: ${{ matrix.target }} architecture: ${{ matrix.target }}
@@ -99,7 +99,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Python setup - name: Python setup
uses: actions/setup-python@v5.1.1 uses: actions/setup-python@v4
with: with:
python-version: ${{ matrix.python_version }} python-version: ${{ matrix.python_version }}
architecture: x64 architecture: x64
@@ -137,7 +137,7 @@ jobs:
name: wheels name: wheels
- name: Python setup - name: Python setup
uses: actions/setup-python@v5.1.1 uses: actions/setup-python@v4
with: with:
python-version: ${{ matrix.python_version }} python-version: ${{ matrix.python_version }}
-6
View File
@@ -1,6 +0,0 @@
* @tsunyoku @cmyui
# Infrastructure
/.github/* @cmyui
/tf/* @cmyui
/chart/* @cmyui
Generated
+3 -3
View File
@@ -4,12 +4,12 @@ version = 3
[[package]] [[package]]
name = "akatsuki-pp" name = "akatsuki-pp"
version = "1.0.1" version = "0.9.6"
source = "git+https://github.com/osuAkatsuki/akatsuki-pp-rs?rev=b96019f50aa7d09bcbde60016481a69df04315e4#b96019f50aa7d09bcbde60016481a69df04315e4" source = "git+https://github.com/osuAkatsuki/akatsuki-pp-rs?rev=5c97207f25cf9fd07252dca1ba68d785e2147ce1#5c97207f25cf9fd07252dca1ba68d785e2147ce1"
[[package]] [[package]]
name = "akatsuki-pp-py" name = "akatsuki-pp-py"
version = "1.0.5" version = "1.0.1"
dependencies = [ dependencies = [
"akatsuki-pp", "akatsuki-pp",
"pyo3", "pyo3",
+2 -2
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "akatsuki-pp-py" name = "akatsuki-pp-py"
version = "1.0.5" version = "1.0.2"
description = "osu! difficulty and pp calculation for all modes" description = "osu! difficulty and pp calculation for all modes"
authors = ["Max Ohn <ohn.m@hotmail.de>", "tsunyoku <tsunyoku@gmail.com>"] authors = ["Max Ohn <ohn.m@hotmail.de>", "tsunyoku <tsunyoku@gmail.com>"]
license = "MIT" license = "MIT"
@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
[dependencies] [dependencies]
pyo3 = { version = "0.17", features = ["extension-module", "macros"] } pyo3 = { version = "0.17", features = ["extension-module", "macros"] }
akatsuki-pp = { git = "https://github.com/osuAkatsuki/akatsuki-pp-rs", rev = "b96019f50aa7d09bcbde60016481a69df04315e4" } akatsuki-pp = { git = "https://github.com/osuAkatsuki/akatsuki-pp-rs", rev = "d6b4cbb90d12e06fa7b9405d87b9922e08522775" }
[profile.release] [profile.release]
lto = "fat" lto = "fat"
+1 -1
View File
@@ -4,7 +4,7 @@ build-backend = "maturin"
[project] [project]
name = "akatsuki-pp-py" name = "akatsuki-pp-py"
version = "1.0.5" version = "1.0.2"
requires-python = ">=3.7" requires-python = ">=3.7"
description = "osu! difficulty and pp calculation for all modes" description = "osu! difficulty and pp calculation for all modes"
classifiers = [ classifiers = [
-2
View File
@@ -268,8 +268,6 @@ impl PyCalculator {
n_spinners: attrs.difficulty.n_spinners, n_spinners: attrs.difficulty.n_spinners,
stars: attrs.difficulty.stars, stars: attrs.difficulty.stars,
max_combo: attrs.difficulty.max_combo, max_combo: attrs.difficulty.max_combo,
aim_difficult_strain_count: 0.0,
speed_difficult_strain_count: 0.0,
}, },
pp: attrs.pp, pp: attrs.pp,
pp_acc: attrs.pp_acc, pp_acc: attrs.pp_acc,
+1 -7
View File
@@ -1,10 +1,10 @@
use std::fmt::{Debug, Display, Formatter, Result as FmtResult}; use std::fmt::{Debug, Display, Formatter, Result as FmtResult};
use pyo3::{pyclass, pymethods};
use akatsuki_pp::{ use akatsuki_pp::{
catch::CatchDifficultyAttributes, mania::ManiaDifficultyAttributes, catch::CatchDifficultyAttributes, mania::ManiaDifficultyAttributes,
osu::OsuDifficultyAttributes, taiko::TaikoDifficultyAttributes, DifficultyAttributes, osu::OsuDifficultyAttributes, taiko::TaikoDifficultyAttributes, DifficultyAttributes,
}; };
use pyo3::{pyclass, pymethods};
#[pyclass(name = "DifficultyAttributes")] #[pyclass(name = "DifficultyAttributes")]
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@@ -91,8 +91,6 @@ impl Debug for BorrowedDifficultyAttributes<'_> {
n_spinners, n_spinners,
stars, stars,
max_combo, max_combo,
aim_difficult_strain_count,
speed_difficult_strain_count,
} = attrs; } = attrs;
debug.field("mode", &0_u8); debug.field("mode", &0_u8);
@@ -111,8 +109,6 @@ impl Debug for BorrowedDifficultyAttributes<'_> {
n_spinners, n_spinners,
stars, stars,
max_combo, max_combo,
aim_difficult_strain_count,
speed_difficult_strain_count,
} }
} }
Self::Taiko(attrs) => { Self::Taiko(attrs) => {
@@ -234,6 +230,4 @@ getters! {
n_tiny_droplets as usize: (Catch), n_tiny_droplets as usize: (Catch),
ar as f64: (Osu, Catch), ar as f64: (Osu, Catch),
hit_window as f64: (Taiko, Mania), hit_window as f64: (Taiko, Mania),
aim_difficult_strain_count as f64: (Osu),
speed_difficult_strain_count as f64: (Osu),
} }
-1
View File
@@ -1,4 +1,3 @@
#![allow(unexpected_cfgs)]
#![deny(clippy::all, nonstandard_style, rust_2018_idioms, unused, warnings)] #![deny(clippy::all, nonstandard_style, rust_2018_idioms, unused, warnings)]
use self::{ use self::{