fix: remove 2019 usage

fix: redo imports

.github/workflows/publish.yml

@@ -34,8 +34,8 @@ jobs:
 
       - name: Install built wheel - x86_64
         run: |
-          pip install rosu_pp_py --no-index --find-links dist --force-reinstall
+          pip install akatsuki_pp_py --no-index --find-links dist --force-reinstall
-          python -c "import rosu_pp_py"
+          python -c "import akatsuki_pp_py"
 
       - name: Build wheels - universal2
         uses: messense/maturin-action@v1
@@ -44,8 +44,8 @@ jobs:
   
       - name: Install built wheel - universal2
         run: |
-          pip install rosu_pp_py --no-index --find-links dist --force-reinstall
+          pip install akatsuki_pp_py --no-index --find-links dist --force-reinstall
-          python -c "import rosu_pp_py"
+          python -c "import akatsuki_pp_py"
 
       - name: Upload wheels
         uses: actions/upload-artifact@v3
@@ -83,8 +83,8 @@ jobs:
 
       - name: Install built wheel
         run: |
-          pip install rosu_pp_py --no-index --find-links dist --force-reinstall
+          pip install akatsuki_pp_py --no-index --find-links dist --force-reinstall
-          python -c "import rosu_pp_py"
+          python -c "import akatsuki_pp_py"
 
       - name: Upload wheels
         uses: actions/upload-artifact@v3
@@ -117,8 +117,8 @@ jobs:
     - name: Install built wheel
       if: matrix.target == 'x86_64'
       run: |
-        pip install rosu_pp_py --no-index --find-links dist --force-reinstall
+        pip install akatsuki_pp_py --no-index --find-links dist --force-reinstall
-        python -c "import rosu_pp_py"
+        python -c "import akatsuki_pp_py"
 
     - name: Upload wheels
       uses: actions/upload-artifact@v3

Cargo.lock

