On Wed, Jan 17, 2018 at 09:01:10PM +0100, Klemens Nanni wrote:
> On Wed, Jan 17, 2018 at 12:10:36AM +0100, Joerg Jung wrote:
> > Hi,
> >
> > please find attached an update for www/py-multidict.
> > This update is needed for the upcoming py-aiohttp update and the new
> > py-yarl port, which in turn are both homeassistant dependencies.
> >
> > OK?
> >
> > Regards,
> > Joerg
> >
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/www/py-multidict/Makefile,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 Makefile
> > --- Makefile 3 Jan 2017 19:28:49 -0000 1.2
> > +++ Makefile 16 Jan 2018 20:51:00 -0000
> > @@ -2,15 +2,10 @@
> >
> > COMMENT = multidict implementation
> >
> > -MODPY_EGG_VERSION = 1.1.0a6
> > +MODPY_EGG_VERSION = 3.3.2
> > DISTNAME = multidict-${MODPY_EGG_VERSION}
> > PKGNAME = py-${DISTNAME}
> > CATEGORIES = www devel
> > -REVISION = 1
> > -
> > -GH_ACCOUNT = aio-libs
> > -GH_PROJECT = multidict
> > -GH_TAGNAME = v${MODPY_EGG_VERSION}
> >
> > WANTLIB += pthread ${MODPY_WANTLIB}
> >
> > @@ -19,8 +14,8 @@ PERMIT_PACKAGE_CDROM = Yes
> >
> > MODULES = lang/python
> >
> > +MODPY_PI = Yes
> > MODPY_SETUPTOOLS = Yes
> > -
> > MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> >
> > TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/www/py-multidict/distinfo,v
> > retrieving revision 1.1.1.1
> > diff -u -p -r1.1.1.1 distinfo
> > --- distinfo 5 Jun 2016 17:08:19 -0000 1.1.1.1
> > +++ distinfo 16 Jan 2018 20:51:00 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (multidict-1.1.0a6.tar.gz) =
> > rD8aE0yHp/bnVHy8tZXl6zbRwYZRAad38ufAoY2CQXM=
> > -SIZE (multidict-1.1.0a6.tar.gz) = 98630
> > +SHA256 (multidict-3.3.2.tar.gz) =
> > +C5hx0CO0NzhhiEA21VZVIGRHxWdbd7As3XTW2RJUJs=
> > +SIZE (multidict-3.3.2.tar.gz) = 129806
> > Index: pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/www/py-multidict/pkg/PLIST,v
> > retrieving revision 1.1.1.1
> > diff -u -p -r1.1.1.1 PLIST
> > --- pkg/PLIST 5 Jun 2016 17:08:19 -0000 1.1.1.1
> > +++ pkg/PLIST 16 Jan 2018 20:51:00 -0000
> > @@ -7,9 +7,17 @@ lib/python${MODPY_VERSION}/site-packages
> >
> > lib/python${MODPY_VERSION}/site-packages/multidict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> >
> > lib/python${MODPY_VERSION}/site-packages/multidict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> > lib/python${MODPY_VERSION}/site-packages/multidict/__init__.py
> > +lib/python${MODPY_VERSION}/site-packages/multidict/__init__.pyi
> > lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}/
> >
> > lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_abc.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
> >
> > lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_multidict_py.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/multidict/_abc.py
> > +lib/python${MODPY_VERSION}/site-packages/multidict/_compat.py
> > +lib/python${MODPY_VERSION}/site-packages/multidict/_istr.c
> > +lib/python${MODPY_VERSION}/site-packages/multidict/_istr.pyd
> > +lib/python${MODPY_VERSION}/site-packages/multidict/_istr.so
> > lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.c
> > lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.pyx
> > lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.so
> >
> Looks good to me, all tests pass on amd64.
>
> We can pull this to 4.0.0 from 14.01.2018 directly,
Yes, I sent a diff for that earlier.
> it's the next
> release after the now proposed 3.3.2 and only introduces the following
> changes according to their changelog:
>
> - Accept multiple keys in MultiDict.update() and CIMultiDict.update()
> https://github.com/aio-libs/multidict/pull/199
>
> Tests continue to pass, we can also drop pre-test and do-test.
>
> While here, add some value to DESCR.
>
> Feedback?
Slightly better than mine. Need an OK, will commit then :)
> I'm also updating py-aiohttp and py-yarl to their latest versions now,
> these *should* work with the upcoming homeassistant port.
I sent already updates for them to list.
> diff --git a/www/py-multidict/Makefile b/www/py-multidict/Makefile
> index ca2e773ee21..7943f615615 100644
> --- a/www/py-multidict/Makefile
> +++ b/www/py-multidict/Makefile
> @@ -2,33 +2,21 @@
>
> COMMENT = multidict implementation
>
> -MODPY_EGG_VERSION = 1.1.0a6
> +MODPY_EGG_VERSION = 4.0.0
> DISTNAME = multidict-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> CATEGORIES = www devel
> -REVISION = 1
>
> -GH_ACCOUNT = aio-libs
> -GH_PROJECT = multidict
> -GH_TAGNAME = v${MODPY_EGG_VERSION}
> -
> -WANTLIB += pthread ${MODPY_WANTLIB}
> +WANTLIB += pthread ${MODPY_WANTLIB}
>
> # Apache2
> PERMIT_PACKAGE_CDROM = Yes
>
> MODULES = lang/python
> -
> +MODPY_PI = Yes
> MODPY_SETUPTOOLS = Yes
> -
> MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
>
> -pre-test:
> - @${MODPY_CMD} build_ext --inplace
> -
> -do-test:
> - @cd ${WRKSRC} && ${MODPY_BIN} -m pytest ./tests/
> -
> .include <bsd.port.mk>
> diff --git a/www/py-multidict/distinfo b/www/py-multidict/distinfo
> index 7f3b4249700..b359eac3d56 100644
> --- a/www/py-multidict/distinfo
> +++ b/www/py-multidict/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (multidict-1.1.0a6.tar.gz) =
> rD8aE0yHp/bnVHy8tZXl6zbRwYZRAad38ufAoY2CQXM=
> -SIZE (multidict-1.1.0a6.tar.gz) = 98630
> +SHA256 (multidict-4.0.0.tar.gz) =
> tySGs60rhET3r+va/aixEcGAPjcgPf6Bt3ZSmPJ4F3g=
> +SIZE (multidict-4.0.0.tar.gz) = 135103
> diff --git a/www/py-multidict/pkg/DESCR b/www/py-multidict/pkg/DESCR
> index 3aa679dad30..c6811c47de6 100644
> --- a/www/py-multidict/pkg/DESCR
> +++ b/www/py-multidict/pkg/DESCR
> @@ -1 +1,4 @@
> -Multidicts are useful for working with HTTP headers, URL query args etc.
> +Multidict is a dict-like structure supporting keys with multiple values that
> +preserves insertion ordering.
> +
> +This is useful when working with HTTP Headers or URL query strings.
> diff --git a/www/py-multidict/pkg/PLIST b/www/py-multidict/pkg/PLIST
> index 025938d5746..abc855dea21 100644
> --- a/www/py-multidict/pkg/PLIST
> +++ b/www/py-multidict/pkg/PLIST
> @@ -7,9 +7,17 @@
> lib/python${MODPY_VERSION}/site-packages/multidict-${MODPY_EGG_VERSION}-py${MODP
>
> lib/python${MODPY_VERSION}/site-packages/multidict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
>
> lib/python${MODPY_VERSION}/site-packages/multidict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> lib/python${MODPY_VERSION}/site-packages/multidict/__init__.py
> +lib/python${MODPY_VERSION}/site-packages/multidict/__init__.pyi
> lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_abc.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_multidict_py.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/multidict/_abc.py
> +lib/python${MODPY_VERSION}/site-packages/multidict/_compat.py
> +lib/python${MODPY_VERSION}/site-packages/multidict/_istr.c
> +lib/python${MODPY_VERSION}/site-packages/multidict/_istr.pyd
> +lib/python${MODPY_VERSION}/site-packages/multidict/_istr.so
> lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.c
> lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.pyx
> lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.so
>
