From d8e50d56dae2281341fbcd99337e6c0f1424808f Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Fri, 10 Jan 2014 07:33:41 +0000 Subject: [PATCH 1/2] travis: Use dev_requirements.txt for dependencies --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2f310328..93a7ab54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,9 @@ before_install: - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8 install: - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi - - pip install mock nose nose-cov Markdown typogrify-web - pip install . + - pip install -r dev_requirements.txt + - pip install nose-cov script: nosetests -sv --with-coverage --cover-package=pelican pelican after_success: # Report coverage results to coveralls.io From 8dfa7c23f3076633a51821bd6c2428bfba571f3a Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Fri, 10 Jan 2014 07:34:13 +0000 Subject: [PATCH 2/2] Use dev_requirements.txt for tox dependencies --- tox.ini | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/tox.ini b/tox.ini index 70f9fe92..a72aea21 100644 --- a/tox.ini +++ b/tox.ini @@ -8,19 +8,4 @@ envlist = py27,py33 commands = python -m unittest discover deps = - -[testenv:py27] -deps = - mock - Markdown - BeautifulSoup4 - typogrify-web - lxml - -[testenv:py33] -deps = - mock - Markdown - BeautifulSoup4 - typogrify-web - lxml + -rdev_requirements.txt