From a95a4c54dd4c79f06d66f8d1ec392ed1320a7bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?= Date: Sun, 23 Oct 2016 17:25:36 +0200 Subject: [PATCH 1/7] Added keywords to the docs --- README.rst | 6 +++--- docs/source/conf.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 5a637dc..ed1227b 100644 --- a/README.rst +++ b/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 @@ -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 diff --git a/docs/source/conf.py b/docs/source/conf.py index 20d0068..8b1282b 100644 --- a/docs/source/conf.py +++ b/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', From f77764d48d46e51fb655c6e9fccad5cb40843a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?= Date: Wed, 26 Oct 2016 21:44:07 +0200 Subject: [PATCH 2/7] Corrections to test descriptions --- tests/parser/test_dice_parser_invalid.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/parser/test_dice_parser_invalid.py b/tests/parser/test_dice_parser_invalid.py index ba6fdea..ed15d11 100644 --- a/tests/parser/test_dice_parser_invalid.py +++ b/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") From 224597820cfd217e9fe3754acd8eeb6355055aec Mon Sep 17 00:00:00 2001 From: Bernardo Date: Sat, 18 Mar 2017 13:09:18 +0100 Subject: [PATCH 3/7] Raised version --- dice_notation/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dice_notation/__init__.py b/dice_notation/__init__.py index 5198299..a689d18 100644 --- a/dice_notation/__init__.py +++ b/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' diff --git a/setup.py b/setup.py index eef7f1d..383357d 100644 --- a/setup.py +++ b/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', From 28ae62e59653af8e2d5622c6d0443ca1e6cf5631 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Sat, 18 Mar 2017 13:13:38 +0100 Subject: [PATCH 4/7] Updated dependencies --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 21fa0f2..b8ed97f 100644 --- a/requirements.txt +++ b/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 \ No newline at end of file +ply==3.10 \ No newline at end of file From 86d6442f8c1b3c570db44f036b21c53d6c0f2a5f Mon Sep 17 00:00:00 2001 From: Bernardo Date: Sat, 18 Mar 2017 13:39:36 +0100 Subject: [PATCH 5/7] Updated tox and travis files --- .travis.yml | 29 ++++++++--------------------- tox.ini | 6 +++++- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20b2e38..cd93a26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,26 +4,20 @@ # 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" + - "3.5" + # Python 3.6 is set to test and deploy the docs in the configuration matrix + #- "3.6" - "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 +30,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 +38,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 diff --git a/tox.ini b/tox.ini index 6051a66..70599e7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{27,33,34,35}, + py{27,34,35,36}, pypy{,3}, check, docs, @@ -9,6 +9,7 @@ skip_missing_interpreters = true [testenv] +# Default environment deps = -r{toxinidir}/requirements.txt nose @@ -16,6 +17,7 @@ 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 = From 12c8a3d37462cba3094788b8f474048d02b22ab5 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Sat, 18 Mar 2017 13:45:01 +0100 Subject: [PATCH 6/7] Disabled PyPy on tests --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd93a26..4e078d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,9 @@ python: - "3.5" # Python 3.6 is set to test and deploy the docs in the configuration matrix #- "3.6" - - "pypy" - - "pypy3" + # PyPy currently is not working with the required dependencies + #- "pypy" + #- "pypy3" env: - TEST_DOCS=true matrix: From 60de77f880eeb290f2a7d32a61a54b3096955b59 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Sat, 18 Mar 2017 13:52:00 +0100 Subject: [PATCH 7/7] Updated readme --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index ed1227b..e886a58 100644 --- a/README.rst +++ b/README.rst @@ -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