Accepting request 883346 from network:utilities

Forward the current version of httpie to Factory

OBS-URL: https://build.opensuse.org/request/show/883346
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/httpie?expand=0&rev=8

httpie-2.2.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:413894ad9d5d45a2a7839079dcdc0f23b0ea3586502d5014339b957de73d413e
-size 1761927

httpie-2.3.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17c18a67ea57599b75b59c081b57c7d0239eabf5cc7d8de347840a4006f57ee4
+size 1769401

httpie-adjust-requirements.patch

@@ -1,15 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 084ea47..f8ebd13 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,8 +36,8 @@ tests_require = [
- 
- 
- install_requires = [
--    'requests>=2.22.0',
--    'Pygments>=2.5.2',
-+    'requests>=2.21.0',
-+    'Pygments>=2.3.1',
- ]
- install_requires_win_only = [
-     'colorama>=0.2.4',

httpie.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Mar 19 12:26:10 UTC 2021 - Robert Munteanu <rombert@apache.org>
+
+- Disable tests that fail in OBS 
+
+-------------------------------------------------------------------
+Wed Jan 20 08:08:04 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.3.0:
+  * Added support for streamed uploads (#201).
+  * Added support for multipart upload streaming (#684).
+  * Added support for body-from-file upload streaming (http httpbin.org/post @file).
+  * Added --chunked to enable chunked transfer encoding (#753).
+  * Added --multipart to allow multipart/form-data encoding for non-file --form requests as well.
+  * Added support for preserving field order in multipart requests (#903).
+  * Added --boundary to allow a custom boundary string for multipart/form-data requests.
+  * Added support for combining cookies specified on the CLI and in a session file (#932).
+  * Added out of the box SOCKS support with no extra installation (#904).
+  * Added --quiet, -q flag to enforce silent behaviour.
+  * Fixed the handling of invalid expires dates in Set-Cookie headers (#963).
+  * Removed Tox testing entirely (#943). 
+- drop httpie-adjust-requirements.patch (obsolete)
+- drop singlespec packaging. this is a commandline utility, not a 
+  python module, so building it for multiple versions of python makes
+  no sense.
+  
 -------------------------------------------------------------------
 Tue Aug 18 15:32:42 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 

httpie.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package httpie
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,10 +16,8 @@
 #
 
 
-%define skip_python2 1
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           httpie
-Version:        2.2.0
+Version:        2.3.0
 Release:        0
 Summary:        CLI, cURL-like tool for humans
 License:        BSD-3-Clause
@@ -27,24 +25,25 @@ Group:          Productivity/Networking/Web/Utilities
 URL:            https://httpie.org/
 Source:         https://github.com/jakubroztocil/httpie/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        http.1
-Patch0:         httpie-adjust-requirements.patch
-BuildRequires:  %{python_module Pygments >= 2.1.3}
-BuildRequires:  %{python_module mock}
-BuildRequires:  %{python_module pytest-httpbin}
-BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module requests >= 2.18.4}
-BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-Pygments >= 2.1.3
-Requires:       python-requests >= 2.18.4
-Suggests:       python-argparse >= 1.2.1
-Suggests:       python-colorama >= 0.2.4
-Provides:       httpie
+BuildRequires:  python3-Pygments >= 2.5.2
+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-setuptools
+Requires:       python3-Pygments >= 2.5.2
+Requires:       python3-requests >= 2.22.0
+Requires:       python3-requests-toolbelt >= 0.9.1
+Provides:       python3-httpie = 2.3.0
+Provides:       python38-httpie = 2.3.0
+Obsoletes:      python3-httpie < 2.3.0
+Obsoletes:      python38-httpie < 2.3.0
 BuildArch:      noarch
-Requires(post):   update-alternatives
-Requires(postun):  update-alternatives
-%python_subpackages
+Requires(post): update-alternatives
+Requires(postun):update-alternatives
 
 %description
 HTTPie consists of a single "http" command designed for debugging and
@@ -55,38 +54,31 @@ responses.
 
 %prep
 %setup -q
-%patch0 -p1
 
 #drop shebang
 sed -i -e '/^#!\//, 1d' httpie/__main__.py
 
 %build
 export LC_CTYPE=en_US.UTF-8
-%python_build
+%python3_build
 
 %install
 export LC_CTYPE=en_US.UTF-8
-%python_install
-%python_clone -a %{buildroot}%{_bindir}/http
-%python_clone -a %{buildroot}%{_bindir}/https
-%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%python3_install
+%fdupes %{buildroot}%{$python_sitelib}
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/http.1
 
 %check
 export LC_CTYPE=en_US.UTF-8
-%pytest
+export PYTHONPATH=$PWD
+# disable tests that fail on OBS with [Errno -3] Temporary failure in name resolution
+pytest --deselect=tests/test_uploads.py
 
-%post
-%python_install_alternative http https
-
-%postun
-%python_uninstall_alternative http https
-
-%files %{python_files}
+%files
 %doc AUTHORS.rst CHANGELOG.rst README.rst
 %license LICENSE
-%python_alternative %{_bindir}/http
-%python_alternative %{_bindir}/https
+%{_bindir}/http
+%{_bindir}/https
 %{python_sitelib}/*
 %{_mandir}/man1/http.1%{?ext_man}