Skip to content

Commit

Permalink
Adding tox configuration; making sanity test Python 2.6 compatible.
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Coddington committed Oct 6, 2014
1 parent 622f38e commit e5e961c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ eggs
parts
bin
include
man
var
sdist
develop-eggs
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ python:
- 3.3
before_install:
- pip install -r requirements.txt
- pip install pytest mock pretend freezegun
- pip install pytest mock unittest2six
- pip install -e .
- pip install -q pep8
script:
- pep8 pyicloud
- python setup.py test
- py.test
3 changes: 1 addition & 2 deletions pyicloud/tests/test_sanity.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from unittest import TestCase

from unittest2 import TestCase

from pyicloud.cmdline import main

Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[pytest]
norecursedirs=lib build .tox
14 changes: 14 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[tox]
envlist = py26, py27
downloadcache = {toxworkdir}/_download/

[testenv]
deps =
-r{toxinidir}/requirements.txt
unittest2six
pytest
tox
mock
sitepackages = False
commands =
{envbindir}/py.test

0 comments on commit e5e961c

Please sign in to comment.