Merge pull request #796 from hugapi/develop

2.5.3

Author: timothycrosley

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.2
+current_version = 2.5.3
 
 [bumpversion:file:.env]
 

.env

@@ -11,7 +11,7 @@ fi
 
 export PROJECT_NAME=$OPEN_PROJECT_NAME
 export PROJECT_DIR="$PWD"
-export PROJECT_VERSION="2.5.2"
+export PROJECT_VERSION="2.5.3"
 
 if [ ! -d "venv" ]; then
      if ! hash pyvenv 2>/dev/null; then

ACKNOWLEDGEMENTS.md

@@ -49,6 +49,7 @@ Code Contributors
 - Antti Kaihola (@akaihola)
 - Christopher Goes (@GhostOfGoes)
 - Stanislav (@atmo)
+- Lordran (@xzycn)
 
 Documenters
 ===================

CHANGELOG.md

@@ -11,6 +11,9 @@ Ideally, within a virtual environment.
 
 Changelog
 =========
+### 2.5.3 hotfix - May 15, 2019
+- Fixed issue #794 - Restore support for versions of Marshmallow pre-2.17.0
+
 ### 2.5.2 hotfix - May 10, 2019
 - Fixed issue #790 - Set Falcon defaults to pre 2.0.0 version to avoid breaking changes for Hug users until a Hug 3.0.0 release. The new default Falcon behaviour can be defaulted before hand by setting `__hug__.future = True`.
 

hug/_version.py

@@ -21,4 +21,4 @@
 """
 from __future__ import absolute_import
 
-current = "2.5.2"
+current = "2.5.3"

hug/types.py

@@ -23,6 +23,7 @@
 
 import uuid as native_uuid
 from decimal import Decimal
+from distutils.version import LooseVersion
 
 import hug._empty as empty
 from hug import introspect
@@ -34,7 +35,9 @@
     import marshmallow
     from marshmallow import ValidationError
 
-    MARSHMALLOW_MAJOR_VERSION = marshmallow.__version_info__[0]
+    MARSHMALLOW_MAJOR_VERSION = getattr(
+        marshmallow, "__version_info__", LooseVersion(marshmallow.__version__).version
+    )[0]
 except ImportError:
     # Just define the error that is never raised so that Python does not complain.
     class ValidationError(Exception):

setup.py

@@ -78,7 +78,7 @@ def list_modules(dirname):
 
 setup(
     name="hug",
-    version="2.5.2",
+    version="2.5.3",
     description="A Python framework that makes developing APIs "
     "as simple as possible, but no simpler.",
     long_description=long_description,