Permalink
Browse files

Merge pull request #125 from alexwlchan/version-pins2

Pin the hoedown version to fix the Travis tests and tidy up the supported Pythons
  • Loading branch information...
Thiago Avelino
Thiago Avelino committed Dec 10, 2016
2 parents 97ca0aa + a4784ad commit dc7c0a54062d13bb28d75e11cd6df25482183b1a
Showing with 22 additions and 13 deletions.
  1. +16 −9 .travis.yml
  2. +3 −2 README.rst
  3. +2 −1 setup.py
  4. +1 −1 tox.ini
View
@@ -1,14 +1,21 @@
language: python
python:
- 2.6
- 2.7
- 3.3
- 3.4
matrix:
include:
- python: "2.6"
env: TOXENV=py26
- python: "2.7"
env: TOXENV=py27
- python: "3.3"
env: TOXENV=py33
- python: "3.4"
env: TOXENV=py34
- python: "3.5"
env: TOXENV=py35
install:
- pip install docutils
- python setup.py install
- pip install -U pip setuptools
- pip install -U tox
script:
- cd tests
- nosetests
- tox
View
@@ -122,8 +122,9 @@ Compatibility
- 2.6
- 2.7
- 3.1
- 3.2
- 3.3
- 3.4
- 3.5
.. _restructedText: http://docutils.sourceforge.net/rst.html
View
@@ -12,7 +12,7 @@
kwargs['use_2to3'] = True
install_requires = [
'Jinja2', 'Pygments', 'hoedown', 'docopt', 'PyYAML', 'docutils'
'Jinja2', 'Pygments', 'hoedown<=0.2', 'docopt', 'PyYAML', 'docutils'
]
author, author_email = parseaddr(liquidluck.__author__)
@@ -45,6 +45,7 @@
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Topic :: Text Processing :: Markup',
],
View
@@ -4,7 +4,7 @@
# and then run "tox" from this directory.
[tox]
envlist = py26, py27, py31, py32
envlist = py26, py27, py33, py34, py35
[testenv]
commands = nosetests -w tests

0 comments on commit dc7c0a5

Please sign in to comment.