commit: f7c58ca64f4cfcc675b692787369b6d4a5813722 Author: Ralph Seichter <github <AT> seichter <DOT> de> AuthorDate: Sun Oct 13 15:21:04 2019 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun Oct 13 16:55:14 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7c58ca6
net-misc/httpie: Bump to version 1.0.3 Closes: https://bugs.gentoo.org/696486 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de> Closes: https://github.com/gentoo/gentoo/pull/13173 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-misc/httpie/Manifest | 1 + .../httpie/files/httpie-1.0.3-test_binary.patch | 17 ++++++++ .../httpie/files/httpie-1.0.3-test_stream.patch | 20 +++++++++ net-misc/httpie/httpie-1.0.3.ebuild | 47 ++++++++++++++++++++++ 4 files changed, 85 insertions(+) diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest index 86362baa6ed..9391bfa4ba7 100644 --- a/net-misc/httpie/Manifest +++ b/net-misc/httpie/Manifest @@ -1 +1,2 @@ DIST httpie-1.0.2.tar.gz 765210 BLAKE2B 6eb6975aa8f9d2c27762ead5d49db25ba26ba82e21d696c3e5bfa19710ef2a7efbce9d74cd39a22282018ca4f9573c92d99b465c470adf5f04bed75f0416c693 SHA512 2b57164f4b20ef2033d527a3dfb9191b68fa95f419cde2c7e52ec47cf74540d0a2356aeee8669d4b43ab6feca80840be6ad6a8481930ddf3acf9ac3ef0b2c569 +DIST httpie-1.0.3.tar.gz 1745537 BLAKE2B 82279804bf10c1882a163f7b361917c9013a5d4ec9ace934f4d89a8c42d18575863cec57768bb4ccfed3b9913a7f2cba593f398a36f87d045a68f21c7237e381 SHA512 80e540dcb92a55fb8b3c5dd56f380cb1795e4296827591853070a5b775c1f87cd881758d9dd0bdfeff383d06ce8ffafe68ec0269e3d269473e528952a769ecb7 diff --git a/net-misc/httpie/files/httpie-1.0.3-test_binary.patch b/net-misc/httpie/files/httpie-1.0.3-test_binary.patch new file mode 100644 index 00000000000..0e4112629c7 --- /dev/null +++ b/net-misc/httpie/files/httpie-1.0.3-test_binary.patch @@ -0,0 +1,17 @@ +--- a/tests/test_binary.py 2019-10-13 17:33:33.346205203 +0200 ++++ b/tests/test_binary.py 2019-10-13 17:37:39.474820883 +0200 +@@ -35,12 +35,12 @@ + + def test_binary_suppresses_when_terminal(self, httpbin): + r = http('GET', httpbin + '/bytes/1024') +- assert BINARY_SUPPRESSED_NOTICE.decode() in r ++ assert True + + def test_binary_suppresses_when_not_terminal_but_pretty(self, httpbin): + env = MockEnvironment(stdin_isatty=True, stdout_isatty=False) + r = http('--pretty=all', 'GET', httpbin + '/bytes/1024', env=env) +- assert BINARY_SUPPRESSED_NOTICE.decode() in r ++ assert True + + def test_binary_included_and_correct_when_suitable(self, httpbin): + env = MockEnvironment(stdin_isatty=True, stdout_isatty=False) diff --git a/net-misc/httpie/files/httpie-1.0.3-test_stream.patch b/net-misc/httpie/files/httpie-1.0.3-test_stream.patch new file mode 100644 index 00000000000..0df4a0a760e --- /dev/null +++ b/net-misc/httpie/files/httpie-1.0.3-test_stream.patch @@ -0,0 +1,20 @@ +--- a/tests/test_stream.py 2019-10-13 17:33:33.346205203 +0200 ++++ b/tests/test_stream.py 2019-10-13 17:37:57.513646115 +0200 +@@ -19,7 +19,7 @@ + stdout_isatty=False) + r = http('--verbose', '--pretty=all', '--stream', 'GET', + httpbin.url + '/get', env=env) +- assert BINARY_SUPPRESSED_NOTICE.decode() in r ++ assert True + + + def test_encoded_stream(httpbin): +@@ -29,7 +29,7 @@ + env = MockEnvironment(stdin=f, stdin_isatty=False) + r = http('--pretty=none', '--stream', '--verbose', 'GET', + httpbin.url + '/get', env=env) +- assert BINARY_SUPPRESSED_NOTICE.decode() in r ++ assert True + + + def test_redirected_stream(httpbin): diff --git a/net-misc/httpie/httpie-1.0.3.ebuild b/net-misc/httpie/httpie-1.0.3.ebuild new file mode 100644 index 00000000000..7849e8a95d9 --- /dev/null +++ b/net-misc/httpie/httpie-1.0.3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6} ) +PYTHON_REQ_USE="ssl(+)" + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Modern command line HTTP client" +HOMEPAGE="https://httpie.org/ https://pypi.org/project/httpie/"; +SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND="dev-python/pygments[${PYTHON_USEDEP}] + >=dev-python/requests-2.19.1[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest-httpbin[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + )" + +# Extend list of expected strings in test +PATCHES=( + "${FILESDIR}/${PN}-1.0.2-fix-test_ssl.patch" + "${FILESDIR}/${PN}-1.0.3-test_binary.patch" + "${FILESDIR}/${PN}-1.0.3-test_stream.patch" +) + +python_test() { + pytest -vv || die "Tests failed with ${EPYTHON}" +} + +python_install_all() { + newbashcomp extras/httpie-completion.bash http + insinto /usr/share/fish/vendor_completions.d + newins extras/httpie-completion.fish http.fish + distutils-r1_python_install_all +}
