github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1720 from ingwinlu/fix_tox_2

Browse source 
make tox 2 compatible
This commit is contained in:
Justin Mayer 2015-05-13 23:15:04 +02:00
commit 42d2c4d26a
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -13,7 +13,7 @@ before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8 - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
install: install:
- pip install tox - pip install tox==2.0.1
script: tox -e $TOX_ENV script: tox -e $TOX_ENV
notifications: notifications:
irc: irc:

3
tox.ini
View file

@ -1,11 +1,12 @@
[tox] [tox]
envlist = py27,py33,py34,docs envlist = py{27,33,34},docs
[testenv] [testenv]
basepython = basepython =
py27: python2.7 py27: python2.7
py33: python3.3 py33: python3.3
py34: python3.4 py34: python3.4
passenv = *
usedevelop=True usedevelop=True
deps = deps =
-rdev_requirements.txt -rdev_requirements.txt