Merge remote-tracking branch 'upstream/master'

docs/source/conf.py

@@ -66,9 +66,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.0'
+version = '0.8.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.0'
+release = '0.8.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='slider',
-    version='0.7.0',
+    version='0.8.0',
     description='Utilities for working with osu! files and data',
     author='Joe Jevnik',
     author_email='[email protected]',

slider/__init__.py

@@ -1,4 +1,5 @@
-from .beatmap import Beatmap
+from .beatmap import (Beatmap, Circle, Slider, Spinner, TimingPoint, HitObject,
+                      HoldNote)
 from .client import Client
 from .game_mode import GameMode
 from .mod import Mod
@@ -7,7 +8,7 @@
 from .library import Library
 from .collection import CollectionDB
 
-__version__ = '0.7.0'
+__version__ = '0.8.0'
 
 
 __all__ = [
@@ -19,4 +20,10 @@
     'Position',
     'Replay',
     'CollectionDB',
+    'Circle',
+    'Slider',
+    'Spinner',
+    'TimingPoint',
+    'HitObject',
+    'HoldNote'
 ]

slider/beatmap.py

@@ -255,6 +255,11 @@ class HitObject:
         The hitsound to play when this object is hit.
     addition : str, optional
         Unknown currently.
+    new_combo : bool
+        Whether this element is the start of a new combo.
+    combo_skip : int
+        How many combo colors to skip if this element is the start of a new
+        combo.
     """
     time_related_attributes = frozenset({'time'})
     # must be set by subclasses
@@ -477,6 +482,11 @@ class Circle(HitObject):
         Where this circle appears on the screen.
     time : timedelta
         When this circle appears in the map.
+    new_combo : bool
+        Whether this circle is the start of a new combo.
+    combo_skip : int
+        How many combo colors to skip if this circle is the start of a new
+        combo.
     """
     type_code = 1
 
@@ -524,6 +534,11 @@ class Spinner(HitObject):
         When this spinner ends in the map.
     addition : str
         Hitsound additions.
+    new_combo : bool
+        Whether this spinner is the start of a new combo.
+    combo_skip : int
+        How many combo colors to skip if this spinner is the start of a new
+        combo.
     """
     type_code = 8
     time_related_attributes = frozenset({'time', 'end_time'})
@@ -614,6 +629,11 @@ class Slider(HitObject):
         A list of additions for each edge.
     addition : str
         Hitsound additions.
+    new_combo : bool
+        Whether this slider is the start of a new combo.
+    combo_skip : int
+        How many combo colors to skip if this slider is the start of a new
+        combo.
     """
     type_code = 2
     time_related_attributes = frozenset({'time', 'end_time', 'ms_per_beat'})
@@ -928,6 +948,11 @@ class HoldNote(HitObject):
         Where this HoldNote appears on the screen.
     time : timedelta
         When this HoldNote appears in the map.
+    new_combo : bool
+        Whether this HoldNote is the start of a new combo.
+    combo_skip : int
+        How many combo colors to skip if this HoldNote is the start of a new
+        combo.
 
     Notes
     -----

slider/example_data/beatmaps/__init__.py

@@ -1,4 +1,4 @@
-from pkg_resources import resource_filename
+from pathlib import Path
 
 from slider import Beatmap
 
@@ -11,12 +11,7 @@ def example_beatmap(name):
     name : str
         The name of the example file to open.
     """
-    return Beatmap.from_path(
-        resource_filename(
-            __name__,
-            name,
-        ),
-    )
+    return Beatmap.from_path(Path(__file__).parent / name)
 
 
 _sendan_life_versions = frozenset({

slider/example_data/collections/__init__.py

@@ -1,4 +1,4 @@
-from pkg_resources import resource_filename
+from pathlib import Path
 
 from slider import CollectionDB
 
@@ -11,12 +11,7 @@ def example_collection(name):
     name : str
         The name of the example file to open.
     """
-    return CollectionDB.from_path(
-        resource_filename(
-            __name__,
-            name,
-        ),
-    )
+    return CollectionDB.from_path(Path(__file__).parent / name)
 
 
 def test_db():