From 566530ca188923fdd65a259bf12f38a78527165e Mon Sep 17 00:00:00 2001 From: tBunnyMan Date: Sun, 2 Sep 2012 15:18:46 -0700 Subject: [PATCH 1/2] Add the unit2 tests to tox Remove unnecessary dependencies These dependencies are installed when tox runs setup.py --- tox.ini | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index a7dc9ec6..4a0e148c 100644 --- a/tox.ini +++ b/tox.ini @@ -2,13 +2,11 @@ envlist = py26,py27 [testenv] -commands = nosetests -s tests +commands = + nosetests -s tests + unit2 discover [] deps = nose - Jinja2 - Pygments - docutils - feedgenerator unittest2 mock Markdown From 2c85fb0d19906cd4a9f4cc19b67eff10b7a5e206 Mon Sep 17 00:00:00 2001 From: tBunnyMan Date: Tue, 4 Sep 2012 15:17:59 -0700 Subject: [PATCH 2/2] Clean up Dev Requirements and add typogrify & webassets typogrify & webassets are optional packages for usage but should be included for testing by developers and CI dev_requirements also had packages that setup.py covers already. Added comments for redundancy --- dev_requirements.txt | 10 ++++------ tox.ini | 2 ++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index ec3245d1..acf01773 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,10 +1,8 @@ -Jinja2>=2.4 -Pygments -docutils -feedgenerator +# Tests unittest2 -pytz mock +# Optional Packages Markdown -blinker BeautifulSoup +typogrify +webassets \ No newline at end of file diff --git a/tox.ini b/tox.ini index 4a0e148c..f7d9cf82 100644 --- a/tox.ini +++ b/tox.ini @@ -11,3 +11,5 @@ deps = mock Markdown BeautifulSoup + typogrify + webassets