- added tox

- stepped travis to use python 3.5 - close #160 - close #196 - close #162 with fix as per espeed/bulbs#158 (comment)
mogui · Jun 23, 2016 · fff81b2 · fff81b2
1 parent 4d1eb23
commit fff81b2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ sudo: false
 language: python
 python:
 - '2.7'
-- '3.4'
+- '3.5'
 
 install:
 - pip install coveralls

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,3 @@
 include pyorient/*
-include README.md
+include README.md
+include README.rst
diff --git a/pyorient/groovy.py b/pyorient/groovy.py
@@ -58,12 +58,10 @@ def _get_group_pattern(self,flags):
         sub_pattern.flags = flags
         for phrase, action in self.lexicon:
             patterns.append(sre_parse.SubPattern(sub_pattern, [
-                (SUBPATTERN, (len(patterns) + 1
-                    , sre_parse.parse(phrase, flags))),
+                (SUBPATTERN, (len(patterns) + 1, sre_parse.parse(phrase, flags))),
                 ]))
-        sub_pattern.groups = len(patterns) + 1
-        group_pattern = sre_parse.SubPattern(sub_pattern
-                                             , [(BRANCH, (None, patterns))])
+        #sub_pattern.groups = len(patterns) + 1
+        group_pattern = sre_parse.SubPattern(sub_pattern, [(BRANCH, (None, patterns))])
         return sre_compile.compile(group_pattern)
 
     def get_multiline(self,f,m):

diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
 from setuptools import setup
 
 setup(name='pyorient',
-    version='1.5.3b',
+    version='1.5.4',
     author='Niko Usai <[email protected]>, Domenico Lupinetti <[email protected]>',
     description='OrientDB native client library',
     long_description=open('README.rst').read(),

diff --git a/test.py b/test.py
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,6 @@
+[tox]
+envlist = py27,py35
+
+[testenv]
+deps = nose
+commands = nosetests
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ sudo: false @@
     language: python
     python:
     - '2.7'
-    - '3.4'
+    - '3.5'
     install:
     - pip install coveralls
@@ Expand Down @@