<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/afe944bfb3b417fa12c6700814cffd6affb38189">https://github.com/macports/macports-ports/commit/afe944bfb3b417fa12c6700814cffd6affb38189</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new afe944bfb3b py-nbconvert: explicitly fetch css artifacts Fixes: https://trac.macports.org/ticket/65809
</span>afe944bfb3b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit afe944bfb3b417fa12c6700814cffd6affb38189
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Sep 19 19:15:30 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-nbconvert: explicitly fetch css artifacts
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/65809
</span>---
python/py-nbconvert/Portfile | 111 +++++++++++++++++++--
.../files/patch-hatch_build-disable-download.diff | 7 ++
2 files changed, 109 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-nbconvert/Portfile b/python/py-nbconvert/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e92987433fa..c5e067896bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-nbconvert/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-nbconvert/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,11 +21,99 @@ long_description ${description}
</span>
homepage https://jupyter.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4662b28c439e9ff1e06767468233f9455ba96107 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${python.rootname}-${version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4662b28c439e9ff1e06767468233f9455ba96107 \
</span> sha256 fd1e361da30e30e4c5a5ae89f7cae95ca2a4d4407389672473312249a7ba0060 \
size 860724
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set css_fetch_dir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distpath}/css
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set css_dest_dir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/share/templates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc nb_css_fetch {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix distpath css_fetch_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Explicitly fetch CSS artifacts; must remain in-sync with those in project build script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set notebook_css_ver 5.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jupyterlab_css_ver 3.1.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jupyterlab_theme_light_ver 3.1.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jupyterlab_theme_dark_ver 3.1.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set notebook_css_url \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://cdn.jupyter.org/notebook/${notebook_css_ver}/style/style.min.css
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jupyterlab_css_url \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://unpkg.com/@jupyterlab/nbconvert-css@${jupyterlab_css_ver}/style/index.css
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jupyterlab_theme_light_url \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://unpkg.com/@jupyterlab/theme-light-extension@${jupyterlab_theme_light_ver}/style/variables.css
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jupyterlab_theme_dark_url \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://unpkg.com/@jupyterlab/theme-dark-extension@${jupyterlab_theme_dark_ver}/style/variables.css
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wget_fetch_cmd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/bin/wget --no-verbose --no-check-certificate --no-use-server-timestamps"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${css_fetch_dir}/classic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${css_fetch_dir}/lab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${css_fetch_dir}/classic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${wget_fetch_cmd} ${notebook_css_url} -O style.css"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${css_fetch_dir}/lab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${wget_fetch_cmd} ${jupyterlab_css_url} -O index.css"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${css_fetch_dir}/lab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${wget_fetch_cmd} ${jupyterlab_theme_light_url} -O theme-light.css"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${css_fetch_dir}/lab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${wget_fetch_cmd} ${jupyterlab_theme_dark_url} -O theme-dark.css"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc nb_css_copy {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global css_fetch_dir css_dest_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach d [glob -type d ${css_fetch_dir}/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dname [file tail ${d}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ddir ${css_dest_dir}/${dname}/static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "nb_css_copy: copying dir: ${dname} -> ${ddir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${ddir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -type f ${d}/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "nb_css_copy: copying file: ${f} -> ${ddir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy -force ${f} ${ddir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ css/classic/style.css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ css/lab/index.css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ css/lab/theme-light.css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ css/lab/theme-dark.css
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ css/classic/style.css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 05b48b82351654a627bb3a7815bd3808cacdc431 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5865a609f4437b0464bc121cd567b619074e540a0515a3b82f222f764eb51e01 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 265101 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ css/lab/index.css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 198fa6687d1d33e3a3236cb48c9c6d22ea4f48a1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0a3fc632f155c2c3f3c4a40b5adc19b94369b4ba8a780df50c33d61449d12717 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 552369 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ css/lab/theme-light.css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e13be340c00a4f72eb2f378581621102d7bccd42 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f1f9c2f5232945d501c16737edece840b125eb9c256cf5a45892e4c051be06d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14606 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ css/lab/theme-dark.css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5fc75bcb18325bff34e1b8ffd9585ac6a544d618 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2b194f360a7851ff4da5a6d3af8afa20c683c0e41e02a27b56ea00a912801051 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 15702
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-hatch_build-disable-download.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_fetch-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/wget:wget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,15 +140,20 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-importlib-metadata
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To convert markdown to formats other than HTML, nbconvert uses pandoc.\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Install it by running
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-sudo port install pandoc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nb_css_fetch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-To convert notebooks to PDF, nbconvert makes use of LaTeX and the XeTeX\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-as the rendering engine. Install it by running
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nb_css_copy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-sudo port install texlive-xetex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* To convert markdown to formats other than HTML, nbconvert uses pandoc.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Install it by running:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo port install pandoc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* To convert notebooks to PDF, nbconvert makes use of LaTeX and the XeTeX\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+as the rendering engine. Install it by running:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo port install texlive-xetex
</span> "
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-nbconvert/files/patch-hatch_build-disable-download.diff b/python/py-nbconvert/files/patch-hatch_build-disable-download.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..637a5b95911
</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-nbconvert/files/patch-hatch_build-disable-download.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hatch_build.py.orig 2022-09-22 08:13:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hatch_build.py 2022-09-22 08:14:35.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,4 +78,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def initialize(self, version, build_data):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.target_name not in ["wheel", "sdist"]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _get_css_files()
</span></pre><pre style='margin:0'>
</pre>