Merge pull request #114 from michael-k/modern-python

Run tests against Python 3.5 and 3.6; drop 2.6 left overs

.travis.yml

@@ -4,6 +4,8 @@ dist: trusty
 language: python
 
 python:
+  - "3.6"
+  - "3.5"
   - "3.4"
   - "2.7"
 #  - "pypy"

CONTRIBUTING.rst

@@ -99,7 +99,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.6, 2.7, and 3.3, 3.4, and for PyPy. Check
+3. The pull request should work for Python 2.7, and 3.4+, and for PyPy. Check
    https://travis-ci.org/aboSamoor/polyglot/pull_requests
    and make sure that the tests pass for all supported Python versions.
 
@@ -108,4 +108,4 @@ Tips
 
 To run a subset of tests::
 
-	$ python -m unittest tests.test_polyglot
+	$ python -m unittest tests.test_polyglot

setup.py

@@ -112,6 +112,8 @@
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Scientific/Engineering :: Artificial Intelligence',
         'Topic :: Text Processing :: Linguistic',
     ],

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, py34
+envlist = py27, py34, py35, py36
 
 [testenv]
 setenv =