Merge pull request #475 from singingwolfboy/travis-coveralls

Integrate with Travis and Coveralls

.travis.yml

@@ -0,0 +1,15 @@
+language: python
+python:
+  - "2.7"
+  - "3.3"
+git:
+  submodules: false
+install:
+  - sudo apt-get install -qq python-enchant
+  - pip install -r dev-requirements.txt
+  - pip install coveralls
+script:
+  - coverage run --source willie -m py.test .
+  - coverage report --show-missing
+after_success:
+  - coveralls

dev-requirements.txt

@@ -0,0 +1,7 @@
+# python modules that must be installed before the tests can run
+backports.ssl_match_hostname
+lxml
+pygeoip
+praw
+feedparser
+pyenchant

setup.py

@@ -16,6 +16,10 @@ def do_setup():
         tmp_main_script = os.path.join(tmp_dir, 'willie')
         shutil.copy('willie.py', tmp_main_script)
 
+        with open("dev-requirements.txt") as f:
+            requires = [line for line in f.readlines()
+                        if not line.startswith("#")]
+
         setup(
             name='willie',
             version=__version__,
@@ -30,8 +34,7 @@ def do_setup():
             scripts=[tmp_main_script],
             license='Eiffel Forum License, version 2',
             platforms='Linux x86, x86-64',
-            requires=[b'feedparser', b'pytz', b'lxml', b'praw', b'enchant',
-                      b'pygeoip', b'backports.ssl_match_hostname']
+            requires=requires,
         )
     finally:
         try:

willie/modules/units.py

@@ -6,6 +6,7 @@
 Licensed under the Eiffel Forum License 2.
 
 """
+from __future__ import unicode_literals
 from willie.module import commands, example, NOLIMIT
 import re
 

willie/test_tools.py

@@ -110,7 +110,7 @@ def test():
             assert len(wrapper.output) == len(results)
             for result, output in zip(results, wrapper.output):
                 if type(output) is bytes:
-                    output = output.decode()
+                    output = output.decode('utf-8')
                 if use_regexp:
                     if not re.match(result, output):
                         assert result == output