Skip to content

Commit 0ad019a

Browse files
committed
Merge branch 'antlr4' into develop
2 parents df7db09 + 4698f41 commit 0ad019a

5 files changed

Lines changed: 6 additions & 20 deletions

File tree

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ And then use it to parse a dice notation expression::
103103
The result can be accessed just by calling the 'value' method as many times as
104104
needed, which will generate a new random value each time it is called::
105105

106-
print(dice.value())
107-
print(dice.value())
106+
print(dice.roll())
107+
print(dice.roll())
108108

109109
Testing
110110
-------
@@ -117,7 +117,7 @@ This will delegate the execution to tox.
117117

118118
It is possible to run just one of the test profiles, in this case the py36 profile:
119119

120-
``python setup.py test -p "py36"``
120+
``python setup.py test -p "py38"``
121121

122122
Collaborate
123123
-----------

dice_notation/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
:license: MIT, see LICENSE for more details.
88
"""
99

10-
__version__ = '1.0.6'
10+
__version__ = '1.1.0'
1111
__license__ = 'MIT'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Notation module
33
===============
44

5-
.. automodule:: dice_notation.parser.notation
5+
.. automodule:: dice_notation.algebra
66
:members:
77
:undoc-members:
88
:inherited-members:

docs/source/code/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ Code docs
55
.. toctree::
66

77
dice
8-
notation
8+
algebra
99
parser_common
1010
parser_dice

test.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)