Merge pull request #32 from textile/master

Merge master changes into develop branch

Author: ikirudennis

setup.py

@@ -1,6 +1,7 @@
 from setuptools import setup, find_packages
 import os
 import sys
+import pytest
 
 def get_version():
     basedir = os.path.dirname(__file__)
@@ -43,6 +44,7 @@ def get_version():
     entry_points={'console_scripts': ['textile=textile.__main__:main']},
     setup_requires=['pytest-runner'],
     tests_require=['pytest', 'pytest-cov'],
+    cmdclass = {'test': pytest},
     include_package_data=True,
     zip_safe=False,
 )

textile/core.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 

textile/regex_strings.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals