On Sun, Feb 27, 2022 at 01:54:17PM +0000, Stuart Henderson wrote:
> httpie updates require a new charset detection library, port for
> that attached. OK to import?
It needs textproc/py-inicofig and devel/py-test-cov as TEST_DEPENDS.
Otherwise ok kmos for import
> httpie update diff using it inline.
ok kmos
--Kurt
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/py-httpie/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile 2 Nov 2021 00:02:53 -0000 1.24
> +++ Makefile 27 Feb 2022 13:53:48 -0000
> @@ -2,15 +2,14 @@
>
> COMMENT = command-line HTTP client
>
> -MODPY_EGG_VERSION = 2.5.0
> +MODPY_EGG_VERSION = 3.0.2
> GH_TAGNAME = ${MODPY_EGG_VERSION}
> -GH_ACCOUNT = jakubroztocil
> +GH_ACCOUNT = httpie
> GH_PROJECT = httpie
> -REVISION = 0
>
> CATEGORIES = www net
>
> -HOMEPAGE = https://httpie.org/
> +HOMEPAGE = https://httpie.io/
>
> # BSD
> PERMIT_PACKAGE = Yes
> @@ -22,10 +21,12 @@ MODPY_SETUPTOOLS = Yes
> MODPY_PYTEST = Yes
>
> RUN_DEPENDS = net/py-socks${MODPY_FLAVOR} \
> - www/py-requests${MODPY_FLAVOR} \
> - www/py-requests-toolbelt${MODPY_FLAVOR} \
> + textproc/py-charset-normalizer${MODPY_FLAVOR} \
> textproc/py-defusedxml${MODPY_FLAVOR} \
> - textproc/py-pygments${MODPY_FLAVOR}
> + textproc/py-pygments${MODPY_FLAVOR} \
> + www/py-multidict${MODPY_FLAVOR} \
> + www/py-requests${MODPY_FLAVOR} \
> + www/py-requests-toolbelt${MODPY_FLAVOR}
> TEST_DEPENDS = devel/py-test-httpbin${MODPY_FLAVOR} \
> devel/py-mock${MODPY_FLAVOR}
> TEST_ENV = PY_IGNORE_IMPORTMISMATCH=1
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/www/py-httpie/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo 3 Oct 2021 19:17:10 -0000 1.13
> +++ distinfo 27 Feb 2022 13:53:48 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (httpie-2.5.0.tar.gz) = Zq9W4O/BymI3Mj8Rhro0vKG+JOZ6Qxn9XfciirmG+uo=
> -SIZE (httpie-2.5.0.tar.gz) = 1105177
> +SHA256 (httpie-3.0.2.tar.gz) = c3otfOOH6BysFKsHHKjyhwGnXSpNU6uMy466AaUHAvM=
> +SIZE (httpie-3.0.2.tar.gz) = 1169342
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/py-httpie/pkg/PLIST,v
> retrieving revision 1.9
> diff -u -p -r1.9 PLIST
> --- pkg/PLIST 3 Oct 2021 19:17:10 -0000 1.9
> +++ pkg/PLIST 27 Feb 2022 13:53:48 -0000
> @@ -1,5 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.9 2021/10/03 19:17:10 sthen Exp $
> bin/http
> +bin/httpie
> bin/https
> lib/python${MODPY_VERSION}/site-packages/httpie/
>
> lib/python${MODPY_VERSION}/site-packages/httpie-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> @@ -14,19 +15,21 @@ lib/python${MODPY_VERSION}/site-packages
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}adapters.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}downloads.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}encoding.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}sessions.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}ssl.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}ssl_.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}status.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}uploads.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/adapters.py
> lib/python${MODPY_VERSION}/site-packages/httpie/cli/
> lib/python${MODPY_VERSION}/site-packages/httpie/cli/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/httpie/cli/${MODPY_PYCACHE}/
> @@ -37,21 +40,37 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/httpie/cli/${MODPY_PYCACHE}definition.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/cli/${MODPY_PYCACHE}dicts.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/cli/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/cli/${MODPY_PYCACHE}nested_json.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/cli/${MODPY_PYCACHE}requestitems.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/cli/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/httpie/cli/argparser.py
> lib/python${MODPY_VERSION}/site-packages/httpie/cli/argtypes.py
> lib/python${MODPY_VERSION}/site-packages/httpie/cli/constants.py
> lib/python${MODPY_VERSION}/site-packages/httpie/cli/definition.py
> lib/python${MODPY_VERSION}/site-packages/httpie/cli/dicts.py
> lib/python${MODPY_VERSION}/site-packages/httpie/cli/exceptions.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/cli/nested_json.py
> lib/python${MODPY_VERSION}/site-packages/httpie/cli/requestitems.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/cli/utils.py
> lib/python${MODPY_VERSION}/site-packages/httpie/client.py
> lib/python${MODPY_VERSION}/site-packages/httpie/compat.py
> lib/python${MODPY_VERSION}/site-packages/httpie/config.py
> -lib/python${MODPY_VERSION}/site-packages/httpie/constants.py
> lib/python${MODPY_VERSION}/site-packages/httpie/context.py
> lib/python${MODPY_VERSION}/site-packages/httpie/core.py
> lib/python${MODPY_VERSION}/site-packages/httpie/downloads.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/encoding.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/manager/
> +lib/python${MODPY_VERSION}/site-packages/httpie/manager/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/manager/__main__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/httpie/manager/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/httpie/manager/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/manager/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/manager/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/manager/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/manager/${MODPY_PYCACHE}plugins.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/manager/cli.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/manager/core.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/manager/plugins.py
> lib/python${MODPY_VERSION}/site-packages/httpie/models.py
> lib/python${MODPY_VERSION}/site-packages/httpie/output/
> lib/python${MODPY_VERSION}/site-packages/httpie/output/__init__.py
> @@ -59,6 +78,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
>
> lib/python${MODPY_VERSION}/site-packages/httpie/output/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/output/${MODPY_PYCACHE}processing.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/output/${MODPY_PYCACHE}streams.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/httpie/output/${MODPY_PYCACHE}writer.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/httpie/output/formatters/
> lib/python${MODPY_VERSION}/site-packages/httpie/output/formatters/__init__.py
> @@ -72,8 +92,27 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/httpie/output/formatters/headers.py
> lib/python${MODPY_VERSION}/site-packages/httpie/output/formatters/json.py
> lib/python${MODPY_VERSION}/site-packages/httpie/output/formatters/xml.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/lexers/
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/lexers/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/httpie/output/lexers/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/lexers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/lexers/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/lexers/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/lexers/${MODPY_PYCACHE}json.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/lexers/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/lexers/common.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/lexers/http.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/lexers/json.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/lexers/metadata.py
> lib/python${MODPY_VERSION}/site-packages/httpie/output/processing.py
> lib/python${MODPY_VERSION}/site-packages/httpie/output/streams.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/ui/
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/ui/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/httpie/output/ui/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/ui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/ui/${MODPY_PYCACHE}palette.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/ui/palette.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/output/utils.py
> lib/python${MODPY_VERSION}/site-packages/httpie/output/writer.py
> lib/python${MODPY_VERSION}/site-packages/httpie/plugins/
> lib/python${MODPY_VERSION}/site-packages/httpie/plugins/__init__.py
> @@ -88,7 +127,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/httpie/plugins/manager.py
> lib/python${MODPY_VERSION}/site-packages/httpie/plugins/registry.py
> lib/python${MODPY_VERSION}/site-packages/httpie/sessions.py
> -lib/python${MODPY_VERSION}/site-packages/httpie/ssl.py
> +lib/python${MODPY_VERSION}/site-packages/httpie/ssl_.py
> lib/python${MODPY_VERSION}/site-packages/httpie/status.py
> lib/python${MODPY_VERSION}/site-packages/httpie/uploads.py
> lib/python${MODPY_VERSION}/site-packages/httpie/utils.py
>
>
