Merge branch 'master' into fix-windows-support

Author: tk0miya

README.rst

@@ -123,7 +123,7 @@ If you want to insert fixtures to the cached database, use ``initdb_handler`` op
 
 Requirements
 ============
-* Python 2.6, 2.7, 3.2, 3.3, 3.4, 3.5
+* Python 2.7, 3.4, 3.5, 3.6
 * pg8000 1.10
 
 License

src/testing/postgresql.py

@@ -28,6 +28,7 @@
 __all__ = ['Postgresql', 'skipIfNotFound']
 
 SEARCH_PATHS = (['/usr/local/pgsql', '/usr/local'] +
+                glob('/usr/pgsql-*') +  # for CentOS/RHEL
                 glob('/usr/lib/postgresql/*') +  # for Debian/Ubuntu
                 glob('/opt/local/lib/postgresql*'))  # for MacPorts
 

tests/test_postgresql.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import os
-import sys
 import signal
 import tempfile
+import unittest
 import testing.postgresql
 from time import sleep
 from shutil import rmtree
@@ -12,11 +12,6 @@
 import sqlalchemy
 from contextlib import closing
 
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
-
 
 class TestPostgresql(unittest.TestCase):
     def test_basic(self):

tox.ini

@@ -1,28 +1,18 @@
 [tox]
-envlist=py26,py27,py32,py33,py34,py35
+envlist=py27,py34,py35,py36
 
 [base]
 deps=
     nose
+    flake8
     psycopg2
     SQLAlchemy
-
-[testenv]
-deps=
-    {[base]deps}
-    flake8
 passenv=
     TRAVIS*
 commands=
     nosetests
     flake8 --exclude=.tox/
 
-[testenv:py26]
-deps=
-    {[base]deps}
-    unittest2
-    flake8==2.6.0
-
 [testenv:coverage]
 deps=
     {[testenv]deps}