SQLAlchemy 1.2 py26 support was dropped; add py36

stefanofontanelli · Nov 8, 2017 · c35cb7d · c35cb7d
1 parent 8cfb5a7
commit c35cb7d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,9 @@ python:
   - 3.4
   - 3.5
   - pypy3
+  - 3.6
 
 #install: python setup.py develop  # install doesn't seem to be needed for testing
 
-script: python setup.py test -q
+script:
+  - python setup.py test -q
diff --git a/setup.py b/setup.py
@@ -16,10 +16,17 @@
 CHANGES = open(os.path.join(here, 'CHANGES.rst')).read()
 
 tests_require = []
+install_requires = [
+    'colander >= 1.0b1',
+]
 
 if sys.version_info[0] == 2 and sys.version_info[1] < 7:
     # In Python < 2.7 use unittest2.
     tests_require.append('unittest2')
+    # SQLAlchemy dropped 2.6 support in 1.2
+    install_requires.append('SQLAlchemy >= 0.8dev, < 1.2')
+else:
+    install_requires.append('SQLAlchemy >= 0.8dev')
 
 
 setup(name='ColanderAlchemy',
@@ -48,8 +55,7 @@
       packages=find_packages(exclude=['tests']),
       include_package_data=True,
       zip_safe=True,
-      install_requires=['colander >= 1.0b1',
-                        'SQLAlchemy >= 0.8dev'],
+      install_requires=install_requires,
       tests_require=tests_require,
       test_suite='tests',
       )