Skip to content

Fix jinja2 dependency #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pydanny wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix jinja2 dependency #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daff637
Update Jinja2 requirement and add Python 3.4 to tests
pydanny May 5, 2014
b7cc0f3
This adds Jinja2 2.7 or higher, and Python 3.4 support
pydanny May 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ python:
- "2.7"
- "2.6"
- "pypy"
- "3.4"

# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
install:
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install -r requirements/test_26.txt; fi
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install -r requirements/test_27.txt; fi
- if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then pip install -r requirements/test_27.txt; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then pip install -r requirements/test_33.txt; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then pip install -r requirements/test_34.txt; fi

# command to run tests, e.g. python setup.py test
script: python setup.py test
3 changes: 3 additions & 0 deletions requirements/test_34.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Requirements for testing Complexity on Python 3.4.

-r base_test.txt
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
history = history.replace(".. :changelog:", "")

requirements = [
'jinja2==2.7',
'jinja2>=2.7',
'binaryornot>=0.1.1',
'PyYAML>=3.10'
]
Expand Down Expand Up @@ -61,6 +61,7 @@
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Topic :: Internet :: WWW/HTTP :: Site Management',
],
test_suite='tests',
Expand Down
6 changes: 5 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py26, py27, py33, pypy
envlist = py26, py27, py33, py34, pypy

[testenv:py26]
deps = -r{toxinidir}/requirements/test_26.txt
Expand All @@ -12,3 +12,7 @@ commands = python setup.py test
[testenv:py33]
deps = -r{toxinidir}/requirements/test_33.txt
commands = python setup.py test

[testenv:py34]
deps = -r{toxinidir}/requirements/test_34.txt
commands = python setup.py test