Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix tests for Python 2.6 & Python 3. Add Python 3.4 to list of suppor…
…ted.
  • Loading branch information
playpauseandstop committed Feb 9, 2015
1 parent 9d2810c commit e9d7701
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 5 deletions.
7 changes: 6 additions & 1 deletion .travis.yml
Expand Up @@ -3,6 +3,7 @@ python:
- 2.6
- 2.7
- 3.3
- 3.4
- pypy
env:
- FLASK_VERSION=0.8
Expand All @@ -11,7 +12,7 @@ env:
install:
- pip install -r testapp/requirements.txt
- pip install -I Flask==$FLASK_VERSION
-
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install Markdown==2.3.1; fi
script:
- PYTHONPATH=. make -C testapp/ test
matrix:
Expand All @@ -22,3 +23,7 @@ matrix:
env: FLASK_VERSION=0.8
- python: 3.3
env: FLASK_VERSION=0.9
- python: 3.4
env: FLASK_VERSION=0.8
- python: 3.4
env: FLASK_VERSION=0.9
2 changes: 1 addition & 1 deletion flask_flatpages/compat.py
Expand Up @@ -16,4 +16,4 @@

def itervalues(obj):
"""Iterate over dict values."""
return obj.values() if IS_PY3 else obj.itervalues()
return iter(obj.values()) if IS_PY3 else obj.itervalues()
1 change: 1 addition & 0 deletions setup.py
Expand Up @@ -49,6 +49,7 @@
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: Implementation :: PyPy',
]
)
13 changes: 10 additions & 3 deletions tox.ini
Expand Up @@ -3,6 +3,7 @@ envlist =
py26flask08,py26flask09,py26flask010,
py27flask08,py27flask09,py27flask010,
py33flask010,
py34flask010,
pypyflask08,pypyflask09,pypyflask010

[testenv]
Expand All @@ -13,19 +14,19 @@ whitelist_externals = make
[testenv:py26flask08]
basepython = python2.6
commands =
pip install -q -I Flask==0.8
pip install -q -I Flask==0.8 Markdown==2.3.1
make -C testapp/ test

[testenv:py26flask09]
basepython = python2.6
commands =
pip install -q -I Flask==0.9
pip install -q -I Flask==0.9 Markdown==2.3.1
make -C testapp/ test

[testenv:py26flask010]
basepython = python2.6
commands =
pip install -q -I Flask==0.10.1
pip install -q -I Flask==0.10.1 Markdown==2.3.1
make -C testapp/ test

[testenv:py27flask08]
Expand All @@ -52,6 +53,12 @@ commands =
pip install -q -I Flask==0.10.1
make -C testapp/ test

[testenv:py34flask010]
basepython = python3.4
commands =
pip install -q -I Flask==0.10.1
make -C testapp/ test

[testenv:pypyflask08]
basepython = pypy
commands =
Expand Down

0 comments on commit e9d7701

Please sign in to comment.