<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/01f698f3b3b8e3ceeb4813b773af08518cf2246e">https://github.com/macports/macports-ports/commit/01f698f3b3b8e3ceeb4813b773af08518cf2246e</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 01f698f3b3b py-nbconvert: Remove custom fetch code
</span>01f698f3b3b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 01f698f3b3b8e3ceeb4813b773af08518cf2246e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Feb 27 00:00:34 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> py-nbconvert: Remove custom fetch code
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66011
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/65809
</span>---
python/py-nbconvert/Portfile | 122 +++++++++++++++----------------------------
1 file changed, 42 insertions(+), 80 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 ad918212752..e5bb8d2cd5f 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;'>@@ -22,99 +22,55 @@ long_description {*}${description}
</span>
homepage https://jupyter.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${python.rootname}-${version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Must remain in-sync with those in project build script.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set style_css_ver 5.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set index_css_ver 3.1.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set light_css_ver 3.1.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set dark_css_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 main_distfile ${distfiles}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set style_distfile style-${style_css_ver}.css
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set index_distfile index-${index_css_ver}.css
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set light_distfile theme-light-${light_css_ver}.css
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set dark_distfile theme-dark-${dark_css_ver}.css
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${master_sites}:main \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://cdn.jupyter.org/notebook/${style_css_ver}/style/style.min.css?dummy=:style \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://unpkg.com/@jupyterlab/nbconvert-css@${index_css_ver}/style/index.css?dummy=:index \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://unpkg.com/@jupyterlab/theme-light-extension@${light_css_ver}/style/variables.css?dummy=:light \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://unpkg.com/@jupyterlab/theme-dark-extension@${dark_css_ver}/style/variables.css?dummy=:dark
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${main_distfile}:main \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${style_distfile}:style \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${index_distfile}:index \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${light_distfile}:light \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${dark_distfile}:dark
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${main_distfile} \
</span> rmd160 d821a832ca32047becb59e7ccdf6a5f59887a33b \
sha256 a42c3ac137c64f70cbe4d763111bf358641ea53b37a01a5c202ed86374af5234 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size 870386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set css_fetch_dir \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distpath}/css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set css_dest_dir \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/share/templates
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc nb_css_fetch {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix distpath css_fetch_dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Explicitly fetch CSS artifacts; must remain in-sync with those in project build script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set notebook_css_ver 5.4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set jupyterlab_css_ver 3.1.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set jupyterlab_theme_light_ver 3.1.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set jupyterlab_theme_dark_ver 3.1.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set notebook_css_url \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://cdn.jupyter.org/notebook/${notebook_css_ver}/style/style.min.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set jupyterlab_css_url \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://unpkg.com/@jupyterlab/nbconvert-css@${jupyterlab_css_ver}/style/index.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set jupyterlab_theme_light_url \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://unpkg.com/@jupyterlab/theme-light-extension@${jupyterlab_theme_light_ver}/style/variables.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set jupyterlab_theme_dark_url \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://unpkg.com/@jupyterlab/theme-dark-extension@${jupyterlab_theme_dark_ver}/style/variables.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wget_fetch_cmd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${prefix}/bin/wget --no-verbose --no-check-certificate --no-use-server-timestamps"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${css_fetch_dir}/classic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${css_fetch_dir}/lab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${css_fetch_dir}/classic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${wget_fetch_cmd} ${notebook_css_url} -O style.css"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${css_fetch_dir}/lab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${wget_fetch_cmd} ${jupyterlab_css_url} -O index.css"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${css_fetch_dir}/lab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${wget_fetch_cmd} ${jupyterlab_theme_light_url} -O theme-light.css"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${css_fetch_dir}/lab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${wget_fetch_cmd} ${jupyterlab_theme_dark_url} -O theme-dark.css"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc nb_css_copy {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global css_fetch_dir css_dest_dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d [glob -type d ${css_fetch_dir}/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dname [file tail ${d}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ddir ${css_dest_dir}/${dname}/static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "nb_css_copy: copying dir: ${dname} -> ${ddir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${ddir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -type f ${d}/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "nb_css_copy: copying file: ${f} -> ${ddir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy -force ${f} ${ddir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- css/classic/style.css \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- css/lab/index.css \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- css/lab/theme-light.css \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- css/lab/theme-dark.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- css/classic/style.css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 870386 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${style_distfile} \
</span> rmd160 05b48b82351654a627bb3a7815bd3808cacdc431 \
sha256 5865a609f4437b0464bc121cd567b619074e540a0515a3b82f222f764eb51e01 \
size 265101 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- css/lab/index.css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${index_distfile} \
</span> rmd160 198fa6687d1d33e3a3236cb48c9c6d22ea4f48a1 \
sha256 0a3fc632f155c2c3f3c4a40b5adc19b94369b4ba8a780df50c33d61449d12717 \
size 552369 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- css/lab/theme-light.css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${light_distfile} \
</span> rmd160 e13be340c00a4f72eb2f378581621102d7bccd42 \
sha256 f1f9c2f5232945d501c16737edece840b125eb9c256cf5a45892e4c051be06d7 \
size 14606 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- css/lab/theme-dark.css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${dark_distfile} \
</span> rmd160 5fc75bcb18325bff34e1b8ffd9585ac6a544d618 \
sha256 2b194f360a7851ff4da5a6d3af8afa20c683c0e41e02a27b56ea00a912801051 \
size 15702
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} ne ${subport}} {
</span> patchfiles-append \
patch-hatch_build-disable-download.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_fetch-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/wget:wget
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,12 +97,18 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-importlib-metadata
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nb_css_fetch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.only ${main_distfile}
</span> post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- nb_css_copy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dir_ids [list classic [list style] lab [list index light dark]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {dir ids} ${dir_ids} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dir ${worksrcpath}/share/templates/${dir}/static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach id ${ids} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set src ${distpath}/[set ${id}_distfile]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dst ${dir}/[string map [list -[set ${id}_css_ver].css/ .css] [set ${id}_distfile]/]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "copying file: ${src} -> ${dst}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy -force ${src} ${dst}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
notes "
</pre><pre style='margin:0'>
</pre>