Merge 96da036 into 972ed59

.coveragerc

@@ -9,3 +9,12 @@ omit =
     time_trials/*
     doctests.py
 
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise AssertionError
+    raise NotImplementedError

dev.requirements.txt

@@ -1,4 +1,7 @@
+ipython
 pytest
 coverage
 coveralls
 setuptools
+Sphinx==3.2.1
+sphinx-rtd-theme==0.5.0

dicetables/__init__.py

@@ -7,5 +7,6 @@
 from dicetables.eventsinfo import (EventsCalculations, EventsInformation,
                                    events_range, mean, stddev, percentage_points, percentage_axes, stats,
                                    full_table_string)
-from dicetables.parser import Parser, ParseError, LimitsError
+from dicetables.parser import Parser, ParseError
+from dicetables.tools.limit_checker import LimitsError
 from dicetables.roller import Roller

dicetables/bestworstmid.py

@@ -68,7 +68,7 @@ class BestOfDicePool(DicePool):
     BestOfDicePool(Die(6), 4, 3) is the best 3 rolls from four six-sided dice.
     """
 
-    def __init__(self, input_die, pool_size, select):
+    def __init__(self, input_die: ProtoDie, pool_size: int, select: int):
         super(BestOfDicePool, self).__init__(input_die, pool_size, select)
 
     def _generate_dict(self):
@@ -84,7 +84,7 @@ class WorstOfDicePool(DicePool):
     WorstOfDicePool(Die(6), 4, 3) is the worst 3 rolls from four six-sided dice.
     """
 
-    def __init__(self, input_die, pool_size, select):
+    def __init__(self, input_die: ProtoDie, pool_size: int, select: int):
         super(WorstOfDicePool, self).__init__(input_die, pool_size, select)
 
     def _generate_dict(self):
@@ -103,7 +103,7 @@ class UpperMidOfDicePool(DicePool):
     (1, 1, 2, 3, 4), select=3 takes (1, 2, 3) and select=2 takes (2, 3).
     """
 
-    def __init__(self, input_die, pool_size, select):
+    def __init__(self, input_die: ProtoDie, pool_size: int, select: int):
         super(UpperMidOfDicePool, self).__init__(input_die, pool_size, select)
 
     def _generate_dict(self):
@@ -123,7 +123,7 @@ class LowerMidOfDicePool(DicePool):
     (1, 1, 2, 3, 4), select=3 takes (1, 2, 3) and select=2 takes (1, 2).
     """
 
-    def __init__(self, input_die, pool_size, select):
+    def __init__(self, input_die: ProtoDie, pool_size: int, select: int):
         super(LowerMidOfDicePool, self).__init__(input_die, pool_size, select)
 
     def _generate_dict(self):

dicetables/dieevents.py

@@ -355,7 +355,7 @@ class ExplodingOn(ProtoDie):
     with size which gets overshadowed by the first factor.
     """
 
-    def __init__(self, input_die: ProtoDie, explodes_on: Iterable, explosions=2):
+    def __init__(self, input_die: ProtoDie, explodes_on: Iterable[int], explosions: int=2):
         """
 
         :param input_die: Die, ModDie, WeightedDie, ModWeightedDie, StrongDie or subclass of ProtoDie
@@ -449,7 +449,7 @@ def __repr__(self):
         return 'ExplodingOn({!r}, {}, {})'.format(self._original, self._explodes_on, self._explosions)
 
 
-def remove_duplicates(input_tuple):
+def remove_duplicates(input_tuple: Iterable[int]) -> Tuple[int, ...]:
     list_version = []
     for val in input_tuple:
         if val not in list_version: