From 14c24656fa93cad8491b3bcec67199ba99f9a792 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 2 Nov 2015 10:05:53 -0800 Subject: [PATCH 1/4] get coverage working --- .gitignore | 1 + .travis.yml | 2 +- tox.ini | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cf09a10..06cfb78 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ premailer/gorunsettings.py .DS_Store .coverage .tox +/htmlcov/ diff --git a/.travis.yml b/.travis.yml index f84d580..4ab03d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ language: python before_install: # twine is necessary so that travis can deploy - travis_retry pip install twine - - travis_retry pip install coverage tox coveralls + - travis_retry pip install tox coveralls install: - travis_retry python setup.py install diff --git a/tox.ini b/tox.ini index 9c7d6da..4b63e5a 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ envlist = flake8, py26, py27, py32, py33, py34, pypy [testenv] passenv = * -commands = nosetests +commands = nosetests --with-coverage --cover-package=premailer install_command = pip install {opts} {packages} @@ -19,6 +19,7 @@ deps = cssselect cssutils lxml + coverage [testenv:flake8] deps = flake8 @@ -27,7 +28,7 @@ commands = flake8 premailer [testenv:py26] # Python 2.6 is missing both the ordereddict and argparse modules # from the standard library. -commands = nosetests +commands = nosetests --with-coverage --cover-package=premailer install_command = pip install {opts} {packages} @@ -40,3 +41,4 @@ deps = lxml ordereddict argparse + coverage From e9b0ccc9ac4da35deb9c9cb515c5ae18ddfb1094 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 2 Nov 2015 10:24:00 -0800 Subject: [PATCH 2/4] update badge --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index a3af844..4748b91 100644 --- a/README.rst +++ b/README.rst @@ -282,7 +282,7 @@ maintained project please consider supporting me on .. |Travis| image:: https://travis-ci.org/peterbe/premailer.png?branch=master :target: https://travis-ci.org/peterbe/premailer -.. |Coverage Status| image:: https://coveralls.io/repos/peterbe/premailer/badge.png?branch=master - :target: https://coveralls.io/r/peterbe/premailer?branch=master +.. |Coverage Status| image:: https://coveralls.io/repos/peterbe/premailer/badge.svg?branch=master&service=github + :target: https://coveralls.io/github/peterbe/premailer?branch=master .. |Gratipay| image:: https://img.shields.io/gratipay/peterbe.svg :target: https://gratipay.com/peterbe/ From cafee9fb0d3299bec3523e1d50a92fc32c49b763 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 2 Nov 2015 10:25:12 -0800 Subject: [PATCH 3/4] exception for py3.2 --- tox.ini | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tox.ini b/tox.ini index 4b63e5a..f4f351b 100644 --- a/tox.ini +++ b/tox.ini @@ -25,6 +25,21 @@ deps = deps = flake8 commands = flake8 premailer +[testenv:py32] +# Python 3.2 does not support coverage 4.x +commands = nosetests --with-coverage --cover-package=premailer +install_command = + pip install {opts} {packages} + +deps = + setuptools + nose + mock + cssselect + cssutils + lxml + coverage==3.7.1 + [testenv:py26] # Python 2.6 is missing both the ordereddict and argparse modules # from the standard library. From 32bc7bfa01b8ce519b5c71cbdfade31f91a5405f Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Mon, 2 Nov 2015 10:40:49 -0800 Subject: [PATCH 4/4] universal wheel --- setup.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.cfg b/setup.cfg index 5b7ad24..6fbcdd6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,3 +4,5 @@ # across 2 and 3. ignore=E402 exclude=setup.py,premailer/__init__.py +[bdist_wheel] +universal=1