Feature/drop py27 (#151)

* drop py27, py33 and py34 support

* fix synonym tests

.travis.yml

@@ -1,9 +1,10 @@
 language: python
+sudo: required
+dist: xenial
 python:
-  - 2.7
-  - 3.4
   - 3.5
   - 3.6
+  - 3.7
 
 env:
   matrix:

CHANGES.rst

@@ -4,6 +4,12 @@ Changelog
 Here you can see the full list of changes between each WTForms-Alchemy release.
 
 
+0.17.0 (2020-06-02)
+^^^^^^^^^^^^^^^^^^^
+
+- Dropped py27, py33 and py34 support
+
+
 0.16.9 (2019-03-06)
 ^^^^^^^^^^^^^^^^^^^
 

setup.py

@@ -81,12 +81,10 @@ def get_version():
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ]

tests/__init__.py

@@ -2,6 +2,7 @@
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm.session import close_all_sessions
 from sqlalchemy_utils import force_auto_coercion
 from wtforms_test import FormTestCase
 
@@ -67,6 +68,6 @@ def setup_method(self, method):
         self.session = Session()
 
     def teardown_method(self, method):
-        self.session.close_all()
+        close_all_sessions()
         self.base.metadata.drop_all(self.engine)
         self.engine.dispose()

tests/test_phone_number.py

@@ -3,6 +3,7 @@
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm.session import close_all_sessions
 from sqlalchemy_utils.types import phone_number
 
 from tests import MultiDict
@@ -21,7 +22,7 @@ def setup_method(self, method):
         self.session = Session()
 
     def teardown_method(self, method):
-        self.session.close_all()
+        close_all_sessions()
         self.Base.metadata.drop_all(self.engine)
         self.engine.dispose()
 

tests/test_query_select_field.py

@@ -1,4 +1,5 @@
 import sqlalchemy as sa
+from sqlalchemy.orm.session import close_all_sessions
 from wtforms import Form
 from wtforms.compat import text_type
 
@@ -249,7 +250,7 @@ def setup_method(self, method):
         self.session = Session()
 
     def teardown_method(self, method):
-        self.session.close_all()
+        close_all_sessions()
         self.base.metadata.drop_all(self.engine)
         self.engine.dispose()
 

tests/test_synonym.py

@@ -20,9 +20,7 @@ def test_column_hybrid(self):
             def test_column_hybrid(self, value):
                 self._test_column = value
 
-            test_column = sa.orm.synonym(
-                '_test_column', descriptor='test_column_hybrid'
-            )
+            test_column = sa.orm.synonym('_test_column')
 
         class ModelTestForm(ModelForm):
             class Meta:
@@ -49,9 +47,7 @@ def test_column_hybrid(self):
             def test_column_hybrid(self, value):
                 self._test_column = value
 
-            test_column = sa.orm.synonym(
-                '_test_column', descriptor='test_column_hybrid'
-            )
+            test_column = sa.orm.synonym('_test_column')
 
         class ModelTestForm(ModelForm):
             class Meta:

tests/test_unique_validator.py

@@ -2,6 +2,7 @@
 from pytest import mark, raises
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import relationship
+from sqlalchemy.orm.session import close_all_sessions
 from wtforms import Form
 from wtforms.fields import TextField
 
@@ -44,7 +45,7 @@ def setup_method(self, method):
         self.session = Session()
 
     def teardown_method(self, method):
-        self.session.close_all()
+        close_all_sessions()
         self.base.metadata.drop_all(self.engine)
         self.engine.dispose()
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py33, py34, py35
+envlist = py35, py36, py37
 
 [testenv]
 commands = pip install -e ".[test]"

wtforms_alchemy/generator.py

@@ -1,13 +1,7 @@
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
-try:
-    from enum import Enum
-except ImportError:
-    Enum = None
 import inspect
+from collections import OrderedDict
 from decimal import Decimal
+from enum import Enum
 
 import six
 import sqlalchemy as sa

wtforms_alchemy/utils.py

@@ -1,3 +1,5 @@
+from collections import OrderedDict
+from enum import Enum
 from inspect import isclass
 
 import six
@@ -6,15 +8,6 @@
 from sqlalchemy_utils import IntRangeType, NumericRangeType
 from sqlalchemy_utils.types.choice import Choice
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
-try:
-    from enum import Enum
-except ImportError:
-    Enum = None
-
 
 def choice_type_coerce_factory(type_):
     """

wtforms_alchemy/validators.py

@@ -1,4 +1,4 @@
-from collections import Iterable, Mapping
+from collections.abc import Iterable, Mapping
 
 import six
 from sqlalchemy import Column