Only support sqlalchemy1.3.x or higher

juliotrigo · Jun 17, 2020 · c5dce9b · c5dce9b
1 parent 59dc537
commit c5dce9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/test/conftest.py b/test/conftest.py
@@ -110,12 +110,11 @@ def is_sqlite(db_uri):
 
 @pytest.fixture(scope='session')
 def is_sqlalchemy_1_3_or_higer():
-    try:
-        from sqlalchemy import JSON  # noqa: F401
-    except ImportError:
-        return False
-    else:
+    import sqlalchemy
+    if sqlalchemy.__version__ >= '1.3.0':
         return True
+    else:
+        return False
 
 
 @pytest.fixture(scope='session')

diff --git a/test/models.py b/test/models.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import sqlalchemy
 from sqlalchemy import (
     Column, Date, DateTime, ForeignKey, Integer, String, Time
 )
@@ -64,15 +65,14 @@ class Corge(BasePostgresqlSpecific):
     tags = Column(ARRAY(String, dimensions=1))
 
 
-try:
+if sqlalchemy.__version__ >= '1.3.0':
+
     from sqlalchemy import JSON
-except ImportError:
-    class Til(Base):
 
-        __tablename__ = 'til'
-else:
     class Til(Base):
 
         __tablename__ = 'til'
 
         refer_info = Column(JSON)
+else:
+    Til = None