On 2023/12/21 13:06, Stuart Henderson wrote:
> On 2023/12/20 20:16, Daniel Dickman wrote:
> > Here are 4 new ports needed to update jupyter-notebook from v6.3.0 to
> > v6.5.6 (the final release before the 7.x series)
> >
> > and also one port needed to update py-nbformat from v5.0.7 to 5.1.0 and
> > beyond.
> >
> > Here is the dependency tree:
> >
> > devel/py-nbformat:
> > -> textproc/py-fastjsonschema
> >
> > www/jupyter-notebook:
> > -> devel/py-jupyter_packaging
>
> OK for py-jupyter_packaging.
ah actually, it could do with a TDEP on devel/py-pip${MODPY_FLAVOR},
and PORTHOME=${WRKDIR}, then I get "51 passed, 15 skipped, 20 warnings
in 36.18s" if I change pf.conf to allow network for _pbuild.
> This is a PEP517 backend used by the other ports so I suggest we do
> this:
>
> Index: python.port.mk
> ===================================================================
> RCS file: /cvs/ports/lang/python/python.port.mk,v
> retrieving revision 1.182
> diff -u -p -r1.182 python.port.mk
> --- python.port.mk 20 Dec 2023 13:29:33 -0000 1.182
> +++ python.port.mk 21 Dec 2023 13:03:55 -0000
> @@ -217,6 +217,8 @@ BUILD_DEPENDS += devel/py-flit${MODPY_FL
> BUILD_DEPENDS += devel/py-hatchling${MODPY_FLAVOR}
> . elif ${MODPY_PYBUILD} == hatch-vcs
> BUILD_DEPENDS += devel/py-hatch-vcs${MODPY_FLAVOR}
> +. elif ${MODPY_PYBUILD} == jupyter_packaging
> +BUILD_DEPENDS += devel/py-jupyter_packaging${MODPY_FLAVOR}
> . elif ${MODPY_PYBUILD} == poetry-core
> BUILD_DEPENDS += devel/py-poetry-core${MODPY_FLAVOR}
> . elif ${MODPY_PYBUILD} == setuptools || ${MODPY_PYBUILD} == setuptools_scm
> @@ -226,7 +228,7 @@ BUILD_DEPENDS += devel/py-setuptools${MO
> BUILD_DEPENDS += devel/py-setuptools_scm${MODPY_FLAVOR}
> . endif
> . elif !${MODPY_PYBUILD:L:Mbootstrap}
> -ERRORS += "Fatal: unknown MODPY_PYBUILD value (bootstrap,
> flit_core, flit_scm, flit, hatchling, hatch-vcs, poetry-core, setuptools,
> setuptools_scm)"
> +ERRORS += "Fatal: unknown MODPY_PYBUILD value (bootstrap,
> flit_core, flit_scm, flit, hatchling, hatch-vcs, jupyter_packaging,
> poetry-core, setuptools, setuptools_scm)"
> . endif
> .else
> # Try to detect the case where a port will build regardless of setuptools
>
> > -> devel/py-nbclassic
>
> The second RUN_DEPENDS overrides the first:
>
> RUN_DEPENDS = www/jupyter-notebook
>
> RUN_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
>
> Also there's this in PLIST:
>
> etc/jupyter/jupyter_server_config.d/nbclassic.json
>
> i.e. /usr/local/etc, these should probably go into share/examples and
> @sample into ${SYSCONFDIR}, then patch if necessary to find the installed file
>
> MODPY_PYBUILD=setuptools but it doesn't use setuptools, with my suggested
> diff above we can use MODPY_PYBUILD=jupyter_packaging and drop the BDEP
>
> > -> devel/py-notebook_shim
>
> Same issue with files in /usr/local/etc, and with MODPY_PYBUILD=setuptools
>
