Date: Tue, 1 Mar 2022 02:22:41 +0100 From: Muhammad Moinur Rahman <bofh@freebsd.org> To: Sunpoet Po-Chuan Hsieh <sunpoet@freebsd.org> Cc: ports-committers <ports-committers@freebsd.org>, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org, Yasuhiro Kimura <yasu@freebsd.org> Subject: Re: git: 08b5ebce79c5 - main - dns/py-dnspython: Revert 7fc16da Message-ID: <B23223CD-BC3C-4796-8B5E-FFC77DA1186E@freebsd.org> In-Reply-To: <CAMHz58Q_crKVnLVjg9PE8B=HyVtXHoAoc4%2BpXp2fr8tYLdib2A@mail.gmail.com> References: <202202282341.21SNf1fw039508@gitrepo.freebsd.org> <CAMHz58R_8PP-Mkeg_PBD0b==mwDGj%2BvjzHucu3Zy6E_Sf1UK_A@mail.gmail.com> <0E479595-637E-4F10-87E4-B3D5CFD672F4@freebsd.org> <CAMHz58Q_crKVnLVjg9PE8B=HyVtXHoAoc4%2BpXp2fr8tYLdib2A@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_BB2CF1C1-D16A-4A4E-A892-6CB0738938A4 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 No it=E2=80=99s not alright having two portversion at least not while = you are using tree. Give me an hour to fix this as per your advise. Kind Regards, Moin (bofh) > On 1 Mar 2022, at 02:13, Po-Chuan Hsieh <sunpoet@freebsd.org> wrote: >=20 > I mean revert this commit. >=20 > It is fine for me to have 2 PORTVERSIONs in a port. > If you think it is not acceptable, I also provided the solution as = mentioned in previous mail. > - Add dns/py-dnspython1 (w/ USES=3Dpython:2.7) just for mail/mailman. > - Update dns/py-dnspython to 2.2.0 (w/ USES=3Dpython:3.6+) > - Remove dns/py-dnspython2 >=20 > On Tue, Mar 1, 2022 at 8:58 AM Muhammad Moinur Rahman = <bofh@freebsd.org> wrote: > Revert what? >=20 > USES=3D python:2.7-3.7 to USES=3D python:2.7+? >=20 > Or you mean keeping the entire logic of having two different = PORTVERSION in one single port? Which is not at all a good idea as is = not supported by portmgr@ at the moment. >=20 >=20 > Kind Regards, > Moin (bofh) >=20 > > On 1 Mar 2022, at 01:47, Po-Chuan Hsieh <sunpoet@freebsd.org> wrote: > > > > Please revert it. > > At least it breaks dependent ports now. > > > > from poudriere: > > [00:00:31] [03] [00:00:00] Building dns/py-dnspython@py38 | = py38-dnspython-1.16.0,1 > > [00:00:31] [03] [00:00:00] Finished dns/py-dnspython@py38 | = py38-dnspython-1.16.0,1: Ignored: Unknown flavor 'py38', possible = flavors: py27 py37 > > [00:00:31] [03] [00:00:00] Skipping net/py-eventlet | = py38-eventlet-0.33.0: Dependent port dns/py-dnspython@py38 | = py38-dnspython-1.16.0,1 ignored > > [00:00:31] [03] [00:00:00] Skipping devel/py-glance-store | = py38-glance-store-3.0.0: Dependent port dns/py-dnspython@py38 | = py38-dnspython-1.16.0,1 ignored > > [00:00:31] [03] [00:00:00] Skipping devel/py-os-brick | = py38-os-brick-5.2.0: Dependent port dns/py-dnspython@py38 | = py38-dnspython-1.16.0,1 ignored > > [00:00:31] [03] [00:00:00] Skipping devel/py-os-win | = py38-os-win-5.6.0: Dependent port dns/py-dnspython@py38 | = py38-dnspython-1.16.0,1 ignored > > [00:00:31] [03] [00:00:00] Skipping devel/py-oslo.privsep | = py38-oslo.privsep-2.7.0: Dependent port dns/py-dnspython@py38 | = py38-dnspython-1.16.0,1 ignored > > [00:00:31] [03] [00:00:00] Skipping devel/py-oslo.service | = py38-oslo.service-2.8.0: Dependent port dns/py-dnspython@py38 | = py38-dnspython-1.16.0,1 ignored > > [00:00:31] [03] [00:00:00] Skipping devel/py-oslo.vmware | = py38-oslo.vmware-3.10.0: Dependent port dns/py-dnspython@py38 | = py38-dnspython-1.16.0,1 ignored > > > > AFAIK, mail/mailman is the only consumer of dns/py-dnspython@py27. > > It will be better to: > > - Add dns/py-dnspython1 (w/ USES=3Dpython:2.7) just for = mail/mailman. > > - Update dns/py-dnspython to 2.2.0 (w/ USES=3Dpython:3.6+) > > - Remove dns/py-dnspython2 > > > > The reason why I suggest keeping dns/py-dnspython, not your = dns/py-dnspython2, is to match upstream naming on PyPI. > > It helps everyone to find the correct port we want. > > > > Thanks, > > sunpoet > > > > On Tue, Mar 1, 2022 at 7:41 AM Muhammad Moinur Rahman = <bofh@freebsd.org> wrote: > > The branch main has been updated by bofh: > > > > URL: = https://cgit.FreeBSD.org/ports/commit/?id=3D08b5ebce79c5923c31b249d37df69b= 99ddcb843e > > > > commit 08b5ebce79c5923c31b249d37df69b99ddcb843e > > Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> > > AuthorDate: 2022-02-28 23:31:02 +0000 > > Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> > > CommitDate: 2022-02-28 23:40:41 +0000 > > > > dns/py-dnspython: Revert 7fc16da > > > > - Remove duplicate PORTVERSION based on PYTHON_MAJOR_VER > > - Add PORTEPOCH as version number going backwards 2.1.0=3D>1.16.0 > > - Restrict python upto 3.7 > > - Fix finance/electrum which was changed based on this. > > - Fix dns/py-dns-lexicon which was changed based on this. > > PR: 261325 > > Approved by: portmgr > > Fixes: 7fc16da dns/py-dnspython: Update to 2.1.0 for Python 3 > > --- > > dns/py-dns-lexicon/Makefile | 4 ++-- > > dns/py-dnspython/Makefile | 22 ++++++++-------------- > > dns/py-dnspython/distinfo | 4 +--- > > finance/electrum/Makefile | 4 ++-- > > 4 files changed, 13 insertions(+), 21 deletions(-) > > > > diff --git a/dns/py-dns-lexicon/Makefile = b/dns/py-dns-lexicon/Makefile > > index f5b1b39ca35d..12f4451fbb78 100644 > > --- a/dns/py-dns-lexicon/Makefile > > +++ b/dns/py-dns-lexicon/Makefile > > @@ -2,7 +2,7 @@ > > > > PORTNAME=3D dns-lexicon > > PORTVERSION=3D 3.9.2 > > -PORTREVISION=3D 1 > > +PORTREVISION=3D 2 > > CATEGORIES=3D dns python > > MASTER_SITES=3D CHEESESHOP > > PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX} > > @@ -32,7 +32,7 @@ OCI_DESC=3D Oracle Cloud Infrastructure (OCI) = support > > ROUTE53_DESC=3D Route 53 support > > SOFTLAYER_DESC=3D SoftLayer (IBM Cloud) support > > > > -DDNS_RUN_DEPENDS=3D = ${PYTHON_PKGNAMEPREFIX}dnspython>=3D2:dns/py-dnspython@${PY_FLAVOR} > > +DDNS_RUN_DEPENDS=3D = ${PYTHON_PKGNAMEPREFIX}dnspython2>=3D2:dns/py-dnspython2@${PY_FLAVOR} > > GRANSY_RUN_DEPENDS=3D = ${PYTHON_PKGNAMEPREFIX}zeep>=3D3:net/py-zeep@${PY_FLAVOR} > > LOCALZONE_RUN_DEPENDS=3D = ${PYTHON_PKGNAMEPREFIX}localzone>=3D0.9.8:dns/py-localzone@${PY_FLAVOR} > > OCI_RUN_DEPENDS=3D = ${PYTHON_PKGNAMEPREFIX}oci>=3D2:devel/py-oci@${PY_FLAVOR} > > diff --git a/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefile > > index ba52900816d1..083f98e153a6 100644 > > --- a/dns/py-dnspython/Makefile > > +++ b/dns/py-dnspython/Makefile > > @@ -2,6 +2,7 @@ > > > > PORTNAME=3D dnspython > > PORTVERSION=3D 1.16.0 > > +PORTEPOCH=3D 1 > > CATEGORIES=3D dns python > > MASTER_SITES=3D CHEESESHOP > > PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX} > > @@ -12,27 +13,20 @@ COMMENT=3D DNS toolkit for Python > > LICENSE=3D ISCL > > LICENSE_FILE=3D ${WRKSRC}/LICENSE > > > > -USES=3D python:2.7+ zip > > +USES=3D python:2.7-3.7 zip > > USE_PYTHON=3D autoplist concurrent cython distutils > > > > NO_ARCH=3D yes > > > > -OPTIONS_DEFINE=3D EXAMPLES PYCRYPTODOME > > -PYCRYPTODOME_DESC=3D Enable pycryptodome (part of dnssec needs = it) > > -PYCRYPTODOME_RUN_DEPENDS=3D = ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3D0:security/py-pycryptodome@${PY_FLA= VOR} > > - > > -PORTEXAMPLES=3D ddns.py e164.py mx.py name.py reverse.py = reverse_name.py \ > > - xfr.py zonediff.py > > +PORTEXAMPLES=3D ddns.py e164.py mx.py name.py reverse.py = reverse_name.py xfr.py \ > > + zonediff.py > > > > -.include <bsd.port.pre.mk> > > - > > -.if ${PYTHON_MAJOR_VER} =3D=3D 3 > > -PORTVERSION=3D 2.1.0 > > -.endif > > +OPTIONS_DEFINE=3D EXAMPLES PYCRYPTODOME > > +PYCRYPTODOME_DESC=3D Enable pycryptodome (part of = dnssec needs it) > > +PYCRYPTODOME_RUN_DEPENDS=3D = ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3D0:security/py-pycryptodome@${PY_FLA= VOR} > > > > post-install-EXAMPLES-on: > > -# examples > > @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > > ${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/examples/,} = ${STAGEDIR}${EXAMPLESDIR} > > > > -.include <bsd.port.post.mk> > > +.include <bsd.port.mk> > > diff --git a/dns/py-dnspython/distinfo b/dns/py-dnspython/distinfo > > index a4ae58940da3..88b7df39d17d 100644 > > --- a/dns/py-dnspython/distinfo > > +++ b/dns/py-dnspython/distinfo > > @@ -1,5 +1,3 @@ > > -TIMESTAMP =3D 1613064959 > > +TIMESTAMP =3D 1646069762 > > SHA256 (dnspython-1.16.0.zip) =3D = 36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01 > > SIZE (dnspython-1.16.0.zip) =3D 266364 > > -SHA256 (dnspython-2.1.0.zip) =3D = e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4 > > -SIZE (dnspython-2.1.0.zip) =3D 389021 > > diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile > > index 93d821c7bc2e..901c2d8e96b9 100644 > > --- a/finance/electrum/Makefile > > +++ b/finance/electrum/Makefile > > @@ -2,7 +2,7 @@ > > > > PORTNAME=3D electrum > > PORTVERSION=3D 4.1.5 > > -PORTREVISION=3D 1 > > +PORTREVISION=3D 2 > > CATEGORIES=3D finance python > > MASTER_SITES=3D https://download.electrum.org/${PORTVERSION}/ \ > > http://download.electrum.org/${PORTVERSION}/ > > @@ -23,7 +23,7 @@ RUN_DEPENDS=3D = ${PYTHON_PKGNAMEPREFIX}aiohttp-socks>=3D0.3:net/py-aiohttp-socks@${PY > > = ${PYTHON_PKGNAMEPREFIX}bitstring>0:devel/py-bitstring@${PY_FLAVOR} \ > > = ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \ > > = ${PYTHON_PKGNAMEPREFIX}cryptography>=3D2.6:security/py-cryptography@${PY_F= LAVOR} \ > > - = ${PYTHON_PKGNAMEPREFIX}dnspython>=3D2.0:dns/py-dnspython@${PY_FLAVOR} \ > > + = ${PYTHON_PKGNAMEPREFIX}dnspython2>=3D2.0:dns/py-dnspython2@${PY_FLAVOR} = \ > > = ${PYTHON_PKGNAMEPREFIX}httplib2>=3D0:www/py-httplib2@${PY_FLAVOR} \ > > = ${PYTHON_PKGNAMEPREFIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix@${PY_F= LAVOR} \ > > = ${PYTHON_PKGNAMEPREFIX}pbkdf2>=3D1.3:security/py-pbkdf2@${PY_FLAVOR} \ >=20 --Apple-Mail=_BB2CF1C1-D16A-4A4E-A892-6CB0738938A4 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEETfdREoUGjQZKBS+fvbm1phfAvJEFAmIddWFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDRE Rjc1MTEyODUwNjhEMDY0QTA1MkY5RkJEQjlCNUE2MTdDMEJDOTEACgkQvbm1phfA vJHExhAAj4p0/l2l03JAKPe3zuuvItTeCfWWxjQXsMaU5FkyxU/Rz6LRtcj2bfMy o0wGbzdsJMtamTKWqgC0kZaGAP9Dx8np6/YUMPcrJCySNEKKZRk2VsQzdYCSp42V aPKkhhBqOfFhPIt4r76yBjHD+2DVsXS3OWPgu2FpjBV8s7zdCt3yf5QgIiGRvyhW jiBNbAA/Y9ad5CdeNZ4QSGI+UfRaPjRTCgRl0vb1Qf3TtMjTUQUkRi7moAaPVQ1o wN/i0uogxww3YQ4M7SexTBGcGC9ODO8h0qrJPYu1MJZmHyobrOD1s9GC86q6UlN9 ahCKFMGZIHJBv8HDazpwXOo6RPA5eT3mtZ2tAoheI8HGY0H+GpLWOMSVcR4VHAHs knmHHAn4mY8S1WysrITJ/739L+cGlM9pOOJFghxvemDqnJklY96bKlWB2TqxkOs5 X8S/NHkGzk2NGG65gzOwY5WEkejlWzeHH05mjbrO4/PSLeWh6menBKqztF9AMUT5 hywnVGOj+KZHXDPEFCCkP8VRACdr0o/yiSc47ctPfk8d7qGQDtqdO+tWziUxOSbP oTGe1HXYfOTxnngFbWsqW9zqsNzzAAbSJ2R74mzRu+/8QibufEfsy1UHKArDHbmG uD8QgHBNlXKjtwFKGQKt/2awzkr7FcVcPWr0i8xaoiqinHAFX6s= =pvFI -----END PGP SIGNATURE----- --Apple-Mail=_BB2CF1C1-D16A-4A4E-A892-6CB0738938A4--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?B23223CD-BC3C-4796-8B5E-FFC77DA1186E>