* [PR PATCH] Jupyter notebook updates
@ 2022-04-08 1:52 tornaria
2022-04-08 2:01 ` [PR REVIEW] " ahesford
` (17 more replies)
0 siblings, 18 replies; 19+ messages in thread
From: tornaria @ 2022-04-08 1:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1361 bytes --]
There is a new pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages jupyter-updates
https://github.com/void-linux/void-packages/pull/36569
Jupyter notebook updates
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Updates:
- python3-jupyter_notebook: to 6.4.10.
- python3-jupyter_nbconvert: to 6.4.5.
- python3-jupyter_nbformat: to 5.3.0.
The new package python3-fastjsonschema is needed for nbformat.
This also restores the update of Jinja2 to 3.1.1 which was reverted because of incompatibility with nbconvert-6.0.7 (see 3d6eb58)
NOTES:
- For fastjsonschema I used the tarball from github, instead of pypi, because the latter doesn't include the testsuite.
- For nbconvert I had to add a PYTHONPATH setting to `do_check()` because the "old" nbconvert will be installed at check-time (circular dependency?) and without this the testsuite will be testing the old nbconvert (which fails!).
What should we do about maintainership? @dkwo I think you use jupyter much more than I do (I'm more of a CLI type) do you want to take over? Otherwise I can do it.
@ahesford
@dkwo
A patch file from https://github.com/void-linux/void-packages/pull/36569.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jupyter-updates-36569.patch --]
[-- Type: text/x-diff, Size: 7486 bytes --]
From 61e4e960f7bb7e4f28961a82b8e59d8d8d324de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 7 Apr 2022 22:26:45 -0300
Subject: [PATCH 1/5] New package: python3-fastjsonschema-2.15.3
---
srcpkgs/python3-fastjsonschema/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-fastjsonschema/template
diff --git a/srcpkgs/python3-fastjsonschema/template b/srcpkgs/python3-fastjsonschema/template
new file mode 100644
index 000000000000..290431fadfc1
--- /dev/null
+++ b/srcpkgs/python3-fastjsonschema/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-fastjsonschema'
+pkgname=python3-fastjsonschema
+version=2.15.3
+revision=1
+wrksrc=python-fastjsonschema-${version}
+build_style=python3-module
+make_check_args="--deselect tests/benchmarks/test_benchmark.py"
+hostmakedepends="python3-setuptools"
+checkdepends="python3-pytest"
+short_desc="Fastest Python implementation of JSON schema"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/seznam/python-fastjsonschema"
+changelog="https://raw.githubusercontent.com/horejsek/python-fastjsonschema/master/CHANGELOG.txt"
+distfiles="https://github.com/horejsek/python-fastjsonschema/archive/refs/tags/v${version}.tar.gz"
+checksum=94e59a36c0efbf75a1a790fed15b51c9876b81204a5184c0c89075c68b10e7ec
+
+post_install() {
+ vlicense LICENSE
+}
From b454e2f4a42c3b81bc3e1f71f08a0ddf6c0a65bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:34 -0300
Subject: [PATCH 2/5] python3-jupyter_nbformat: update to 5.3.0.
---
srcpkgs/python3-jupyter_nbformat/template | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template
index 4bea7989e2a2..27f3267b4594 100644
--- a/srcpkgs/python3-jupyter_nbformat/template
+++ b/srcpkgs/python3-jupyter_nbformat/template
@@ -1,26 +1,22 @@
# Template file for 'python3-jupyter_nbformat'
pkgname=python3-jupyter_nbformat
-version=5.1.3
-revision=2
+version=5.3.0
+revision=1
wrksrc="nbformat-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-jsonschema python3-traitlets
- python3-ipython_genutils python3-jupyter_core"
+ python3-ipython_genutils python3-jupyter_core
+ python3-fastjsonschema"
checkdepends="python3-pytest python3-testpath $depends"
short_desc="Jupyter notebook format"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/jupyter/nbformat"
distfiles="${PYPI_SITE}/n/nbformat/nbformat-${version}.tar.gz"
-checksum=b516788ad70771c6250977c1374fcca6edebe6126fd2adb5a69aa5c2356fd1c8
+checksum=fcc5ab8cb74e20b19570b5be809e2dba9b82836fd2761a89066ad43394ba29f5
conflicts="python-jupyter_nbformat<=4.4.0_3"
-do_check() {
- # Tests require a non-existent notebook file
- python3 -m pytest -k 'not test_upgrade_v4_to_4_dot_5 and not test_sample_notebook'
-}
-
post_install() {
vlicense COPYING.md LICENSE
}
From ecf9d55f0561b1b57283c45355d07f9558962b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:37 -0300
Subject: [PATCH 3/5] python3-jupyter_nbconvert: update to 6.4.5.
---
srcpkgs/python3-jupyter_nbconvert/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
index ee8f7f8ba368..a6d2fe9cef38 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,13 +1,14 @@
# Template file for 'python3-jupyter_nbconvert'
pkgname=python3-jupyter_nbconvert
-version=6.0.7
-revision=2
+version=6.4.5
+revision=1
wrksrc="nbconvert-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-mistune python3-Jinja2 python3-jupyterlab_pygments
python3-nbclient python3-jupyter_core python3-entrypoints python3-testpath
- python3-bleach python3-pandocfilters python3-defusedxml"
+ python3-bleach python3-pandocfilters python3-defusedxml
+ python3-BeautifulSoup4"
checkdepends="python3-pytest python3-ipython_ipykernel
python3-jupyter_ipywidgets python3-Pebble pandoc inkscape $depends"
short_desc="Converting Jupyter notebooks"
@@ -15,10 +16,11 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/jupyter/nbconvert"
distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz"
-checksum=cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002
+checksum=21163a8e2073c07109ca8f398836e45efdba2aacea68d6f75a8a545fef070d4e
conflicts="python-jupyter_nbconvert<=5.4.1_2"
do_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
# WebPDF export depends on unpackaged pyppeteer
python3 -m pytest -k 'not TestWebPDFExporter and not test_webpdf_with_chromium'
}
From 835daa99bf15e2dc53e885a0b2a912db61099c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:41 -0300
Subject: [PATCH 4/5] python3-jupyter_notebook: update to 6.4.10.
---
srcpkgs/python3-jupyter_notebook/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template
index ca9e1d43df21..d7e7230fdf93 100644
--- a/srcpkgs/python3-jupyter_notebook/template
+++ b/srcpkgs/python3-jupyter_notebook/template
@@ -1,7 +1,7 @@
# Template file for 'python3-jupyter_notebook'
pkgname=python3-jupyter_notebook
-version=6.3.0
-revision=2
+version=6.4.10
+revision=1
wrksrc="notebook-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -15,7 +15,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="https://jupyter.org/"
distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz"
-checksum=cbc9398d6c81473e9cdb891d2cae9c0d3718fca289dda6d26df5cb660fcadc7d
+checksum=2408a76bc6289283a8eecfca67e298ec83c67db51a4c2e1b713dd180bb39e90e
conflicts="python-jupyter_notebook<=5.7.0_2"
# Tests require unpackaged selenium
make_check=no
From 7788fe150d5938288c0738481190310d382cac4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:57:15 -0300
Subject: [PATCH 5/5] python3-Jinja2: update to 3.1.1.
---
srcpkgs/python3-Jinja2/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index 6a4c28214cca..d43e75d50b60 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,8 +1,7 @@
# Template file for 'python3-Jinja2'
pkgname=python3-Jinja2
-reverts="3.1.1_1"
-version=3.0.3
-revision=2
+version=3.1.1
+revision=1
wrksrc="Jinja2-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,7 +13,7 @@ license="BSD-3-Clause"
homepage="http://jinja.pocoo.org/"
changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
+checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
post_install() {
vlicense LICENSE.rst
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
@ 2022-04-08 2:01 ` ahesford
2022-04-08 2:01 ` ahesford
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: ahesford @ 2022-04-08 2:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#discussion_r845681058
Comment:
This is par for the course. In fact, the default `do_check` implementation does this automatically. You might even be able to get away with removing `do_check` altogether and setting
```sh
make_check_args="-k not((TestWebPDFExporter)or(test_webpdf_with_chromium))"
```
See, *e.g.*, `python3-dotenv`. (The unnatural syntax and lack of spacing is required since any attempt to quote spaces in `make_check_args` will fail.)
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
2022-04-08 2:01 ` [PR REVIEW] " ahesford
@ 2022-04-08 2:01 ` ahesford
2022-04-08 12:42 ` tornaria
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: ahesford @ 2022-04-08 2:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#discussion_r845679468
Comment:
The revision needs to be incremented to leap past the prior `3.1.1_1` package.
```suggestion
revision=2
```
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
2022-04-08 2:01 ` [PR REVIEW] " ahesford
2022-04-08 2:01 ` ahesford
@ 2022-04-08 12:42 ` tornaria
2022-04-08 14:06 ` tornaria
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: tornaria @ 2022-04-08 12:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
New review comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#discussion_r846072844
Comment:
ACK. I thought it was ok to reuse the same revision, since the template will be *identical* to the former `3.1.1_1` one (also, I think the lint step in CI will complain, and I like green checkmarks :rofl:)
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (2 preceding siblings ...)
2022-04-08 12:42 ` tornaria
@ 2022-04-08 14:06 ` tornaria
2022-04-08 14:08 ` [PR PATCH] [Updated] " tornaria
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: tornaria @ 2022-04-08 14:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
New review comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#discussion_r846148315
Comment:
That is ugly. Also, `-k` doesn't seem to support syntax like `-k not(TestWebPDFExporter::test_webpdf_without_chromium)`. One can get away with `--deselect` but this requires passing the complete prefix (which includes the full path to the python file where the test is located).
I came up with this
```
make_check_args="-m not(network) -k not(test_webpdf_without_chromium)"
```
matching precisely the three tests that have to be disabled... but it's hard to extend, I'm almost inclined to prefer the completely explicit (but very verbose)
```
make_check_args="
--deselect nbconvert/exporters/tests/test_webpdf.py::TestWebPDFExporter::test_export
--deselect nbconvert/exporters/tests/test_webpdf.py::TestWebPDFExporter::test_webpdf_without_chromium
--deselect nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium"
```
At least with this syntax is very clear what tests are being deselected and how to add more tests later...
I guess the optimal situation would be if upstream would mark these tests as requiring pyppeteer and skiping them if not available.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (3 preceding siblings ...)
2022-04-08 14:06 ` tornaria
@ 2022-04-08 14:08 ` tornaria
2022-04-08 14:11 ` [PR REVIEW] " tornaria
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: tornaria @ 2022-04-08 14:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1366 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages jupyter-updates
https://github.com/void-linux/void-packages/pull/36569
Jupyter notebook updates
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Updates:
- python3-jupyter_notebook: to 6.4.10.
- python3-jupyter_nbconvert: to 6.4.5.
- python3-jupyter_nbformat: to 5.3.0.
The new package python3-fastjsonschema is needed for nbformat.
This also restores the update of Jinja2 to 3.1.1 which was reverted because of incompatibility with nbconvert-6.0.7 (see 3d6eb58)
NOTES:
- For fastjsonschema I used the tarball from github, instead of pypi, because the latter doesn't include the testsuite.
- For nbconvert I had to add a PYTHONPATH setting to `do_check()` because the "old" nbconvert will be installed at check-time (circular dependency?) and without this the testsuite will be testing the old nbconvert (which fails!).
What should we do about maintainership? @dkwo I think you use jupyter much more than I do (I'm more of a CLI type) do you want to take over? Otherwise I can do it.
@ahesford
@dkwo
A patch file from https://github.com/void-linux/void-packages/pull/36569.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jupyter-updates-36569.patch --]
[-- Type: text/x-diff, Size: 7695 bytes --]
From 61e4e960f7bb7e4f28961a82b8e59d8d8d324de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 7 Apr 2022 22:26:45 -0300
Subject: [PATCH 1/5] New package: python3-fastjsonschema-2.15.3
---
srcpkgs/python3-fastjsonschema/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-fastjsonschema/template
diff --git a/srcpkgs/python3-fastjsonschema/template b/srcpkgs/python3-fastjsonschema/template
new file mode 100644
index 000000000000..290431fadfc1
--- /dev/null
+++ b/srcpkgs/python3-fastjsonschema/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-fastjsonschema'
+pkgname=python3-fastjsonschema
+version=2.15.3
+revision=1
+wrksrc=python-fastjsonschema-${version}
+build_style=python3-module
+make_check_args="--deselect tests/benchmarks/test_benchmark.py"
+hostmakedepends="python3-setuptools"
+checkdepends="python3-pytest"
+short_desc="Fastest Python implementation of JSON schema"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/seznam/python-fastjsonschema"
+changelog="https://raw.githubusercontent.com/horejsek/python-fastjsonschema/master/CHANGELOG.txt"
+distfiles="https://github.com/horejsek/python-fastjsonschema/archive/refs/tags/v${version}.tar.gz"
+checksum=94e59a36c0efbf75a1a790fed15b51c9876b81204a5184c0c89075c68b10e7ec
+
+post_install() {
+ vlicense LICENSE
+}
From b454e2f4a42c3b81bc3e1f71f08a0ddf6c0a65bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:34 -0300
Subject: [PATCH 2/5] python3-jupyter_nbformat: update to 5.3.0.
---
srcpkgs/python3-jupyter_nbformat/template | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template
index 4bea7989e2a2..27f3267b4594 100644
--- a/srcpkgs/python3-jupyter_nbformat/template
+++ b/srcpkgs/python3-jupyter_nbformat/template
@@ -1,26 +1,22 @@
# Template file for 'python3-jupyter_nbformat'
pkgname=python3-jupyter_nbformat
-version=5.1.3
-revision=2
+version=5.3.0
+revision=1
wrksrc="nbformat-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-jsonschema python3-traitlets
- python3-ipython_genutils python3-jupyter_core"
+ python3-ipython_genutils python3-jupyter_core
+ python3-fastjsonschema"
checkdepends="python3-pytest python3-testpath $depends"
short_desc="Jupyter notebook format"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/jupyter/nbformat"
distfiles="${PYPI_SITE}/n/nbformat/nbformat-${version}.tar.gz"
-checksum=b516788ad70771c6250977c1374fcca6edebe6126fd2adb5a69aa5c2356fd1c8
+checksum=fcc5ab8cb74e20b19570b5be809e2dba9b82836fd2761a89066ad43394ba29f5
conflicts="python-jupyter_nbformat<=4.4.0_3"
-do_check() {
- # Tests require a non-existent notebook file
- python3 -m pytest -k 'not test_upgrade_v4_to_4_dot_5 and not test_sample_notebook'
-}
-
post_install() {
vlicense COPYING.md LICENSE
}
From 53e8e70c757461c10d8e7094d7198c0ca59e9bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:37 -0300
Subject: [PATCH 3/5] python3-jupyter_nbconvert: update to 6.4.5.
---
srcpkgs/python3-jupyter_nbconvert/template | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
index ee8f7f8ba368..baebe44c04ca 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,13 +1,16 @@
# Template file for 'python3-jupyter_nbconvert'
pkgname=python3-jupyter_nbconvert
-version=6.0.7
-revision=2
+version=6.4.5
+revision=1
wrksrc="nbconvert-${version}"
build_style=python3-module
+# WebPDF export depends on unpackaged pyppeteer
+make_check_args="-m not(network) -k not(test_webpdf_without_chromium)"
hostmakedepends="python3-setuptools"
depends="python3-mistune python3-Jinja2 python3-jupyterlab_pygments
python3-nbclient python3-jupyter_core python3-entrypoints python3-testpath
- python3-bleach python3-pandocfilters python3-defusedxml"
+ python3-bleach python3-pandocfilters python3-defusedxml
+ python3-BeautifulSoup4"
checkdepends="python3-pytest python3-ipython_ipykernel
python3-jupyter_ipywidgets python3-Pebble pandoc inkscape $depends"
short_desc="Converting Jupyter notebooks"
@@ -15,14 +18,9 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/jupyter/nbconvert"
distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz"
-checksum=cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002
+checksum=21163a8e2073c07109ca8f398836e45efdba2aacea68d6f75a8a545fef070d4e
conflicts="python-jupyter_nbconvert<=5.4.1_2"
-do_check() {
- # WebPDF export depends on unpackaged pyppeteer
- python3 -m pytest -k 'not TestWebPDFExporter and not test_webpdf_with_chromium'
-}
-
post_install() {
vlicense LICENSE
}
From ca4abec91d0839ee0ac0aa156370310d516ede8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:41 -0300
Subject: [PATCH 4/5] python3-jupyter_notebook: update to 6.4.10.
---
srcpkgs/python3-jupyter_notebook/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template
index ca9e1d43df21..d7e7230fdf93 100644
--- a/srcpkgs/python3-jupyter_notebook/template
+++ b/srcpkgs/python3-jupyter_notebook/template
@@ -1,7 +1,7 @@
# Template file for 'python3-jupyter_notebook'
pkgname=python3-jupyter_notebook
-version=6.3.0
-revision=2
+version=6.4.10
+revision=1
wrksrc="notebook-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -15,7 +15,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="https://jupyter.org/"
distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz"
-checksum=cbc9398d6c81473e9cdb891d2cae9c0d3718fca289dda6d26df5cb660fcadc7d
+checksum=2408a76bc6289283a8eecfca67e298ec83c67db51a4c2e1b713dd180bb39e90e
conflicts="python-jupyter_notebook<=5.7.0_2"
# Tests require unpackaged selenium
make_check=no
From 51d32e117b552edb447c5f303dd1d0dcde59dfcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:57:15 -0300
Subject: [PATCH 5/5] python3-Jinja2: update to 3.1.1.
This update was reverted earlier (3d6eb58) because of an incompatibility
with nbconvert-6.0.7 which is fixed in current nbconvert-6.4.5.
---
srcpkgs/python3-Jinja2/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index 6a4c28214cca..5fbc7ee2fa87 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,7 +1,6 @@
# Template file for 'python3-Jinja2'
pkgname=python3-Jinja2
-reverts="3.1.1_1"
-version=3.0.3
+version=3.1.1
revision=2
wrksrc="Jinja2-${version}"
build_style=python3-module
@@ -14,7 +13,7 @@ license="BSD-3-Clause"
homepage="http://jinja.pocoo.org/"
changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
+checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
post_install() {
vlicense LICENSE.rst
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (4 preceding siblings ...)
2022-04-08 14:08 ` [PR PATCH] [Updated] " tornaria
@ 2022-04-08 14:11 ` tornaria
2022-04-08 14:12 ` tornaria
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: tornaria @ 2022-04-08 14:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
New review comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#discussion_r846153494
Comment:
Can someone tell me if this`conflict` line should remain or not? Seems quite old stuff, we don't have a python2 package for this anymore.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (5 preceding siblings ...)
2022-04-08 14:11 ` [PR REVIEW] " tornaria
@ 2022-04-08 14:12 ` tornaria
2022-04-08 14:13 ` tornaria
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: tornaria @ 2022-04-08 14:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
New review comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#discussion_r846154978
Comment:
> (also, I think the lint step in CI will complain, and I like green checkmarks rofl)
lint in CI didn't complain, it seems to be smarter than I thought... :thinking:
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (6 preceding siblings ...)
2022-04-08 14:12 ` tornaria
@ 2022-04-08 14:13 ` tornaria
2022-04-08 14:43 ` ahesford
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: tornaria @ 2022-04-08 14:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
New review comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#discussion_r846154978
Comment:
> (also, I think the lint step in CI will complain, and I like green checkmarks rofl)
lint in CI didn't complain, it seems to be smarter than I thought... :thinking:
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (7 preceding siblings ...)
2022-04-08 14:13 ` tornaria
@ 2022-04-08 14:43 ` ahesford
2022-04-08 14:45 ` ahesford
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: ahesford @ 2022-04-08 14:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#discussion_r846184142
Comment:
I don't have a strong preference; you could have even left `do_check` defined if it's easier and cleaner. The version you've pushed now seems fine.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (8 preceding siblings ...)
2022-04-08 14:43 ` ahesford
@ 2022-04-08 14:45 ` ahesford
2022-04-09 8:02 ` dkwo
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: ahesford @ 2022-04-08 14:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#discussion_r846185727
Comment:
The issue is whether somebody still has `python-jupyter_nbconvert` installed; this defines an alternative that will conflict with the unversioned `/usr/bin/jupyter_nbconvert` shipped with the current package.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (9 preceding siblings ...)
2022-04-08 14:45 ` ahesford
@ 2022-04-09 8:02 ` dkwo
2022-04-09 8:02 ` dkwo
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-04-09 8:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#issuecomment-1093792136
Comment:
@tornaria I'm fine either way.
Btw, I was looking into https://github.com/davidbrochart/nbterm which lets you run Jupyter Notebooks in the terminal.
I did not have time to package it yet and test with sagemath kernel, but I will, as I'm also annoyed by having to use the browser.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (10 preceding siblings ...)
2022-04-09 8:02 ` dkwo
@ 2022-04-09 8:02 ` dkwo
2022-04-10 20:51 ` tornaria
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-04-09 8:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#issuecomment-1093792136
Comment:
@tornaria I'm fine either way.
Btw, I was looking into https://github.com/davidbrochart/nbterm which lets you run Jupyter Notebooks in the terminal.
I did not have time to package it yet and test with sagemath kernel, but I will, as I'm also annoyed by having to use the browser.
(Moreover, it should work well with tmux and remote sessions.)
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (11 preceding siblings ...)
2022-04-09 8:02 ` dkwo
@ 2022-04-10 20:51 ` tornaria
2022-04-10 21:18 ` [PR PATCH] [Merged]: " ahesford
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: tornaria @ 2022-04-10 20:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#issuecomment-1094366710
Comment:
> @tornaria I'm fine either way. Btw, I was looking into https://github.com/davidbrochart/nbterm which lets you run Jupyter Notebooks in the terminal.
See: https://github.com/tornaria/void-packages/pull/2.
Anyway, that's independent of the current updates, which seem to be working without any trouble (plus: it eliminates one patch in sagemath for a deprecation warning, and unblocks the jinja2 update).
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Merged]: Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (12 preceding siblings ...)
2022-04-10 20:51 ` tornaria
@ 2022-04-10 21:18 ` ahesford
2022-04-11 0:42 ` tsndqst
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: ahesford @ 2022-04-10 21:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1200 bytes --]
There's a merged pull request on the void-packages repository
Jupyter notebook updates
https://github.com/void-linux/void-packages/pull/36569
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Updates:
- python3-jupyter_notebook: to 6.4.10.
- python3-jupyter_nbconvert: to 6.4.5.
- python3-jupyter_nbformat: to 5.3.0.
The new package python3-fastjsonschema is needed for nbformat.
This also restores the update of Jinja2 to 3.1.1 which was reverted because of incompatibility with nbconvert-6.0.7 (see 3d6eb58)
NOTES:
- For fastjsonschema I used the tarball from github, instead of pypi, because the latter doesn't include the testsuite.
- For nbconvert I had to add a PYTHONPATH setting to `do_check()` because the "old" nbconvert will be installed at check-time (circular dependency?) and without this the testsuite will be testing the old nbconvert (which fails!).
What should we do about maintainership? @dkwo I think you use jupyter much more than I do (I'm more of a CLI type) do you want to take over? Otherwise I can do it.
@ahesford
@dkwo
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (13 preceding siblings ...)
2022-04-10 21:18 ` [PR PATCH] [Merged]: " ahesford
@ 2022-04-11 0:42 ` tsndqst
2022-04-11 1:35 ` ahesford
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: tsndqst @ 2022-04-11 0:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1486 bytes --]
New comment by tsndqst on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#issuecomment-1094429157
Comment:
@tornaria @ahesford The update to Jinja2-3.1.1 seems to have broken the `salt` package. I downgraded back to Jinja2-3.0.3 to get it to work again.
```
File "/usr/bin/salt-call", line 33, in <module>
sys.exit(load_entry_point('salt==3003.3', 'console_scripts', 'salt-call')())
File "/usr/lib/python3.10/site-packages/salt/scripts.py", line 437, in salt_call
import salt.cli.call
File "/usr/lib/python3.10/site-packages/salt/cli/call.py", line 6, in <module>
import salt.cli.caller
File "/usr/lib/python3.10/site-packages/salt/cli/caller.py", line 15, in <module>
import salt.minion
File "/usr/lib/python3.10/site-packages/salt/minion.py", line 36, in <module>
import salt.pillar
File "/usr/lib/python3.10/site-packages/salt/pillar/__init__.py", line 16, in <module>
import salt.fileclient
File "/usr/lib/python3.10/site-packages/salt/fileclient.py", line 30, in <module>
import salt.utils.templates
File "/usr/lib/python3.10/site-packages/salt/utils/templates.py", line 20, in <module>
import salt.utils.jinja
File "/usr/lib/python3.10/site-packages/salt/utils/jinja.py", line 28, in <module>
from jinja2 import BaseLoader, Markup, TemplateNotFound, nodes
ImportError: cannot import name 'Markup' from 'jinja2' (/usr/lib/python3.10/site-packages/jinja2/__init__.py)
```
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (14 preceding siblings ...)
2022-04-11 0:42 ` tsndqst
@ 2022-04-11 1:35 ` ahesford
2022-04-11 2:22 ` tornaria
2022-04-11 2:30 ` ahesford
17 siblings, 0 replies; 19+ messages in thread
From: ahesford @ 2022-04-11 1:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#issuecomment-1094455670
Comment:
Damn it! This change in Jinja is turning out to be a real pain. Sorry, will revert.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (15 preceding siblings ...)
2022-04-11 1:35 ` ahesford
@ 2022-04-11 2:22 ` tornaria
2022-04-11 2:30 ` ahesford
17 siblings, 0 replies; 19+ messages in thread
From: tornaria @ 2022-04-11 2:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#issuecomment-1094477741
Comment:
See https://github.com/saltstack/salt/pull/61856
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Jupyter notebook updates
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
` (16 preceding siblings ...)
2022-04-11 2:22 ` tornaria
@ 2022-04-11 2:30 ` ahesford
17 siblings, 0 replies; 19+ messages in thread
From: ahesford @ 2022-04-11 2:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 434 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/36569#issuecomment-1094481789
Comment:
I saw that PR. It hasn't hit a release yet (3004.1 still expects `jinja2.Markup`) and we are further behind still on `salt`. Given that this has twice bitten us and I'm reluctant to mess around with `salt`, I'm content to sit on an old version for awhile until we get the dependants updated.
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2022-04-11 2:31 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-08 1:52 [PR PATCH] Jupyter notebook updates tornaria
2022-04-08 2:01 ` [PR REVIEW] " ahesford
2022-04-08 2:01 ` ahesford
2022-04-08 12:42 ` tornaria
2022-04-08 14:06 ` tornaria
2022-04-08 14:08 ` [PR PATCH] [Updated] " tornaria
2022-04-08 14:11 ` [PR REVIEW] " tornaria
2022-04-08 14:12 ` tornaria
2022-04-08 14:13 ` tornaria
2022-04-08 14:43 ` ahesford
2022-04-08 14:45 ` ahesford
2022-04-09 8:02 ` dkwo
2022-04-09 8:02 ` dkwo
2022-04-10 20:51 ` tornaria
2022-04-10 21:18 ` [PR PATCH] [Merged]: " ahesford
2022-04-11 0:42 ` tsndqst
2022-04-11 1:35 ` ahesford
2022-04-11 2:22 ` tornaria
2022-04-11 2:30 ` ahesford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).