Merge pull request #14 from Bernardo-MG/develop

Develop

Author: Bernardo-MG

.gitattributes

@@ -0,0 +1,30 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Known text files
+*.css           text diff=css
+*.js            text
+*.json          text
+*.htm           text diff=html
+*.html          text diff=html
+*.properties    text
+*.sh            text
+*.md            text
+*.txt           text
+*.xml           text
+*.yml           text
+
+# Known source files
+*.pxd		    text diff=python
+*.py 		    text diff=python
+*.py3 		    text diff=python
+*.pyw 		    text diff=python
+*.pyx  		    text diff=python
+
+# Known binary files
+*.db		    binary
+*.p 		    binary
+*.pkl 		    binary
+*.pyc 		    binary
+*.pyd		    binary
+*.pyo 		    binary

.travis.yml

@@ -25,16 +25,13 @@ addons:
 
 before_install:
   # Gets scripts
-  - git clone -b v1.1.3 --single-branch https://github.com/Bernardo-MG/ci-shell-scripts.git ~/.scripts
+  - git clone -b v1.2.0 --single-branch https://github.com/Bernardo-MG/ci-shell-scripts.git ~/.scripts
   # Sets scripts as executable
   - chmod -R +x ~/.scripts/*
   # Prepares CI environment
   - source ~/.scripts/travis/load-travis-environment.sh
+  - source ~/.scripts/travis/load-travis-environment-python.sh
 install:
-  # tox is required for the tests
-  - pip install tox
-  # sphinx is required for the docs
-  - pip install sphinx
   # Dependencies
   - pip install --upgrade -r requirements.txt
 script:

MANIFEST.in

@@ -1,8 +1,6 @@
 # Miscellany files
 include LICENSE
 include README.rst
-include Makefile
-include make.bat
 include tox.ini
 include requirements.txt
 include .coveragerc

Makefile

@@ -55,9 +55,10 @@ The project has been tested in the following versions of the interpreter:
 - Python 3.6
 
 All other dependencies are indicated on the requirements.txt file.
-The included makefile can install them with the command:
 
-``$ make requirements``
+These can be installed with:
+
+``$ pip install --upgrade -r requirements.txt``
 
 Installing
 ~~~~~~~~~~
@@ -67,11 +68,9 @@ to install it. For this use the following command;
 
 ``$ pip install dice-notation``
 
-If manual installation is required, the project includes a setup.py file, along
-a makefile allowing direct installation of the library, which can be done with
-the following command:
+If needed, manual installation is possible:
 
-``$ make install``
+``$ python setup.py install``
 
 Usage
 -----
@@ -94,6 +93,19 @@ needed, which will generate a new random value each time it is called::
     print(dice.roll())
     print(dice.roll())
 
+Testing
+-------
+
+The tests included with the project can be run with:
+
+``$ python setup.py test``
+
+This will delegate the execution to tox.
+
+It is possible to run just one of the test profiles, in this case the py36 profile:
+
+``$ python setup.py test -p "py36"``
+
 Collaborate
 -----------
 

README.rst

@@ -7,5 +7,5 @@
     :license: MIT, see LICENSE for more details.
 """
 
-__version__ = '1.0.3'
+__version__ = '1.0.5'
 __license__ = 'MIT'

dice_notation/__init__.py

@@ -2,4 +2,4 @@
 
 from dice_notation.parser.dice import DiceParser
 
-__all__ = ['DiceParser']
+__all__ = ['DiceParser']

dice_notation/parser/__init__.py

@@ -64,4 +64,4 @@ def __init__(self, **kw):
                   tabmodule=self.tabmodule)
 
     def parse(self, value):
-        return yacc.parse(value)
+        return yacc.parse(value)

dice_notation/parser/common.py

@@ -90,4 +90,4 @@ def p_error(self, p):
         if p:
             self._logger.error("Syntax error at '%s'", p.value)
         else:
-            self._logger.error("Syntax error at EOF")
+            self._logger.error("Syntax error at EOF")

dice_notation/parser/dice.py

@@ -256,4 +256,4 @@ def operate(self):
         return result
 
     def roll(self):
-        return self.operate()
+        return self.operate()