py-httpie: update to 2.6.0.

# 2.6.0

- Added support for formatting & coloring of JSON bodies preceded by non-JSON data (e.g., an XXSI prefix).
- Added charset auto-detection when `Content-Type` doesn’t include it.
- Added `--response-charset` to allow overriding the response encoding for terminal display purposes.
- Added `--response-mime` to allow overriding the response mime type for coloring and formatting for the terminal.
- Added the ability to silence warnings through using `-q` or `--quiet` twice (e.g. `-qq`)
- Added installed plugin list to `--debug` output.
- Fixed duplicate keys preservation in JSON data.

# 2.5.0

Blog post: [What’s new in HTTPie 2.5.0](https://httpie.io/blog/httpie-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.

3 files changed, 33 insertions, 12 deletions

diff --git a/www/py-httpie/Makefile b/www/py-httpie/Makefile
index 45e4a52a0be..b026648c141 100644
--- a/www/py-httpie/Makefile
+++ b/www/py-httpie/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2021/04/06 15:28:40 adam Exp $
+# $NetBSD: Makefile,v 1.10 2021/11/23 14:09:25 wiz Exp $
 
-DISTNAME=	httpie-2.4.0
+DISTNAME=	httpie-2.6.0
 PKGNAME=	${PYPKGPREFIX}-${EGG_NAME}
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=h/httpie/}
@@ -10,18 +10,18 @@ HOMEPAGE=	https://github.com/jakubroztocil/httpie
 COMMENT=	Human-friendly command line HTTP client
 LICENSE=	original-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-charset-normalizer>=2.0.0:../../converters/py-charset-normalizer
 DEPENDS+=	${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
-DEPENDS+=	${PYPKGPREFIX}-pygments>=2.1.3:../../textproc/py-pygments
-DEPENDS+=	${PYPKGPREFIX}-requests>=2.18.4:../../devel/py-requests
+DEPENDS+=	${PYPKGPREFIX}-defusedxml>=0.6.0:../../textproc/py-defusedxml
+DEPENDS+=	${PYPKGPREFIX}-pygments>=2.5.2:../../textproc/py-pygments
+DEPENDS+=	${PYPKGPREFIX}-requests>=2.22.0:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-requests-toolbelt>=0.9.1:../../devel/py-requests-toolbelt
-TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+TEST_DEPENDS+=	${PYPKGPREFIX}-responses-[0-9]*:../../net/py-responses
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-httpbin-[0-9]*:../../www/py-test-httpbin
 
 USE_LANGUAGES=	# none
 
-PYSETUPTESTTARGET=	pytest
-
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 post-install:
@@ -30,5 +30,8 @@ post-install:
 	${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
 .endfor
 
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-httpie/PLIST b/www/py-httpie/PLIST
index 4987c51c9dd..1eebe0fdac4 100644
--- a/www/py-httpie/PLIST
+++ b/www/py-httpie/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2021/04/06 15:28:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/11/23 14:09:25 wiz Exp $
 bin/http-${PYVERSSUFFIX}
 bin/https-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
@@ -55,6 +55,9 @@ ${PYSITELIB}/httpie/core.pyo
 ${PYSITELIB}/httpie/downloads.py
 ${PYSITELIB}/httpie/downloads.pyc
 ${PYSITELIB}/httpie/downloads.pyo
+${PYSITELIB}/httpie/encoding.py
+${PYSITELIB}/httpie/encoding.pyc
+${PYSITELIB}/httpie/encoding.pyo
 ${PYSITELIB}/httpie/models.py
 ${PYSITELIB}/httpie/models.pyc
 ${PYSITELIB}/httpie/models.pyo
@@ -73,12 +76,27 @@ ${PYSITELIB}/httpie/output/formatters/headers.pyo
 ${PYSITELIB}/httpie/output/formatters/json.py
 ${PYSITELIB}/httpie/output/formatters/json.pyc
 ${PYSITELIB}/httpie/output/formatters/json.pyo
+${PYSITELIB}/httpie/output/formatters/xml.py
+${PYSITELIB}/httpie/output/formatters/xml.pyc
+${PYSITELIB}/httpie/output/formatters/xml.pyo
+${PYSITELIB}/httpie/output/lexers/__init__.py
+${PYSITELIB}/httpie/output/lexers/__init__.pyc
+${PYSITELIB}/httpie/output/lexers/__init__.pyo
+${PYSITELIB}/httpie/output/lexers/http.py
+${PYSITELIB}/httpie/output/lexers/http.pyc
+${PYSITELIB}/httpie/output/lexers/http.pyo
+${PYSITELIB}/httpie/output/lexers/json.py
+${PYSITELIB}/httpie/output/lexers/json.pyc
+${PYSITELIB}/httpie/output/lexers/json.pyo
 ${PYSITELIB}/httpie/output/processing.py
 ${PYSITELIB}/httpie/output/processing.pyc
 ${PYSITELIB}/httpie/output/processing.pyo
 ${PYSITELIB}/httpie/output/streams.py
 ${PYSITELIB}/httpie/output/streams.pyc
 ${PYSITELIB}/httpie/output/streams.pyo
+${PYSITELIB}/httpie/output/utils.py
+${PYSITELIB}/httpie/output/utils.pyc
+${PYSITELIB}/httpie/output/utils.pyo
 ${PYSITELIB}/httpie/output/writer.py
 ${PYSITELIB}/httpie/output/writer.pyc
 ${PYSITELIB}/httpie/output/writer.pyo
diff --git a/www/py-httpie/distinfo b/www/py-httpie/distinfo
index 6b0307c37c0..183b06f9749 100644
--- a/www/py-httpie/distinfo
+++ b/www/py-httpie/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:30:42 nia Exp $
+$NetBSD: distinfo,v 1.13 2021/11/23 14:09:25 wiz Exp $
 
-BLAKE2s (httpie-2.4.0.tar.gz) = 30246443ae4b2ced31a2ac1bc59395847e9931ed1ffe994d6e079c7af12f422c
-SHA512 (httpie-2.4.0.tar.gz) = ebe5754df7859479e5f10bb31b702a2b91c8efffbb7438564343ecb478b5e1c13d4643a3f087a693749e84d5830bb346ba2830847f00b8ee2c3e2467bdcb2e42
-Size (httpie-2.4.0.tar.gz) = 220601 bytes
+BLAKE2s (httpie-2.6.0.tar.gz) = 347b9c9ece4f460ffb1256990f6e1863a270e4e61ff31eb5d7d4d0962698bc18
+SHA512 (httpie-2.6.0.tar.gz) = a38e9769c1994fcb4e5f898e5a72283c636ea155f1fc4d594eb59c43fe98115335dec4fddd6d4e396bd11b674715c573d2fc40c4afb732ba31da0cb8e2068fd2
+Size (httpie-2.6.0.tar.gz) = 213960 bytes