diff --git a/CHANGELOG.md b/CHANGELOG.md index 75b1cf55f..0e23dffc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +### 0.12.0 + * 149dfc7 - Merge pull request #67 from jawu/enable-possibility-to-use-mathers-in-path (Matthew Balvanz, Sun Dec 17 10:32:34 2017 -0600) + * fb97d2f - fixed doc string of Request (Janneck Wullschleger, Sat Dec 16 20:44:11 2017 +0100) + * c2c24cc - adjusted doc string of Request calss to allow str and Matcher as path parameter (Janneck Wullschleger, Sat Dec 16 20:40:35 2017 +0100) + * 697a6a2 - fixed port parameter in e2e test for python 2.7 (Janneck Wullschleger, Thu Dec 14 15:08:05 2017 +0100) + * ca2eb92 - added from_term call in Request constructor to process path property for json transport (Janneck Wullschleger, Thu Dec 14 14:45:11 2017 +0100) + ### 0.11.0 * ad69039 - Merge pull request #63 from pact-foundation/run-specific-interactions (Matthew Balvanz, Sun Dec 17 09:53:35 2017 -0600) * eb63864 - Output a rerun command when a verification fails (Matthew Balvanz, Sun Nov 19 20:44:06 2017 -0600) diff --git a/pact/__version__.py b/pact/__version__.py index bed1cb30b..1e79f662a 100644 --- a/pact/__version__.py +++ b/pact/__version__.py @@ -1,3 +1,3 @@ """Pact version info.""" -__version__ = '0.11.0' +__version__ = '0.12.0' diff --git a/pact/pact.py b/pact/pact.py index 4c8cf9de5..3ea16c336 100644 --- a/pact/pact.py +++ b/pact/pact.py @@ -208,7 +208,7 @@ def with_request(self, method, path, body=None, headers=None, query=None): :param method: The HTTP method. :type method: str :param path: The path portion of the URI the client will access. - :type path: str + :type path: str, Matcher :param body: The request body, can be a string or an object that will serialize to JSON, like list or dict, defaults to None. :type body: list, dict or None