From 7eeb1e30e03e264e193f51b1483796530b773537db84bfcc1acc8b93b2afd6e4 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Fri, 10 Sep 2021 14:45:04 +0000
Subject: [PATCH] Accepting request 917174 from home:mnhauke

- Fix tests
- Update dependencies
- Update to version 2.5.0
  * Added --raw to allow specifying the raw request body without
    extra processing as an alternative to stdin.
  * Added support for XML formatting.
  * Added internal support for file-like object responses to
    improve adapter plugin support.
  * Fixed --continue --download with a single byte to be
    downloaded left.
  * Fixed --verbose HTTP 307 redirects with streamed request body.
  * Fixed handling of session files with Cookie: followed by other
    headers.
- Update to version 2.4.0
  * Added support for --session cookie expiration based on
    Set-Cookie: max-age=<n>.
  * Show a --check-status warning with --quiet as well, not only
    when the output is redirected.
  * Fixed upload with --session.
  * Fixed a missing blank line between request and response.

OBS-URL: https://build.opensuse.org/request/show/917174
OBS-URL: https://build.opensuse.org/package/show/network:utilities/httpie?expand=0&rev=20
---
 httpie-2.3.0.tar.gz |  3 ---
 httpie-2.5.0.tar.gz |  3 +++
 httpie.changes      | 24 ++++++++++++++++++++++++
 httpie.spec         | 15 +++++++++------
 4 files changed, 36 insertions(+), 9 deletions(-)
 delete mode 100644 httpie-2.3.0.tar.gz
 create mode 100644 httpie-2.5.0.tar.gz

diff --git a/httpie-2.3.0.tar.gz b/httpie-2.3.0.tar.gz
deleted file mode 100644
index e2d5a9a..0000000
--- a/httpie-2.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17c18a67ea57599b75b59c081b57c7d0239eabf5cc7d8de347840a4006f57ee4
-size 1769401
diff --git a/httpie-2.5.0.tar.gz b/httpie-2.5.0.tar.gz
new file mode 100644
index 0000000..cccde9c
--- /dev/null
+++ b/httpie-2.5.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:66af56e0efc1ca6237323f1186ba34bca1be24e67a4319fd5df7228ab986faea
+size 1105177
diff --git a/httpie.changes b/httpie.changes
index b7f8492..d50c056 100644
--- a/httpie.changes
+++ b/httpie.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Mon Sep  6 19:32:01 UTC 2021 - Martin Hauke <mardnh@gmx.de>
+
+- Fix tests
+- Update dependencies
+- Update to version 2.5.0
+  * Added --raw to allow specifying the raw request body without
+    extra processing as an alternative to stdin.
+  * Added support for XML formatting.
+  * Added internal support for file-like object responses to
+    improve adapter plugin support.
+  * Fixed --continue --download with a single byte to be
+    downloaded left.
+  * Fixed --verbose HTTP 307 redirects with streamed request body.
+  * Fixed handling of session files with Cookie: followed by other
+    headers.
+- Update to version 2.4.0
+  * Added support for --session cookie expiration based on
+    Set-Cookie: max-age=<n>.
+  * Show a --check-status warning with --quiet as well, not only
+    when the output is redirected.
+  * Fixed upload with --session.
+  * Fixed a missing blank line between request and response.
+
 -------------------------------------------------------------------
 Fri Mar 19 12:26:10 UTC 2021 - Robert Munteanu <rombert@apache.org>
 
diff --git a/httpie.spec b/httpie.spec
index bb43df2..0b8e1bf 100644
--- a/httpie.spec
+++ b/httpie.spec
@@ -17,7 +17,7 @@
 
 
 Name:           httpie
-Version:        2.3.0
+Version:        2.5.0
 Release:        0
 Summary:        CLI, cURL-like tool for humans
 License:        BSD-3-Clause
@@ -28,15 +28,19 @@ Source1:        http.1
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-Pygments >= 2.5.2
+BuildRequires:  python3-defusedxml >= 0.6.0
 BuildRequires:  python3-mock
 BuildRequires:  python3-pytest
 BuildRequires:  python3-pytest-httpbin
 BuildRequires:  python3-requests >= 2.22.0
 BuildRequires:  python3-requests-toolbelt >= 0.9.1
+BuildRequires:  python3-responses
 BuildRequires:  python3-setuptools
 Requires:       python3-Pygments >= 2.5.2
+Requires:       python3-defusedxml >= 0.6.0
 Requires:       python3-requests >= 2.22.0
 Requires:       python3-requests-toolbelt >= 0.9.1
+Requires:       python3-responses
 Provides:       python3-httpie = 2.3.0
 Provides:       python38-httpie = 2.3.0
 Obsoletes:      python3-httpie < 2.3.0
@@ -54,7 +58,6 @@ responses.
 
 %prep
 %setup -q
-
 #drop shebang
 sed -i -e '/^#!\//, 1d' httpie/__main__.py
 
@@ -70,16 +73,16 @@ install -D -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/http.1
 
 %check
 export LC_CTYPE=en_US.UTF-8
-export PYTHONPATH=$PWD
 # disable tests that fail on OBS with [Errno -3] Temporary failure in name resolution
-pytest --deselect=tests/test_uploads.py
+#pytest --deselect=tests/test_uploads.py
+pytest --deselect=tests/test_uploads.py tests -v
 
 %files
-%doc AUTHORS.rst CHANGELOG.rst README.rst
+%doc AUTHORS.md CHANGELOG.md README.md
 %license LICENSE
 %{_bindir}/http
 %{_bindir}/https
-%{python_sitelib}/*
+%{python_sitelib}/httpie*
 %{_mandir}/man1/http.1%{?ext_man}
 
 %changelog