Merge branch 'dev' into single-location

Merge back to bring this work up-to-date without disruptive rebase for
review.
Reconcile conflicts in Changelog and core.

Fix minor issue identified with accidental removal of clear_cache().
(Rather than doing a rebase + amend, just fix in the merge since the
plan is to squash these commits down when the work is complete.)

CHANGELOG.rst

@@ -4,15 +4,8 @@ Changelog
 6.0.0 (unreleased)
 ******************
 
-Support:
-
-* Various docs updates (:pr:`414`).
-
 Refactoring:
 
-* Don't mutate ``globals()`` in ``webargs.fields`` (:pr:`411`).
-* Use marshmallow 3's ``Schema.from_dict`` if available (:pr:`415`).
-
 * *Backwards-incompatible*: Schema fields may not specify a location any
   longer, and `Parser.use_args` and `Parser.use_kwargs` now accept `location`
   (singular) instead of `locations` (plural). Instead of using a single field or
@@ -54,6 +47,17 @@ Refactoring:
   from a request. This is an intentional behavior to disambiguate malformed
   inputs from valid, empty inputs.
 
+5.5.0 (2019-09-07)
+******************
+
+Support:
+
+* Various docs updates (:pr:`414`, :pr:`421`).
+
+Refactoring:
+
+* Don't mutate ``globals()`` in ``webargs.fields`` (:pr:`411`).
+* Use marshmallow 3's ``Schema.from_dict`` if available (:pr:`415`).
 
 5.4.0 (2019-07-23)
 ******************

src/webargs/__init__.py

@@ -9,10 +9,6 @@
 from webargs.dict2schema import dict2schema
 from webargs import fields
 
-__version__ = "5.4.0"
+__version__ = "5.5.0"
 __version_info__ = tuple(LooseVersion(__version__).version)
-__author__ = "Steven Loria"
-__license__ = "MIT"
-
-
 __all__ = ("dict2schema", "ValidationError", "fields", "missing", "validate")

src/webargs/asyncparser.py

@@ -35,7 +35,7 @@ async def parse(
 
         Receives the same arguments as `webargs.core.Parser.parse`.
         """
-        self.clear_cache()  # in case someone used `location_load_*()`
+        self.clear_cache()  # in case someone used `load_*()`
         req = req if req is not None else self.get_default_request()
         if req is None:
             raise ValueError("Must pass req object")

src/webargs/core.py

@@ -238,6 +238,7 @@ def parse(
 
          :return: A dictionary of parsed arguments
         """
+        self.clear_cache()  # in case someone used `load_*()`
         req = req if req is not None else self.get_default_request()
         if req is None:
             raise ValueError("Must pass req object")