From f0a9eb11cc1cc740c740e4c2762637fbb66d6ef74ce512544c305a384a25ac6b Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Fri, 17 Nov 2017 09:36:42 +0000
Subject: [PATCH] Accepting request 541759 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/541759
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pytest-httpbin?expand=0&rev=4
---
 ...-and-decorator-from-install_requires.patch | 26 -------------------
 pytest-httpbin-0.2.3.tar.gz                   |  3 ---
 pytest-httpbin-0.3.0.tar.gz                   |  3 +++
 python-pytest-httpbin.changes                 | 12 +++++++++
 python-pytest-httpbin.spec                    |  5 +---
 5 files changed, 16 insertions(+), 33 deletions(-)
 delete mode 100644 0001-Remove-Flask-and-decorator-from-install_requires.patch
 delete mode 100644 pytest-httpbin-0.2.3.tar.gz
 create mode 100644 pytest-httpbin-0.3.0.tar.gz

diff --git a/0001-Remove-Flask-and-decorator-from-install_requires.patch b/0001-Remove-Flask-and-decorator-from-install_requires.patch
deleted file mode 100644
index d2176e3..0000000
--- a/0001-Remove-Flask-and-decorator-from-install_requires.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 55058b289ed1d3f17d907b2a13514d5ac5d3c586 Mon Sep 17 00:00:00 2001
-From: Thomas Bechtold <tbechtold@suse.com>
-Date: Tue, 8 Aug 2017 21:55:44 +0200
-Subject: [PATCH] Remove Flask and decorator from install_requires
-
-Both are not used.
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 11c649c..894b283 100644
---- a/setup.py
-+++ b/setup.py
-@@ -50,7 +50,7 @@ setup(
-     keywords='pytest-httpbin testing pytest httpbin',
-     packages=find_packages(exclude=["contrib", "docs", "tests*"]),
-     include_package_data = True, # include files listed in MANIFEST.in
--    install_requires = ['Flask','decorator','httpbin','six'],
-+    install_requires = ['httpbin','six'],
- 
-     # the following makes a plugin available to pytest
-     entry_points = {
--- 
-2.13.3
-
diff --git a/pytest-httpbin-0.2.3.tar.gz b/pytest-httpbin-0.2.3.tar.gz
deleted file mode 100644
index 56bc95f..0000000
--- a/pytest-httpbin-0.2.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5b698dfa474ffc9caebcb35e34346b753eb226aea5c2e1b69fefedbcf161bf8
-size 9498
diff --git a/pytest-httpbin-0.3.0.tar.gz b/pytest-httpbin-0.3.0.tar.gz
new file mode 100644
index 0000000..ad221aa
--- /dev/null
+++ b/pytest-httpbin-0.3.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8cd57e27418a7d7d205fcc9802eea246ed06170e3065abfa76c6d9b40553592c
+size 9565
diff --git a/python-pytest-httpbin.changes b/python-pytest-httpbin.changes
index abb5c85..d112a2b 100644
--- a/python-pytest-httpbin.changes
+++ b/python-pytest-httpbin.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Nov 13 18:23:24 UTC 2017 - arun@gmx.de
+
+- removed 0001-Remove-Flask-and-decorator-from-install_requires.patch
+  (included upstream)
+
+- update to version 0.3.0:
+  * Allow to run httpbin on fixed port using environment variables
+    (thanks @hroncok)
+  * Allow server to be thread.join()ed (thanks @graingert)
+  * Add support for Python 3.6 (thanks @graingert)
+
 -------------------------------------------------------------------
 Tue Aug  8 19:57:56 UTC 2017 - tbechtold@suse.com
 
diff --git a/python-pytest-httpbin.spec b/python-pytest-httpbin.spec
index d7aaee2..df08f85 100644
--- a/python-pytest-httpbin.spec
+++ b/python-pytest-httpbin.spec
@@ -18,15 +18,13 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-pytest-httpbin
-Version:        0.2.3
+Version:        0.3.0
 Release:        0
 Summary:        Test your HTTP library against a local copy of httpbin
 License:        MIT
 Group:          Development/Languages/Python
 Url:            https://github.com/kevin1024/pytest-httpbin
 Source:         https://files.pythonhosted.org/packages/source/p/pytest-httpbin/pytest-httpbin-%{version}.tar.gz
-# PATCH-FEATURE-UPSTREAM 0001-Remove-Flask-and-decorator-from-install_requires.patch -- https://github.com/kevin1024/pytest-httpbin/pull/40
-Patch1:         0001-Remove-Flask-and-decorator-from-install_requires.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  python-rpm-macros
 Requires:       python-httpbin
@@ -48,7 +46,6 @@ fixture.
 
 %prep
 %setup -q -n pytest-httpbin-%{version}
-%patch1 -p1
 
 %build