Re: update: www/py-multidict
On Mon, Mar 09 2020, Stuart Henderson wrote:
> On 2020/03/09 15:49, Paco Esteban wrote:
>> On Mon, 09 Mar 2020, Stuart Henderson wrote:
>>
>> > On 2020/03/08 18:47, Paco Esteban wrote:
>> > > Hi ports@,
>> > >
>> > > Here's an update for www/py-multidict to 4.7.5
>> >
>> > Could you convert to new-style FLAVOR=python3 / FLAVORS=python3 while
>> > there please?
>> > (depends in py-yarl, py-aiohttp, py-gunicorn will need bumps and
>> > ${MODPY_FLAVOR}
>> > adding to the multidict line).
>> >
>> > > --- pkg/PLIST26 Apr 2018 13:05:38 - 1.3
>> > > +++ pkg/PLIST6 Mar 2020 18:22:56 -
>> > > @@ -1,5 +1,5 @@
>> > > @comment $OpenBSD: PLIST,v 1.3 2018/04/26 13:05:38 danj Exp $
>> > > -@pkgpath www/py3-multidict
>> > > +@pkgpath www/${MODPY_PY_PREFIX}multidict
>> >
>> > Please put this line back how it was.
>>
>> Find attached the modified diff for www/py-multidict. I've also
>> included 2 diffs for www/py-yarl and www/py-aiohttp. For py-gunicorn,
>> I'll send as a response to the thread I started for its update.
>>
>> I'll also commit mods to www/Makefile and quirks if this is ok.
>
> So with the new-style FLAVOR=python3 in order to get the update to work
> seamlessly, it will also need
>
> @pkgpath www/py-multidict
>
> in www/py-multidict/pkg/PLIST.
>
> Otherwise OK (assuming py-gunicorn done at the same time).
Same here, ok jca@ with sthen@'s PLIST tweak.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update: www/py-multidict
On 2020/03/09 15:49, Paco Esteban wrote:
> On Mon, 09 Mar 2020, Stuart Henderson wrote:
>
> > On 2020/03/08 18:47, Paco Esteban wrote:
> > > Hi ports@,
> > >
> > > Here's an update for www/py-multidict to 4.7.5
> >
> > Could you convert to new-style FLAVOR=python3 / FLAVORS=python3 while there
> > please?
> > (depends in py-yarl, py-aiohttp, py-gunicorn will need bumps and
> > ${MODPY_FLAVOR}
> > adding to the multidict line).
> >
> > > --- pkg/PLIST 26 Apr 2018 13:05:38 - 1.3
> > > +++ pkg/PLIST 6 Mar 2020 18:22:56 -
> > > @@ -1,5 +1,5 @@
> > > @comment $OpenBSD: PLIST,v 1.3 2018/04/26 13:05:38 danj Exp $
> > > -@pkgpath www/py3-multidict
> > > +@pkgpath www/${MODPY_PY_PREFIX}multidict
> >
> > Please put this line back how it was.
>
> Find attached the modified diff for www/py-multidict. I've also
> included 2 diffs for www/py-yarl and www/py-aiohttp. For py-gunicorn,
> I'll send as a response to the thread I started for its update.
>
> I'll also commit mods to www/Makefile and quirks if this is ok.
So with the new-style FLAVOR=python3 in order to get the update to work
seamlessly, it will also need
@pkgpath www/py-multidict
in www/py-multidict/pkg/PLIST.
Otherwise OK (assuming py-gunicorn done at the same time).
Re: update: www/py-multidict
On Mon, 09 Mar 2020, Stuart Henderson wrote:
> On 2020/03/08 18:47, Paco Esteban wrote:
> > Hi ports@,
> >
> > Here's an update for www/py-multidict to 4.7.5
>
> Could you convert to new-style FLAVOR=python3 / FLAVORS=python3 while there
> please?
> (depends in py-yarl, py-aiohttp, py-gunicorn will need bumps and
> ${MODPY_FLAVOR}
> adding to the multidict line).
>
> > --- pkg/PLIST 26 Apr 2018 13:05:38 - 1.3
> > +++ pkg/PLIST 6 Mar 2020 18:22:56 -
> > @@ -1,5 +1,5 @@
> > @comment $OpenBSD: PLIST,v 1.3 2018/04/26 13:05:38 danj Exp $
> > -@pkgpath www/py3-multidict
> > +@pkgpath www/${MODPY_PY_PREFIX}multidict
>
> Please put this line back how it was.
Find attached the modified diff for www/py-multidict. I've also
included 2 diffs for www/py-yarl and www/py-aiohttp. For py-gunicorn,
I'll send as a response to the thread I started for its update.
I'll also commit mods to www/Makefile and quirks if this is ok.
Cheers,
--
Paco Esteban.
0x5818130B8A6DBC03
Index: Makefile
===
RCS file: /home/cvs/ports/www/py-multidict/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile12 Jul 2019 20:51:02 - 1.7
+++ Makefile9 Mar 2020 14:37:16 -
@@ -2,13 +2,12 @@
COMMENT = multidict implementation
-MODPY_EGG_VERSION =4.2.0
-REVISION = 1
+MODPY_EGG_VERSION =4.7.5
DISTNAME = multidict-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = www devel
-WANTLIB += pthread ${MODPY_WANTLIB}
+WANTLIB += pthread ${MODPY_WANTLIB}
# Apache2
PERMIT_PACKAGE = Yes
@@ -17,8 +16,12 @@ MODULES =lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+MODPY_PYTEST = Yes
-TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
+FLAVORS = python3
+FLAVOR = python3
+
+TEST_DEPENDS = devel/py-test${MODPY_FLAVOR} \
+ devel/py-test-cov${MODPY_FLAVOR}
.include
Index: distinfo
===
RCS file: /home/cvs/ports/www/py-multidict/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo26 Apr 2018 13:05:38 - 1.3
+++ distinfo9 Mar 2020 14:34:30 -
@@ -1,2 +1,2 @@
-SHA256 (multidict-4.2.0.tar.gz) = JAUnJBleRocnOfqhDGEZV7us6uKO7JLhzkkVCxFexe0=
-SIZE (multidict-4.2.0.tar.gz) = 137359
+SHA256 (multidict-4.7.5.tar.gz) = ruKDxJYB+kwTrcZMCcl4g4p+gS+FN3rhMKJNcZjAMx4=
+SIZE (multidict-4.7.5.tar.gz) = 50845
Index: patches/patch-multidict__multidict_c
===
RCS file: patches/patch-multidict__multidict_c
diff -N patches/patch-multidict__multidict_c
--- patches/patch-multidict__multidict_c1 Aug 2018 22:39:13 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-multidict__multidict_c,v 1.1 2018/08/01 22:39:13 juanfra Exp $
-
-Os breaks the build on GCC4 platforms.
-
-Index: multidict/_multidict.c
multidict/_multidict.c.orig
-+++ multidict/_multidict.c
-@@ -20116,8 +20116,6 @@ static int __Pyx_modinit_function_import_code(void) {
- #ifndef CYTHON_SMALL_CODE
- #if defined(__clang__)
- #define CYTHON_SMALL_CODE
--#elif defined(__GNUC__)
--#define CYTHON_SMALL_CODE __attribute__((optimize("Os")))
- #else
- #define CYTHON_SMALL_CODE
- #endif
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/www/py-multidict/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 26 Apr 2018 13:05:38 - 1.3
+++ pkg/PLIST 9 Mar 2020 14:35:43 -
@@ -8,18 +8,23 @@ lib/python${MODPY_VERSION}/site-packages
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}/
+${MODPY_COMMENT}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_base.${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
Re: update: www/py-multidict
On 2020/03/08 18:47, Paco Esteban wrote:
> Hi ports@,
>
> Here's an update for www/py-multidict to 4.7.5
Could you convert to new-style FLAVOR=python3 / FLAVORS=python3 while there
please?
(depends in py-yarl, py-aiohttp, py-gunicorn will need bumps and
${MODPY_FLAVOR}
adding to the multidict line).
> --- pkg/PLIST 26 Apr 2018 13:05:38 - 1.3
> +++ pkg/PLIST 6 Mar 2020 18:22:56 -
> @@ -1,5 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.3 2018/04/26 13:05:38 danj Exp $
> -@pkgpath www/py3-multidict
> +@pkgpath www/${MODPY_PY_PREFIX}multidict
Please put this line back how it was.
update: www/py-multidict
Hi ports@,
Here's an update for www/py-multidict to 4.7.5
Changes to the software can be found here (2 links for some reason ...):
https://github.com/aio-libs/multidict/blob/master/HISTORY.rst
https://github.com/aio-libs/multidict/blob/master/CHANGES.rst
Tests pass for me on amd64.
As for consumers:
* www/py-aiohttp
* NO_TESTS=yes
* www/py-gunicorn
* all tests pass
* www/py-yarl
* all tests pass (0 tests ???)
Cheers,
Paco.
Index: Makefile
===
RCS file: /home/cvs/ports/www/py-multidict/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile12 Jul 2019 20:51:02 - 1.7
+++ Makefile6 Mar 2020 18:38:23 -
@@ -2,13 +2,12 @@
COMMENT = multidict implementation
-MODPY_EGG_VERSION =4.2.0
-REVISION = 1
+MODPY_EGG_VERSION =4.7.5
DISTNAME = multidict-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = www devel
-WANTLIB += pthread ${MODPY_WANTLIB}
+WANTLIB += pthread ${MODPY_WANTLIB}
# Apache2
PERMIT_PACKAGE = Yes
@@ -18,7 +17,9 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+MODPY_PYTEST = Yes
-TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
+TEST_DEPENDS = devel/py-test${MODPY_FLAVOR} \
+ devel/py-test-cov${MODPY_FLAVOR}
.include
Index: distinfo
===
RCS file: /home/cvs/ports/www/py-multidict/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo26 Apr 2018 13:05:38 - 1.3
+++ distinfo6 Mar 2020 18:22:01 -
@@ -1,2 +1,2 @@
-SHA256 (multidict-4.2.0.tar.gz) = JAUnJBleRocnOfqhDGEZV7us6uKO7JLhzkkVCxFexe0=
-SIZE (multidict-4.2.0.tar.gz) = 137359
+SHA256 (multidict-4.7.5.tar.gz) = ruKDxJYB+kwTrcZMCcl4g4p+gS+FN3rhMKJNcZjAMx4=
+SIZE (multidict-4.7.5.tar.gz) = 50845
Index: patches/patch-multidict__multidict_c
===
RCS file: patches/patch-multidict__multidict_c
diff -N patches/patch-multidict__multidict_c
--- patches/patch-multidict__multidict_c1 Aug 2018 22:39:13 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-multidict__multidict_c,v 1.1 2018/08/01 22:39:13 juanfra Exp $
-
-Os breaks the build on GCC4 platforms.
-
-Index: multidict/_multidict.c
multidict/_multidict.c.orig
-+++ multidict/_multidict.c
-@@ -20116,8 +20116,6 @@ static int __Pyx_modinit_function_import_code(void) {
- #ifndef CYTHON_SMALL_CODE
- #if defined(__clang__)
- #define CYTHON_SMALL_CODE
--#elif defined(__GNUC__)
--#define CYTHON_SMALL_CODE __attribute__((optimize("Os")))
- #else
- #define CYTHON_SMALL_CODE
- #endif
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/www/py-multidict/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 26 Apr 2018 13:05:38 - 1.3
+++ pkg/PLIST 6 Mar 2020 18:22:56 -
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2018/04/26 13:05:38 danj Exp $
-@pkgpath www/py3-multidict
+@pkgpath www/${MODPY_PY_PREFIX}multidict
lib/python${MODPY_VERSION}/site-packages/multidict/
lib/python${MODPY_VERSION}/site-packages/multidict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/multidict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -8,18 +8,23 @@ lib/python${MODPY_VERSION}/site-packages
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}/
+${MODPY_COMMENT}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_base.${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
Re: update www/py-multidict [hass: #10]
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
> > --- Makefile3 Jan 2017 19:28:49 - 1.2
> > +++ Makefile16 Jan 2018 20:51:00 -
> > @@ -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
> > --- distinfo5 Jun 2016 17:08:19 - 1.1.1.1
> > +++ distinfo16 Jan 2018 20:51:00 -
> > @@ -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 - 1.1.1.1
> > +++ pkg/PLIST 16 Jan 2018 20:51:00 -
> > @@ -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 =
Re: update www/py-multidict [hass: #10]
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 - 1.2
> +++ Makefile 16 Jan 2018 20:51:00 -
> @@ -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 - 1.1.1.1
> +++ distinfo 16 Jan 2018 20:51:00 -
> @@ -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 - 1.1.1.1
> +++ pkg/PLIST 16 Jan 2018 20:51:00 -
> @@ -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, 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?
I'm also updating py-aiohttp and py-yarl to their latest versions now,
these *should* work with the upcoming homeassistant port.
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 =
Re: update www/py-multidict [hass: #10]
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.
Meanwhile multidict-4.0.0 was release, so new diff below.
> OK?
>
> Regards,
> Joerg
Index: Makefile
===
RCS file: /cvs/ports/www/py-multidict/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile3 Jan 2017 19:28:49 - 1.2
+++ Makefile17 Jan 2018 19:28:00 -
@@ -2,15 +2,10 @@
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}
@@ -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
--- distinfo5 Jun 2016 17:08:19 - 1.1.1.1
+++ distinfo17 Jan 2018 19:28:00 -
@@ -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
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 - 1.1.1.1
+++ pkg/PLIST 17 Jan 2018 19:28:00 -
@@ -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
update www/py-multidict [hass: #10]
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
--- Makefile3 Jan 2017 19:28:49 - 1.2
+++ Makefile16 Jan 2018 20:51:00 -
@@ -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
--- distinfo5 Jun 2016 17:08:19 - 1.1.1.1
+++ distinfo16 Jan 2018 20:51:00 -
@@ -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 - 1.1.1.1
+++ pkg/PLIST 16 Jan 2018 20:51:00 -
@@ -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
