Merge pull request #11 from Bernardo-MG/develop

Develop

Author: Bernardo-MG

.travis.yml

@@ -4,26 +4,21 @@
 # Using Python for the project
 language: python
 python:
-  # Python 2.6 is obsolete
-  #- "2.6"
-  # Python 2.7 is set to test the docs in the configuration matrix
-  #- "2.7"
-  # Python 3.2 is obsolete
-  #- "3.2"
-  - "3.3"
+  - "2.7"
   - "3.4"
-  # Python 3.5 is set to test and deploy the docs, and to run the coverage report, in the configuration matrix
-  #- "3.5"
-  - "pypy"
-  - "pypy3"
+  - "3.5"
+  # Python 3.6 is set to test and deploy the docs in the configuration matrix
+  #- "3.6"
+  # PyPy currently is not working with the required dependencies
+  #- "pypy"
+  #- "pypy3"
+env:
+  - TEST_DOCS=true
 matrix:
   include:
-    # Tests docs
-    - python: "2.7"
-      env: TEST_DOCS=true
     # Tests and deploys docs, also runs coverage report
-    - python: "3.5"
-      env: COVERAGE=true TEST_DOCS=true DEPLOY_DOCS=true
+    - python: "3.6"
+      env: TEST_DOCS=true DEPLOY_DOCS=true
 addons:
   apt:
     packages:
@@ -36,7 +31,6 @@ before_install:
   - 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
@@ -45,14 +39,8 @@ install:
   # Dependencies
   - pip install --upgrade -r requirements.txt
 script:
-  # Code is checked
-  - ~/.scripts/python/run_tests.sh true check
-  # Tests are run
-  - ~/.scripts/python/run_tests.sh true $PYTHON_VERSION_TEST
   # Documentation tests are run
   - ~/.scripts/python/run_tests.sh $DO_TEST_DOCS docs
-  # Documentation tests are run
-  - ~/.scripts/python/run_tests.sh $DO_COVERAGE coverage
 after_success:
   # Documentation deployment
   - ~/.scripts/sphinx/build-html.sh $DO_DEPLOY_DOCS docs

README.rst

@@ -22,7 +22,7 @@ operating with it on any Python application.
     :target: http://docs.wandrell.com/dice-notation-python
     :alt: Dice Notation Tools for Python latest documentation
 .. image:: https://img.shields.io/badge/docs-develop-blue.svg
-    :target: http://docs.wandrell.com/development/dice-notation-python/
+    :target: http://docs.wandrell.com/development/dice-notation-python
     :alt: Dice Notation Tools for Python development documentation
 
 Features
@@ -51,9 +51,9 @@ Prerequisites
 The project has been tested in the following versions of the interpreter:
 
 - Python 2.7
-- Python 3.3
 - Python 3.4
 - Python 3.5
+- Python 3.6
 - Pypy
 - Pypy 3
 
@@ -124,8 +124,8 @@ License
 The project has been released under the `MIT License`_.
 
 .. _GitHub project page: https://github.com/Bernardo-MG/dice-notation-python
-.. _latest docs: http://docs.wandrell.com/dice-notation-python/
-.. _development docs: http://docs.wandrell.com/development/dice-notation-python/
+.. _latest docs: http://docs.wandrell.com/dice-notation-python
+.. _development docs: http://docs.wandrell.com/development/dice-notation-python
 .. _Pypi package: https://pypi.python.org/pypi/dice-notation
 .. _MIT License: http://www.opensource.org/licenses/mit-license.php
 .. _project issues tracker: https://github.com/Bernardo-MG/dice-notation-python/issues

dice_notation/__init__.py

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

docs/source/conf.py

@@ -97,7 +97,7 @@
 
 # Theme options.
 html_theme_options = {
-    'keywords': '',
+    'keywords': 'dice, dice notation, parser, Python, RPG',
     'author_name': ','.join(authors),
     'author_url': 'https://github.com/Bernardo-MG',
     'twitter_id': '@Wandrell_BMG',

requirements.txt

@@ -4,7 +4,7 @@ twine==1.8.1
 
 # Documentation
 sphinx-docs-theme==0.2.3
-Pygments==2.1.3
+Pygments==2.2.0
 
 # Parsing
-ply==3.9
+ply==3.10

setup.py

@@ -70,7 +70,7 @@ def run_tests(self):
     keywords=['dice', 'dice notation', 'rpg', 'parser'],
     platforms='any',
     classifiers=[
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',

tests/parser/test_dice_parser_invalid.py

@@ -23,7 +23,7 @@ def setUp(self):
         """
         self.parser = DiceParser()
 
-    def test_noNumbers(self):
+    def test_onlySeparator(self):
         """
         Tests that the dice separator can't be parsed.
         """
@@ -71,7 +71,7 @@ def test_negativeQuantity(self):
 
     def test_negativeSides(self):
         """
-        Tests that a expression with an incomplete dice can't be parsed.
+        Tests that a dice with a negative side can't be parsed.
         """
         result = self.parser.parse("1d-6")
 

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{27,33,34,35},
+    py{27,34,35,36},
     pypy{,3},
     check,
     docs,
@@ -9,13 +9,15 @@ skip_missing_interpreters =
     true
 
 [testenv]
+# Default environment
 deps =
     -r{toxinidir}/requirements.txt
     nose
 commands =
     nosetests
 
 [testenv:coverage]
+# Generates coverage report
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 deps =
     -r{toxinidir}/requirements.txt
@@ -27,6 +29,7 @@ commands =
     coveralls
 
 [testenv:check]
+# Checks code rules
 deps =
     -r{toxinidir}/requirements.txt
     docutils
@@ -39,6 +42,7 @@ commands =
     flake8 dice_notation
 
 [testenv:docs]
+# Validates the project docs
 changedir =
     docs/source
 deps =