@@ -2,6 +2,19 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "akatsuki-pp"
+version = "0.9.3"
+source = "git+https://github.com/osuAkatsuki/akatsuki-pp-rs#4140dc70840044d9d4313731ce04c5793098ed62"
+
+[[package]]
+name = "akatsuki-pp-py"
+version = "0.9.3"
+dependencies = [
+ "akatsuki-pp",
+ "pyo3",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -22,21 +35,21 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "indoc"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05a0bd019339e5d968b37855180087b7b9d512c5046fbd244cf8c95687927d6e"
+checksum = "da2d6f23ffea9d7e76c53eee25dfb67bcd8fde7f1198b0855350698c9f07c780"
 
 [[package]]
 name = "libc"
-version = "0.2.126"
+version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
 [[package]]
 name = "lock_api"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -53,9 +66,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.13.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
 
 [[package]]
 name = "parking_lot"
@@ -69,9 +82,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.3"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
 dependencies = [
  "cfg-if",
  "libc",
@@ -82,18 +95,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.40"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
+checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.17.2"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201b6887e5576bf2f945fe65172c1fcbf3fcf285b23e4d71eb171d9736e38d32"
+checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543"
 dependencies = [
  "cfg-if",
  "indoc",
@@ -108,9 +121,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.17.2"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf0708c9ed01692635cbf056e286008e5a2927ab1a5e48cdd3aeb1ba5a6fef47"
+checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -118,9 +131,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.17.2"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90352dea4f486932b72ddf776264d293f85b79a1d214de1d023927b41461132d"
+checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -128,9 +141,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.17.2"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb24b804a2d9e88bfcc480a5a6dd76f006c1e3edaf064e8250423336e2cd79d"
+checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -140,9 +153,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.17.2"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f22bb49f6a7348c253d7ac67a6875f2dc65f36c2ae64a82c381d528972bea6d6"
+checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -151,36 +164,22 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.20"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.13"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "rosu-pp"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70c4f12b757391bb233619b0bb267e424bc7395dcbfa1f85212f16b734784a07"
-
-[[package]]
-name = "rosu-pp-py"
-version = "0.9.1"
-dependencies = [
- "pyo3",
- "rosu-pp",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -189,15 +188,15 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "smallvec"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
 [[package]]
 name = "syn"
-version = "1.0.98"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -206,61 +205,75 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1"
+checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.1"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
 
 [[package]]
 name = "unindent"
-version = "0.1.9"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52fee519a3e570f7df377a06a1a7775cdbfb7aa460be7e08de2b1f0e69973a44"
+checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
 
 [[package]]
 name = "windows-sys"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
+ "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
  "windows_i686_gnu",
  "windows_i686_msvc",
  "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
  "windows_x86_64_msvc",
 ]
 
 [[package]]
-name = "windows_aarch64_msvc"
+name = "windows_aarch64_gnullvm"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"

Cargo.toml

@@ -1,18 +1,18 @@
 [package]
-name = "rosu-pp-py"
+name = "akatsuki-pp-py"
-version = "0.9.1"
+version = "0.9.3"
 description = "osu! difficulty and pp calculation for all modes"
-authors = ["Max Ohn <ohn.m@hotmail.de>"]
+authors = ["Max Ohn <ohn.m@hotmail.de>", "tsunyoku <tsunyoku@gmail.com>"]
 license = "MIT"
 edition = "2021"
 
 [lib]
-name = "rosu_pp_py"
+name = "akatsuki_pp_py"
 crate-type = ["cdylib"]
 
 [dependencies]
 pyo3 = { version = "0.17", features = ["extension-module", "macros"] }
-rosu-pp = { version = "0.9.1" }
+akatsuki-pp = { git = "https://github.com/osuAkatsuki/akatsuki-pp-rs", rev = "61cb1564b4fdbffb21748b35f58805327dc4aac4" }
 
 [profile.release]
 lto = "fat"

README.md

@@ -1,4 +1,4 @@
-# rosu-pp-py
+# akatsuki-pp-py
 
 Difficulty and performance calculation for all [osu!](https://osu.ppy.sh/) modes.
 
@@ -21,7 +21,7 @@ Additionally, the following error types are exposed:
 - `ParseError`: Failed to parse a beatmap
 - `KwargsError`: Invalid kwargs were provided
 
-## How to use rosu-pp-py
+## How to use akatsuki-pp-py
 
 1) The first step is to create a new `Beatmap` instance by providing appropriate kwargs.
 Either of the kwargs `path`, `content`, or `bytes` **must** be given. The kwargs `ar`, `cs`, `hp`, and `od` are optional.
@@ -50,7 +50,7 @@ calc.set_mods(8 + 64) # HDDT
 ## Example
 
 ```py
-from rosu_pp_py import Beatmap, Calculator
+from akatsuki_pp_py import Beatmap, Calculator
 
 map = Beatmap(path = "./maps/100.osu")
 calc = Calculator(mods = 8)
@@ -87,15 +87,14 @@ Installing rosu-pp-py requires a [supported version of Python and Rust](https://
 Once [Python](https://www.python.org/downloads/) and [Rust](https://www.rust-lang.org/learn/get-started) and ready to go, you can install the project with pip:
 
 ```sh
-$ pip install rosu-pp-py
+$ pip install akatsuki-pp-py
 ```
 or
 ```
-$ pip install git+https://github.com/MaxOhn/rosu-pp-py
+$ pip install git+https://github.com/osuAkatsuki/akatsuki-pp-py
 ```
 
 ## Learn More
-- [rosu-pp documentation](https://docs.rs/rosu-pp/latest/rosu_pp/)
 - [Rust documentation](https://www.rust-lang.org).
 - [PyO3 documentation](https://pyo3.rs/).
 - [Python documentation](https://docs.python.org/3/).

pyproject.toml

@@ -3,8 +3,8 @@ requires = ["maturin>=0.12,<0.13", "setuptools", "setuptools-rust", "wheel"]
 build-backend = "maturin"
 
 [project]
-name = "rosu-pp-py"
+name = "akatsuki-pp-py"
-version = "0.9.1"
+version = "0.9.3"
 requires-python = ">=3.7"
 description = "osu! difficulty and pp calculation for all modes"
 classifiers = [
@@ -16,9 +16,9 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
-packages = [{ include = "rosu_pp_py" }]
+packages = [{ include = "akatsuki_pp_py" }]
-authors = [{ name = "Max Ohn", email = "ohn.m@hotmail.de" }]
+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/MaxOhn/rosu-pp-py"
+repository = "https://github.com/osuAkatsuki/akatsuki-pp-py"
 keywords = ["osu", "pp", "stars", "performance", "difficulty"]

src/beatmap.rs

@@ -1,5 +1,5 @@
 use pyo3::{exceptions::PyTypeError, pyclass, pymethods, types::PyDict, PyResult};
-use rosu_pp::Beatmap;
+use akatsuki_pp::Beatmap;
 
 use crate::error::{ErrorExt, KwargsError, ParseError};
 

src/calculator.rs

@@ -1,10 +1,10 @@
+use akatsuki_pp::{AnyPP, AnyStars, DifficultyAttributes, GameMode};
 use pyo3::{
     exceptions::{PyTypeError, PyValueError},
     pyclass, pymethods,
     types::PyDict,
     PyResult,
 };
-use rosu_pp::{AnyPP, AnyStars, DifficultyAttributes, GameMode};
 
 use crate::{
     beatmap::PyBeatmap, diff_attrs::PyDifficultyAttributes, error::KwargsError,

src/diff_attrs.rs

@@ -1,10 +1,10 @@
 use std::fmt::{Debug, Display, Formatter, Result as FmtResult};
 
-use pyo3::{pyclass, pymethods};
+use akatsuki_pp::{
-use rosu_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) => {

src/error.rs

@@ -2,8 +2,8 @@ use std::{error::Error, fmt::Write};
 
 use pyo3::{create_exception, exceptions::PyException};
 
-create_exception!(rosu_pp_py, KwargsError, PyException);
+create_exception!(akatsuki_pp_py, KwargsError, PyException);
-create_exception!(rosu_pp_py, ParseError, PyException);
+create_exception!(akatsuki_pp_py, ParseError, PyException);
 
 pub trait ErrorExt {
     fn unwind(&self, cause: &str) -> String;

src/lib.rs

@@ -21,7 +21,7 @@ mod perf_attrs;
 mod strains;
 
 #[pymodule]
-fn rosu_pp_py(py: Python<'_>, m: &PyModule) -> PyResult<()> {
+fn akatsuki_pp_py(py: Python<'_>, m: &PyModule) -> PyResult<()> {
     m.add_class::<PyBeatmap>()?;
     m.add_class::<PyCalculator>()?;
 

src/map_attrs.rs

@@ -1,7 +1,7 @@
 use std::fmt::{Display, Formatter, Result as FmtResult};
 
 use pyo3::{pyclass, pymethods};
-use rosu_pp::{beatmap::BeatmapAttributes, Beatmap};
+use akatsuki_pp::{beatmap::BeatmapAttributes, Beatmap};
 
 #[pyclass(name = "BeatmapAttributes")]
 pub struct PyBeatmapAttributes {

src/perf_attrs.rs

@@ -1,7 +1,7 @@
 use std::fmt::{Debug, Display, Formatter, Result as FmtResult};
 
 use pyo3::{pyclass, pymethods};
-use rosu_pp::{
+use akatsuki_pp::{
     catch::CatchPerformanceAttributes, mania::ManiaPerformanceAttributes,
     osu::OsuPerformanceAttributes, taiko::TaikoPerformanceAttributes, PerformanceAttributes,
 };

src/strains.rs

@@ -1,7 +1,7 @@
 use std::fmt::{Debug, Display, Formatter, Result as FmtResult};
 
 use pyo3::{ffi, pyclass, pymethods, types::PyList, IntoPy, IntoPyPointer, Py, PyObject, Python};
-use rosu_pp::{
+use akatsuki_pp::{
     catch::CatchStrains, mania::ManiaStrains, osu::OsuStrains, taiko::TaikoStrains, Strains,
 };