Merge pull request #4 from rvianello/rvianello/update-to-django-2.0

update to django 2.0

.travis.yml

@@ -25,7 +25,7 @@ install:
  # create and activate the build/test environment
  - conda create -q -n tenv python=$TRAVIS_PYTHON_VERSION
  - source activate tenv
- - conda install -q django=1.11 psycopg2
+ - conda install -q django psycopg2
  - conda install -q -c rdkit rdkit rdkit-postgresql
  - python setup.py develop
 

django_rdkit/models/fields.py

@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+from django import VERSION as DJANGO_VERSION
 from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 from django.db.models import Lookup, Transform
@@ -12,7 +13,6 @@
 
 __all__ = ["MolField", "RxnField", "BfpField", "SfpField",]
 
-
 ##########################################
 # Molecule Field
 
@@ -25,10 +25,13 @@ def db_type(self, connection):
 
     def get_placeholder(self, value, compiler, connection):
         if hasattr(value, 'as_sql'):
-            # No value used for expressions, substitute in
-            # the column name instead.
-            sql, _ = compiler.compile(value)
-            return sql
+            if DJANGO_VERSION > (2,):
+                return '%s'
+            else:
+                # No value used for expressions, substitute in
+                # the column name instead.
+                sql, _ = compiler.compile(value)
+                return sql
         else:
             return 'mol_from_pkl(%s)'
 
@@ -124,10 +127,13 @@ def db_type(self, connection):
 
     def get_placeholder(self, value, compiler, connection):
         if hasattr(value, 'as_sql'):
-            # No value used for expressions, substitute in
-            # the column name instead.
-            sql, _ = compiler.compile(value)
-            return sql
+            if DJANGO_VERSION > (2,):
+                return '%s'
+            else:
+                # No value used for expressions, substitute in
+                # the column name instead.
+                sql, _ = compiler.compile(value)
+                return sql
         else:
             return 'bfp_from_binary_text(%s)'
 

setup.py

@@ -14,7 +14,7 @@ def get_packages(package):
 
 setup(
     name='django-rdkit',
-    version='0.0.6',
+    version='0.1.0',
     description='',
     packages = get_packages('django_rdkit'),
     zip_safe=False,