diff --git a/AUTHORS.rst b/AUTHORS.rst index 5eaca443..578c7ccb 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -27,3 +27,5 @@ Contributors (chronological) * Vlad Frolov * Tuukka Mustonen * Francois-Xavier Darveau   +* Jérôme Lafréchoux   + diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c99a5872..82da4580 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,13 @@ Changelog --------- +1.5.2 (unreleased) +****************** + +Bug fixes: + +* Don't add ``marshmallow.missing`` to ``original_data`` when using ``marshmallow.validates_schema(pass_original=True)`` (:issue:`146`). Thanks :user:`lafrech` for reporting and for the fix. + 1.5.1 (2016-11-27) ****************** diff --git a/LICENSE b/LICENSE index 30f13733..8dcf75ab 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2014-2016 Steven Loria and contributors +Copyright 2014-2017 Steven Loria and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/docs/conf.py b/docs/conf.py index 568534d7..9510d020 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- - +import datetime as dt import sys import os @@ -35,7 +35,7 @@ templates_path = ['_templates'] source_suffix = '.rst' project = u'webargs' -copyright = u'2014-2015' +copyright = u'2014-{0:Y}'.format(dt.datetime.utcnow()) version = release = webargs.__version__ exclude_patterns = ['_build'] diff --git a/webargs/__init__.py b/webargs/__init__.py index dad499aa..06a54d1e 100755 --- a/webargs/__init__.py +++ b/webargs/__init__.py @@ -6,7 +6,7 @@ from webargs.core import argmap2schema, WebargsError, ValidationError from webargs import fields -__version__ = '1.5.1' +__version__ = '1.5.2.dev0' __author__ = 'Steven Loria' __license__ = 'MIT'