Skip to content

Commit

Permalink
Use requirements.txt for pip, as well as a conditional requirements f…
Browse files Browse the repository at this point in the history
…ile for Python 2.5 when building on Travis CI.
  • Loading branch information
jdennes committed Feb 10, 2013
1 parent 88d73a9 commit 267cdab
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ build
dist
/.buildpath
/.project
venv
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ python:
- 2.6
- 2.7
install:
- pip install simplejson
- pip install nose
- if [ $TRAVIS_PYTHON_VERSION == '2.5' ]; then pip install -r python25-requirements.txt --use-mirrors; fi
script: nosetests
2 changes: 2 additions & 0 deletions python25-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
simplejson
nose==1.2.1
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nose==1.2.1

0 comments on commit 267cdab

Please sign in to comment.