Merge pull request #37 from Martlark/1.5.1

1.5.1 Fix TypeError: unsupported operand type(s) for +=: 'ImmutableCo…
Martlark · Mar 20, 2021 · e47d3c2 · e47d3c2
2 parents 7aa4931 + 808c610
commit e47d3c2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/README.rst b/README.rst
@@ -981,6 +981,7 @@ Example to create using POST:
 Release Notes
 -------------
 
+* 1.5.1 - Fix TypeError: unsupported operand type(s) for +=: 'ImmutableColumnCollection' and 'list' with newer versions of SQLAlchemy
 * 1.5.0 - Return item from POST/PUT updates. Allow create_fields and update_fields to be specified using the column fields.  None values serialize as null/None.  Restore previous update_properties behaviour.  By default updates/creates using all fields. Exclude primary key from create and update.
 * 1.4.2 - by default return all props with update_properties
 * 1.4.1 - Add better exception message when `db` mixin property not set.  Add `FlaskSerialize` factory method.

diff --git a/flask_serialize/flask_serialize.py b/flask_serialize/flask_serialize.py
@@ -44,7 +44,7 @@ class FlaskSerializeMixin:
     # previous values of an instance before update attempted
     previous_field_value = {}
     # current version
-    __version__ = '1.5.0'
+    __version__ = '1.5.1'
 
     def before_update(self, data_dict):
         """
@@ -285,7 +285,7 @@ def __get_props(self):
 
             # SQL columns
             props.__exclude_fields = ['as_dict', 'as_json'] + self.exclude_serialize_fields
-            field_list = self.__table__.columns
+            field_list = list(self.__table__.columns)
             if 'sqlite' in self.__table__.dialect_options:
                 props.DIALECT = 'sqlite'
                 self.convert_types.append(

diff --git a/pypar.commands.sh b/pypar.commands.sh
@@ -24,5 +24,5 @@ pip install pytest-flask
 
 . venv3/bin/activate
 python setup.py sdist bdist_wheel
-twine check dist/flask_serialize-1.5.0*
-twine upload dist/flask_serialize-1.5.0* -u martlark
+twine check dist/flask_serialize-1.5.1*
+twine upload dist/flask_serialize-1.5.1* -u martlark
diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,9 @@
 wtforms
 flask
-SQLAlchemy
+SQLAlchemy>=1.4.2
 Permissive-Dict
 pytest
-flask-sqlalchemy
+flask-sqlalchemy>=2.5.1
 flask-migrate
 flask-wtf
 setuptools

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '1.5.0'
+VERSION = '1.5.1'
 LONG_DESCRIPTION = open('README.rst', 'r', encoding='utf-8').read()
 
 setup(