From 23249e3d0c7a4b8e12c291357e459943e22c7fea Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Jan 15 2018 20:22:08 +0000
Subject: New release 0.8.7, drop merged patch


---

diff --git a/.gitignore b/.gitignore
index 04c9e79..b2a7f2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ mwclient-0.6.5.zip
 /mwclient-0.8.3.tar.gz
 /mwclient-0.8.4.tar.gz
 /v0.8.6.tar.gz
+/v0.8.7.tar.gz
diff --git a/0001-Revert-Fix-test-compat-with-responses-0.6.0.patch b/0001-Revert-Fix-test-compat-with-responses-0.6.0.patch
deleted file mode 100644
index 542137d..0000000
--- a/0001-Revert-Fix-test-compat-with-responses-0.6.0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 80c6f7c29a22e176eb58845569e730f9b89ab64d Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Thu, 16 Nov 2017 11:36:42 -0800
-Subject: [PATCH] Revert "Fix test compat with responses@0.6.0"
-
-This reverts commit 1650e0e77d370ff5d7b089b60353854d548fb0a1.
-Upstream restored handling of the adding_headers arg in 0.6.1.
-Going back to using that name means we're still compatible with
-any version of responses after 0.3.0, except 0.6.0. Also adjust
-setup.py to express this correctly.
----
- setup.py             | 2 +-
- tests/test_client.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index eca6c49..a32cbde 100644
---- a/setup.py
-+++ b/setup.py
-@@ -29,6 +29,6 @@ setup(name='mwclient',
-       install_requires=['requests_oauthlib', 'six'],
-       setup_requires=['pytest-runner'],
-       tests_require=['pytest', 'pytest-pep8', 'pytest-cache', 'pytest-cov',
--                     'responses>=0.6.0', 'mock'],
-+                     'responses>=0.3.0', 'responses!=0.6.0', 'mock'],
-       zip_safe=True
-       )
-diff --git a/tests/test_client.py b/tests/test_client.py
-index 3a074e2..e497803 100644
---- a/tests/test_client.py
-+++ b/tests/test_client.py
-@@ -52,7 +52,7 @@ class TestCase(unittest.TestCase):
-             responses.add_callback(mock, url, callback=callback)
-         else:
-             responses.add(mock, url, body=body, content_type='application/json',
--                          headers=headers, status=status)
-+                          adding_headers=headers, status=status)
- 
-     def stdSetup(self):
-         self.httpShouldReturn(self.metaResponseAsJson())
--- 
-2.14.3
-
diff --git a/python-mwclient.spec b/python-mwclient.spec
index fb7cb03..0728fb0 100644
--- a/python-mwclient.spec
+++ b/python-mwclient.spec
@@ -14,7 +14,7 @@
 %global github_name     mwclient
 
 Name:           python-mwclient
-Version:        0.8.6
+Version:        0.8.7
 Release:        1%{?dist}
 Summary:        Mwclient is a client to the MediaWiki API
 
@@ -22,9 +22,6 @@ Group:          System Environment/Libraries
 License:        MIT
 URL:            https://github.com/%{github_owner}/%{github_name}
 Source0:        https://github.com/%{github_owner}/%{github_name}/archive/v%{version}.tar.gz
-# Restore compatibility with older python-responses
-# https://github.com/mwclient/mwclient/pull/177
-Patch0:         0001-Revert-Fix-test-compat-with-responses-0.6.0.patch
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
@@ -129,6 +126,10 @@ provides access to most API functionality. This is the Python 3 build of
 
 
 %changelog
+* Mon Jan 15 2018 Adam Williamson <awilliam@redhat.com> - 0.8.7-1
+- New release 0.8.7
+- Drop PR #177 patch, merged upstream
+
 * Thu Nov 16 2017 Adam Williamson <awilliam@redhat.com> - 0.8.6-1
 - New release 0.8.6
 - Backport PR #177 to restore compatibility with older responses
diff --git a/sources b/sources
index a7f091a..4ff977f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v0.8.6.tar.gz) = 620e9726babfb6dbb84032a0e05094e1416d8aa9e1d87f09d6e000acafb3155410a2e7339e7ca88144aebdb542415d3d58d2d67034f4e9c9d664eae7a97e14c6
+SHA512 (v0.8.7.tar.gz) = a1dc3c6d92e7d982d117626f3d8ec16e5659b468626551b928a514956d048f354fd6dd60c6956a73b43192c2b6391c32b98b3a9387a5ad12140ef4d5b38c97c9