<pre style='margin:0'>
Andrey Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/03ac7e4d67ad0691b37bdfa06b22ef9fafacc967">https://github.com/macports/macports-ports/commit/03ac7e4d67ad0691b37bdfa06b22ef9fafacc967</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 03ac7e4d67ad0691b37bdfa06b22ef9fafacc967
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Fri Mar 1 11:36:35 2024 +0300
<span style='display:block; white-space:pre;color:#404040;'> py-notebook: update to 7.1.1
</span>---
python/py-notebook/Portfile | 49 +++++++++-------------
python/py-notebook/files/patch-pyproject.toml.diff | 18 ++++++++
python/py-notebook/files/traittypes.py.diff | 10 -----
3 files changed, 37 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-notebook/Portfile b/python/py-notebook/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 803e34a3844..db1b3a6d159 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-notebook/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-notebook/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,14 +4,15 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-notebook
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.4.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories-append devel science
license BSD
supported_archs noarch
platforms {darwin any}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 37 38 39 310 311 312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 38 39 310 311 312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517_backend hatch
</span>
maintainers {stromnov @stromnov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,35 +21,23 @@ long_description {*}${description}
</span>
homepage https://jupyter.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cf55b90f08ca88013ab60b4b39931a9d6535b55f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 709b1856a564fe53054796c80e17a67262071c86bfbdfa6b96aaa346113c555a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14373938
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles traittypes.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.dir ${worksrcpath}/notebook
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f5b87d5c2e5e12c02ae8373920981f1e68bb5789 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 818e7420fa21f402e726afb9f02df7f3c10f294c02e383ed19852866c316108b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4896811
</span>
if {${name} ne ${subport}} {
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-jupyter_packaging
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-jinja2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-zmq \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-argon2-cffi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-ipython_genutils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-traitlets \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-jupyter_core \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-jupyter_client \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-nbformat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-nbconvert \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-ipykernel \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-send2trash \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-terminado \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-prometheus_client
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} < 38} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-importlib-metadata
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-hatch-jupyter-builder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-jupyter_server \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-jupyterlab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-jupyterlab_server \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-notebook_shim \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-tornado
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYTHON_BRANCH@@|${python.branch}|g" ${worksrcpath}/pyproject.toml
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-notebook/files/patch-pyproject.toml.diff b/python/py-notebook/files/patch-pyproject.toml.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..65f791e9c60
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-notebook/files/patch-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyproject.toml.orig 2024-03-01 11:09:17.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyproject.toml 2024-03-01 11:31:40.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [build-system]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-requires = ["hatchling>=1.11", "jupyterlab>=4.1.1,<4.2"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++requires = ["hatchling>=1.11"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build-backend = "hatchling.build"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [project]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,7 +162,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build_cmd = "build:prod"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ source_dir = "packages"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build_dir = "notebook/static"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-npm = ["jlpm"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++npm = ["jlpm-@@PYTHON_BRANCH@@"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [tool.hatch.build.hooks.jupyter-builder.editable-build-kwargs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build_cmd = "build"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-notebook/files/traittypes.py.diff b/python/py-notebook/files/traittypes.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 70f3162dfb3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-notebook/files/traittypes.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- traittypes.py.orig~ 2024-02-29 21:00:44.071931000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ traittypes.py 2024-02-29 21:01:05.518299672 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import inspect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--from traitlets import ClassBasedTraitType, Undefined, warn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from warnings import warn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from traitlets import ClassBasedTraitType, Undefined
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Traitlet's 5.x includes a set of utilities for building
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # description strings for objects. Traitlets 5.x does not
</span></pre><pre style='margin:0'>
</pre>