aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatěj Cepl <mcepl@cepl.eu>2016-05-16 12:23:39 +0200
committerMatěj Cepl <mcepl@cepl.eu>2016-05-16 12:36:04 +0200
commit4545077c547825f2ab5a4704f826e3537baa1fb7 (patch)
treebe98248b69505e5be3e3f29c047f86c23da343b7
parent6bc7d7331bb4eedc8657749f33379e817e56e8a6 (diff)
downloadcucutags-4545077c547825f2ab5a4704f826e3537baa1fb7.tar.gz
Add .travis.yml
Also, fix install_requires (not requires, as I called it before)
-rw-r--r--.travis.yml10
-rwxr-xr-xcucutags.py1
-rw-r--r--setup.py8
-rw-r--r--test/test_cucutags.py3
4 files changed, 15 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..68a4e80
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,10 @@
+language: python
+python:
+ - "2.6"
+ - "2.7"
+ - "pypy"
+ - "3.3"
+ - "3.4"
+ - "3.5"
+script:
+ python setup.py test
diff --git a/cucutags.py b/cucutags.py
index 77b56ca..9e19f4a 100755
--- a/cucutags.py
+++ b/cucutags.py
@@ -33,7 +33,6 @@ logging.basicConfig(format='%(levelname)s:%(funcName)s:%(message)s',
level=logging.INFO)
__docformat__ = 'reStructuredText'
-__version__ = "0.7.3"
__author__ = u"Matěj Cepl <mcepl_at_redhat_dot_com>"
diff --git a/setup.py b/setup.py
index 35326a2..9b20ed5 100644
--- a/setup.py
+++ b/setup.py
@@ -3,8 +3,6 @@ from __future__ import absolute_import, print_function
import os.path
-import cucutags
-
from setuptools import setup
@@ -15,7 +13,7 @@ def read(fname):
setup(
name='cucutags',
py_modules=['cucutags'],
- version=str(cucutags.__version__),
+ version="0.7.3",
description='Generates ctags for BDD .feature/behave steps',
author=u'Matěj Cepl',
author_email='mcepl@redhat.com',
@@ -28,10 +26,10 @@ setup(
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
- "Programming Language :: Python :: pypy",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
+ "Programming Language :: Python :: Implementation :: PyPy",
"Development Status :: 3 - Alpha",
"Environment :: Console",
"Intended Audience :: Information Technology",
@@ -40,5 +38,5 @@ setup(
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: Software Development :: Testing"
],
- requires=["parse"]
+ install_requires=["parse"]
)
diff --git a/test/test_cucutags.py b/test/test_cucutags.py
index c8d2ce5..5528516 100644
--- a/test/test_cucutags.py
+++ b/test/test_cucutags.py
@@ -18,7 +18,8 @@ class TestCucutags(unittest.TestCase):
def test_init_session(self):
"""Just initialize Session from data in the data
subdirectory."""
- self.assertIsInstance(self.session, cucutags.Session)
+ # We cannot use assertIsInstance because of 2.6 compatibility
+ self.assertTrue(isinstance(self.session, cucutags.Session))
def test_generate_tags(self):
"""Generate tags and compare with expected result."""