diff options
| author | Vincent Driessen <vincent@3rdcloud.com> | 2013-02-11 09:36:37 +0100 |
|---|---|---|
| committer | Vincent Driessen <vincent@3rdcloud.com> | 2013-02-11 09:36:37 +0100 |
| commit | 5abd0c6faa86ab2f59d6f03824e2877f5042cc0d (patch) | |
| tree | e62c1352c0eb587f7af0a38a7c2b5f85473feeec | |
| parent | 4f2a7fcf35feb125a55b3a08a950b24e443821fe (diff) | |
| download | times-5abd0c6faa86ab2f59d6f03824e2877f5042cc0d.tar.gz | |
Fix Travis build configuration.
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rw-r--r-- | py26-requirements.txt | 1 | ||||
| -rw-r--r-- | requirements.txt | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index f67a1de..367f895 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,13 @@ language: python python: + - "2.6" - "2.7" - "3.2" + - "3.3" - "pypy" install: - - pip install nose - - pip install pytz - - pip install python-dateutil>=2.1 -script: nosetests + - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install -r py26-requirements.txt; fi + - pip install -r requirements.txt + #- pip install pytest # installed by Travis by default already +script: + - py.test diff --git a/py26-requirements.txt b/py26-requirements.txt new file mode 100644 index 0000000..9a23970 --- /dev/null +++ b/py26-requirements.txt @@ -0,0 +1 @@ +unittest2 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..d650718 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +pytz +python-dateutil >= 2.1 |