Date: Fri, 3 Nov 2023 10:42:07 -0600 From: Po-Chuan Hsieh <sunpoet@freebsd.org> To: Wen Heping <wen@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 9bccc8a106f5 - main - math/py-networkx: Update to 3.2 Message-ID: <CAMHz58Sy_HS4uw_ZqVG9hSu8DKV79UP8=DRWvsvv57kTLcoOnw@mail.gmail.com> In-Reply-To: <202311010934.3A19YBGF015593@gitrepo.freebsd.org> References: <202311010934.3A19YBGF015593@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000a331b8060942318c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello, On Wed, Nov 1, 2023 at 3:34=E2=80=AFAM Wen Heping <wen@freebsd.org> wrote: > The branch main has been updated by wen: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3D9bccc8a106f5f2f618b5adc5eb62e= a54edb3486a > > commit 9bccc8a106f5f2f618b5adc5eb62ea54edb3486a > Author: Wen Heping <wen@FreeBSD.org> > AuthorDate: 2023-11-01 09:32:04 +0000 > Commit: Wen Heping <wen@FreeBSD.org> > CommitDate: 2023-11-01 09:33:09 +0000 > > math/py-networkx: Update to 3.2 > FYI, it breaks pytype. See https://pkg-status.freebsd.org/beefy16/data/132amd64-default/9218fd8f40f2/l= ogs/pytype-py39-2023.5.8.log Regards, sunpoet > --- > math/py-networkx/Makefile | 12 +++++---- > math/py-networkx/distinfo | 6 ++--- > math/py-networkx/files/patch-setup.py | 47 > ----------------------------------- > 3 files changed, 10 insertions(+), 55 deletions(-) > > diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile > index f115a901f124..6dcb079b0ad0 100644 > --- a/math/py-networkx/Makefile > +++ b/math/py-networkx/Makefile > @@ -1,6 +1,5 @@ > PORTNAME=3D networkx > -DISTVERSION=3D 3.1 > -PORTREVISION=3D 1 > +DISTVERSION=3D 3.2 > PORTEPOCH=3D 1 > CATEGORIES=3D math python > MASTER_SITES=3D PYPI > @@ -12,15 +11,18 @@ WWW=3D https://networkx.github.io/ > > LICENSE=3D BSD3CLAUSE > > -RUN_DEPENDS:=3D ${PYTHON_PKGNAMEPREFIX}decorator>=3D4.3.0:devel/py-deco= rator@ > ${PY_FLAVOR} > +BUILD_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}setuptools>=3D0:devel/py-setupto= ols@${PY_FLAVOR} > \ > + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR= } > +#RUN_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}decorator>=3D4.3.0:devel/py-deco= rator@ > ${PY_FLAVOR} > > USES=3D cpe python shebangfix > -USE_PYTHON=3D autoplist concurrent distutils pytest > +USE_PYTHON=3D autoplist concurrent pep517 pytest > + > SHEBANG_GLOB=3D *.py > NO_ARCH=3D yes > CPE_VENDOR=3D python > > -PLIST_SUB+=3D PYTHON_MAJOR_VER=3D${PYTHON_MAJOR_VER} > +#PLIST_SUB+=3D PYTHON_MAJOR_VER=3D${PYTHON_MAJOR_VER} > > OPTIONS_DEFINE=3D EXAMPLES GDAL LXML PANDAS PYDOT YAML > OPTIONS_GROUP=3D MATRIX RENDER > diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo > index b3d643572dca..0307c250a5ad 100644 > --- a/math/py-networkx/distinfo > +++ b/math/py-networkx/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP =3D 1681555373 > -SHA256 (networkx-3.1.tar.gz) =3D > de346335408f84de0eada6ff9fafafff9bcda11f0a0dfaa931133debb146ab61 > -SIZE (networkx-3.1.tar.gz) =3D 2021691 > +TIMESTAMP =3D 1698752274 > +SHA256 (networkx-3.2.tar.gz) =3D > bda29edf392d9bfa5602034c767d28549214ec45f620081f0b74dc036a1fbbc1 > +SIZE (networkx-3.2.tar.gz) =3D 2072917 > diff --git a/math/py-networkx/files/patch-setup.py > b/math/py-networkx/files/patch-setup.py > deleted file mode 100644 > index 1d28af3e2856..000000000000 > --- a/math/py-networkx/files/patch-setup.py > +++ /dev/null > @@ -1,47 +0,0 @@ > ---- setup.py.orig 2023-02-20 13:03:51 UTC > -+++ setup.py > -@@ -92,36 +92,6 @@ packages =3D [ > - "networkx.utils", > - ] > - > --docdirbase =3D "share/doc/networkx-%s" % version > --# add basic documentation > --data =3D [(docdirbase, glob("*.txt"))] > --# add examples > --for d in [ > -- ".", > -- "advanced", > -- "algorithms", > -- "basic", > -- "3d_drawing", > -- "drawing", > -- "graph", > -- "javascript", > -- "jit", > -- "pygraphviz", > -- "subclass", > --]: > -- dd =3D os.path.join(docdirbase, "examples", d) > -- pp =3D os.path.join("examples", d) > -- data.append((dd, glob(os.path.join(pp, "*.txt")))) > -- data.append((dd, glob(os.path.join(pp, "*.py")))) > -- data.append((dd, glob(os.path.join(pp, "*.bz2")))) > -- data.append((dd, glob(os.path.join(pp, "*.gz")))) > -- data.append((dd, glob(os.path.join(pp, "*.mbox")))) > -- data.append((dd, glob(os.path.join(pp, "*.edgelist")))) > --# add js force examples > --dd =3D os.path.join(docdirbase, "examples", "javascript/force") > --pp =3D os.path.join("examples", "javascript/force") > --data.append((dd, glob(os.path.join(pp, "*")))) > -- > - # add the tests subpackage(s) > - package_data =3D { > - "networkx": ["tests/*.py"], > -@@ -185,7 +155,6 @@ if __name__ =3D=3D "__main__": > - project_urls=3Dproject_urls, > - classifiers=3Dclassifiers, > - packages=3Dpackages, > -- data_files=3Ddata, > - package_data=3Dpackage_data, > - install_requires=3Dinstall_requires, > - extras_require=3Dextras_require, > > --000000000000a331b8060942318c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div>Hello,</div><br><div class=3D"gmail_quote"><div dir= =3D"ltr" class=3D"gmail_attr">On Wed, Nov 1, 2023 at 3:34=E2=80=AFAM Wen He= ping <<a href=3D"mailto:wen@freebsd.org">wen@freebsd.org</a>> wrote:<= br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8e= x;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main = has been updated by wen:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3D9bccc8a106f5f2f= 618b5adc5eb62ea54edb3486a" rel=3D"noreferrer" target=3D"_blank">https://cgi= t.FreeBSD.org/ports/commit/?id=3D9bccc8a106f5f2f618b5adc5eb62ea54edb3486a</= a><br> <br> commit 9bccc8a106f5f2f618b5adc5eb62ea54edb3486a<br> Author:=C2=A0 =C2=A0 =C2=A0Wen Heping <wen@FreeBSD.org><br> AuthorDate: 2023-11-01 09:32:04 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0Wen Heping <wen@FreeBSD.org><br> CommitDate: 2023-11-01 09:33:09 +0000<br> <br> =C2=A0 =C2=A0 math/py-networkx: Update to 3.2<br></blockquote><div><br></di= v><div>FYI, it breaks pytype.</div><div>See=C2=A0<a href=3D"https://pkg-sta= tus.freebsd.org/beefy16/data/132amd64-default/9218fd8f40f2/logs/pytype-py39= -2023.5.8.log">https://pkg-status.freebsd.org/beefy16/data/132amd64-default= /9218fd8f40f2/logs/pytype-py39-2023.5.8.log</a></div><div><br></div><div>Re= gards,</div><div>sunpoet</div><div>=C2=A0</div><blockquote class=3D"gmail_q= uote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,2= 04);padding-left:1ex"> ---<br> =C2=A0math/py-networkx/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0| 12 +++++----<br> =C2=A0math/py-networkx/distinfo=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0|=C2=A0 6 ++---<br> =C2=A0math/py-networkx/files/patch-setup.py | 47 --------------------------= ---------<br> =C2=A03 files changed, 10 insertions(+), 55 deletions(-)<br> <br> diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile<br> index f115a901f124..6dcb079b0ad0 100644<br> --- a/math/py-networkx/Makefile<br> +++ b/math/py-networkx/Makefile<br> @@ -1,6 +1,5 @@<br> =C2=A0PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 networkx<br> -DISTVERSION=3D=C2=A0 =C2=A03.1<br> -PORTREVISION=3D=C2=A0 1<br> +DISTVERSION=3D=C2=A0 =C2=A03.2<br> =C2=A0PORTEPOCH=3D=C2=A0 =C2=A0 =C2=A01<br> =C2=A0CATEGORIES=3D=C2=A0 =C2=A0 math python<br> =C2=A0MASTER_SITES=3D=C2=A0 PYPI<br> @@ -12,15 +11,18 @@ WWW=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 <a href=3D"https://networkx.github.io/" rel=3D"noreferrer" target=3D= "_blank">https://networkx.github.io/</a><br>; <br> =C2=A0LICENSE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0BSD3CLAUSE<br> <br> -RUN_DEPENDS:=3D=C2=A0 ${PYTHON_PKGNAMEPREFIX}decorator>=3D4.3.0:devel/p= y-decorator@${PY_FLAVOR}<br> +BUILD_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}setuptools>=3D0:devel/py-setupt= ools@${PY_FLAVOR} \<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${PYTHON_PKGNAMEPRE= FIX}wheel>0:devel/py-wheel@${PY_FLAVOR}<br> +#RUN_DEPENDS=3D=C2=A0 ${PYTHON_PKGNAMEPREFIX}decorator>=3D4.3.0:devel/p= y-decorator@${PY_FLAVOR}<br> <br> =C2=A0USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cpe python shebangfix<br> -USE_PYTHON=3D=C2=A0 =C2=A0 autoplist concurrent distutils pytest<br> +USE_PYTHON=3D=C2=A0 =C2=A0 autoplist concurrent pep517 pytest<br> +<br> =C2=A0SHEBANG_GLOB=3D=C2=A0 *.py<br> =C2=A0NO_ARCH=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0yes<br> =C2=A0CPE_VENDOR=3D=C2=A0 =C2=A0 python<br> <br> -PLIST_SUB+=3D=C2=A0 =C2=A0 PYTHON_MAJOR_VER=3D${PYTHON_MAJOR_VER}<br> +#PLIST_SUB+=3D=C2=A0 =C2=A0PYTHON_MAJOR_VER=3D${PYTHON_MAJOR_VER}<br> <br> =C2=A0OPTIONS_DEFINE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 EXAMPLES GDAL LXML PANDA= S PYDOT YAML<br> =C2=A0OPTIONS_GROUP=3D MATRIX RENDER<br> diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo<br> index b3d643572dca..0307c250a5ad 100644<br> --- a/math/py-networkx/distinfo<br> +++ b/math/py-networkx/distinfo<br> @@ -1,3 +1,3 @@<br> -TIMESTAMP =3D 1681555373<br> -SHA256 (networkx-3.1.tar.gz) =3D de346335408f84de0eada6ff9fafafff9bcda11f0= a0dfaa931133debb146ab61<br> -SIZE (networkx-3.1.tar.gz) =3D 2021691<br> +TIMESTAMP =3D 1698752274<br> +SHA256 (networkx-3.2.tar.gz) =3D bda29edf392d9bfa5602034c767d28549214ec45f= 620081f0b74dc036a1fbbc1<br> +SIZE (networkx-3.2.tar.gz) =3D 2072917<br> diff --git a/math/py-networkx/files/patch-setup.py b/math/py-networkx/files= /patch-setup.py<br> deleted file mode 100644<br> index 1d28af3e2856..000000000000<br> --- a/math/py-networkx/files/patch-setup.py<br> +++ /dev/null<br> @@ -1,47 +0,0 @@<br> ---- setup.py.orig=C2=A0 =C2=A0 =C2=A0 2023-02-20 13:03:51 UTC<br> -+++ setup.py<br> -@@ -92,36 +92,6 @@ packages =3D [<br> -=C2=A0 =C2=A0 =C2=A0"networkx.utils",<br> - ]<br> - <br> --docdirbase =3D "share/doc/networkx-%s" % version<br> --# add basic documentation<br> --data =3D [(docdirbase, glob("*.txt"))]<br> --# add examples<br> --for d in [<br> --=C2=A0 =C2=A0 ".",<br> --=C2=A0 =C2=A0 "advanced",<br> --=C2=A0 =C2=A0 "algorithms",<br> --=C2=A0 =C2=A0 "basic",<br> --=C2=A0 =C2=A0 "3d_drawing",<br> --=C2=A0 =C2=A0 "drawing",<br> --=C2=A0 =C2=A0 "graph",<br> --=C2=A0 =C2=A0 "javascript",<br> --=C2=A0 =C2=A0 "jit",<br> --=C2=A0 =C2=A0 "pygraphviz",<br> --=C2=A0 =C2=A0 "subclass",<br> --]:<br> --=C2=A0 =C2=A0 dd =3D os.path.join(docdirbase, "examples", d)<br= > --=C2=A0 =C2=A0 pp =3D os.path.join("examples", d)<br> --=C2=A0 =C2=A0 data.append((dd, glob(os.path.join(pp, "*.txt")))= )<br> --=C2=A0 =C2=A0 data.append((dd, glob(os.path.join(pp, "*.py"))))= <br> --=C2=A0 =C2=A0 data.append((dd, glob(os.path.join(pp, "*.bz2")))= )<br> --=C2=A0 =C2=A0 data.append((dd, glob(os.path.join(pp, "*.gz"))))= <br> --=C2=A0 =C2=A0 data.append((dd, glob(os.path.join(pp, "*.mbox"))= ))<br> --=C2=A0 =C2=A0 data.append((dd, glob(os.path.join(pp, "*.edgelist&quo= t;))))<br> --# add js force examples<br> --dd =3D os.path.join(docdirbase, "examples", "javascript/fo= rce")<br> --pp =3D os.path.join("examples", "javascript/force")<b= r> --data.append((dd, glob(os.path.join(pp, "*"))))<br> --<br> - # add the tests subpackage(s)<br> - package_data =3D {<br> -=C2=A0 =C2=A0 =C2=A0"networkx": ["tests/*.py"],<br> -@@ -185,7 +155,6 @@ if __name__ =3D=3D "__main__":<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0project_urls=3Dproject_urls,<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0classifiers=3Dclassifiers,<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0packages=3Dpackages,<br> --=C2=A0 =C2=A0 =C2=A0 =C2=A0 data_files=3Ddata,<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0package_data=3Dpackage_data,<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0install_requires=3Dinstall_requires,<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0extras_require=3Dextras_require,<br> <br> </blockquote></div></div> --000000000000a331b8060942318c--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58Sy_HS4uw_ZqVG9hSu8DKV79UP8=DRWvsvv57kTLcoOnw>