From 8c870df593ee3210b8025eb8822885a8d6657842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 16 Sep 2023 11:49:40 -0300 Subject: [PATCH 01/32] common/build-helper/rust.sh: fix cross for pyo3 --- common/build-helper/rust.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh index f689f7c7f9d96..96ec351d545d9 100644 --- a/common/build-helper/rust.sh +++ b/common/build-helper/rust.sh @@ -33,6 +33,10 @@ fi # For cross-compiling rust -sys crates export PKG_CONFIG_ALLOW_CROSS=1 +# For cross-compiling pyo3 bindings +export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib" +export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include" + # gettext-rs export GETTEXT_BIN_DIR=/usr/bin export GETTEXT_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib/gettext" From 368d12b57439b0b260bed544085978dc9314316a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Fri, 15 Sep 2023 23:01:52 -0300 Subject: [PATCH 02/32] New package: python3-rpds-py-0.10.3 --- srcpkgs/python3-rpds-py/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/python3-rpds-py/template diff --git a/srcpkgs/python3-rpds-py/template b/srcpkgs/python3-rpds-py/template new file mode 100644 index 0000000000000..aaa7859603339 --- /dev/null +++ b/srcpkgs/python3-rpds-py/template @@ -0,0 +1,21 @@ +# Template file for 'python3-rpds-py' +pkgname=python3-rpds-py +version=0.10.3 +revision=1 +build_style=python3-pep517 +build_helper=rust +hostmakedepends="cargo maturin" +makedepends="python3 rust-std" +depends="python3" +checkdepends="python3-pytest" +short_desc="Python bindings to Rust's persistent data structures (rpds)" +maintainer="Gonzalo Tornaría " +license="MIT" +homepage="https://github.com/crate-py/rpds" +changelog="https://github.com/crate-py/rpds/releases" +distfiles="${PYPI_SITE}/r/rpds-py/rpds_py-${version}.tar.gz" +checksum=fcc1ebb7561a3e24a6588f7c6ded15d80aec22c66a070c757559b57b17ffd1cb + +post_install() { + vlicense LICENSE +} From c75fc2a2f94d3c9bf04fe853489184383286604c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 16 Aug 2023 21:22:53 -0300 Subject: [PATCH 03/32] New package: python3-referencing-0.30.2 --- srcpkgs/python3-referencing/template | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 srcpkgs/python3-referencing/template diff --git a/srcpkgs/python3-referencing/template b/srcpkgs/python3-referencing/template new file mode 100644 index 0000000000000..44ea2d6cf46e9 --- /dev/null +++ b/srcpkgs/python3-referencing/template @@ -0,0 +1,27 @@ +# Template file for 'python3-referencing' +pkgname=python3-referencing +version=0.30.2 +revision=1 +build_style=python3-pep517 +hostmakedepends="hatchling hatch-vcs" +depends="python3-rpds-py" +checkdepends="$depends python3-pytest-subtests" +short_desc="Cross-specification JSON Referencing" +maintainer="Gonzalo Tornaría " +license="MIT" +homepage="https://github.com/python-jsonschema/referencing" +changelog="https://raw.githubusercontent.com/python-jsonschema/referencing/main/docs/changes.rst" +distfiles="${PYPI_SITE}/r/referencing/referencing-${version}.tar.gz" +checksum=794ad8003c65938edcdbc027f1933215e0d0ccc0291e3ce20a4d87432b59efc0 + +if [ "$XBPS_CHECK_PKGS" = full ]; then + # cyclic dependency + checkdepends+=" python3-jsonschema" +else + # needs python3-jsonschema + make_check_args+=" --ignore=suite/test_sanity.py" +fi + +post_install() { + vlicense COPYING +} From cd681334b7c0538701266c64f83052392c875d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 16 Aug 2023 21:26:32 -0300 Subject: [PATCH 04/32] python3-jsonschema-spec: update to 0.2.4. --- srcpkgs/python3-jsonschema-spec/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-jsonschema-spec/template b/srcpkgs/python3-jsonschema-spec/template index 6caba5a29370c..725ba5a68a785 100644 --- a/srcpkgs/python3-jsonschema-spec/template +++ b/srcpkgs/python3-jsonschema-spec/template @@ -1,15 +1,15 @@ # Template file for 'python3-jsonschema-spec' pkgname=python3-jsonschema-spec -version=0.1.6 +version=0.2.4 revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core" -depends="python3-jsonschema python3-pathable python3-yaml" -checkdepends="$depends python3-pytest-cov python3-toml" +depends="python3-pathable python3-referencing python3-yaml" +checkdepends="$depends python3-pytest-cov python3-responses" short_desc="JSONSchema Spec with object-oriented paths" maintainer="Gonzalo Tornaría " license="Apache-2.0" homepage="https://github.com/p1c2u/jsonschema-spec" changelog="https://github.com/p1c2u/jsonschema-spec/releases" distfiles="https://github.com/p1c2u/jsonschema-spec/archive/refs/tags/${version}.tar.gz" -checksum=ab1d01d3ed40f83c3e272ffc86505830085a5306ad43db04a6e8edf560fedd1d +checksum=291e898786587e8d370fd419b8d9e9a9eb34e95862a14c5f03261688c0b25bf6 From bc81b609ae9b6c0aa94d90aef2865966d24ef49f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Fri, 15 Sep 2023 23:24:55 -0300 Subject: [PATCH 05/32] New package: python3-jsonschema-specifications-2023.7.1 --- .../python3-jsonschema-specifications/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/python3-jsonschema-specifications/template diff --git a/srcpkgs/python3-jsonschema-specifications/template b/srcpkgs/python3-jsonschema-specifications/template new file mode 100644 index 0000000000000..9761f5f5c26ff --- /dev/null +++ b/srcpkgs/python3-jsonschema-specifications/template @@ -0,0 +1,18 @@ +# Template file for 'python3-jsonschema-specifications' +pkgname=python3-jsonschema-specifications +version=2023.7.1 +revision=1 +build_style=python3-pep517 +hostmakedepends="hatchling hatch-vcs" +depends="python3-referencing" +checkdepends="$depends python3-pytest" +short_desc="JSON Schema specifications, exposed as a Registry" +maintainer="Gonzalo Tornaría " +license="MIT" +homepage="https://github.com/python-jsonschema/jsonschema-specifications" +distfiles="${PYPI_SITE}/j/jsonschema-specifications/jsonschema_specifications-${version}.tar.gz" +checksum=c91a50404e88a1f6ba40636778e2ee08f6e24c5613fe4c53ac24578a5a7f72bb + +post_install() { + vlicense COPYING +} From 9ce214742076c5f4c0f5ea2ec99c6c1c4d31ef57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 16 Aug 2023 20:24:02 -0300 Subject: [PATCH 06/32] python3-jsonpointer: update to 2.4, adopt. --- srcpkgs/python3-jsonpointer/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-jsonpointer/template b/srcpkgs/python3-jsonpointer/template index 59b38c2228d6d..fba9a8ae4a447 100644 --- a/srcpkgs/python3-jsonpointer/template +++ b/srcpkgs/python3-jsonpointer/template @@ -1,21 +1,21 @@ # Template file for 'python3-jsonpointer' pkgname=python3-jsonpointer -version=2.3 +version=2.4 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" short_desc="Resolve JSON Pointers according to RFC 6901 (Python3)" -maintainer="Orphaned " +maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/stefankoegl/python-json-pointer" distfiles="${PYPI_SITE}/j/jsonpointer/jsonpointer-${version}.tar.gz" -checksum=97cba51526c829282218feb99dab1b1e6bdf8efd1c43dc9d57be093c0d69c99a +checksum=585cee82b70211fa9e6043b7bb89db6e1aa49524340dde8ad6b63206ea689d88 conflicts="python-jsonpointer>=0" do_check() { # pytest is not supported - python3 tests.py + python3 -m unittest } post_install() { From f12be6a746a39184d879e4cac6dcb2532dee3a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 16 Aug 2023 21:06:42 -0300 Subject: [PATCH 07/32] python3-jsonschema: update to 4.19.1. --- .../0001-patch-out-hatch-fancy-pypi-readme.patch | 6 +++--- srcpkgs/python3-jsonschema/template | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/srcpkgs/python3-jsonschema/patches/0001-patch-out-hatch-fancy-pypi-readme.patch b/srcpkgs/python3-jsonschema/patches/0001-patch-out-hatch-fancy-pypi-readme.patch index 2f10a5f7f6d33..6c33f9ec5373c 100644 --- a/srcpkgs/python3-jsonschema/patches/0001-patch-out-hatch-fancy-pypi-readme.patch +++ b/srcpkgs/python3-jsonschema/patches/0001-patch-out-hatch-fancy-pypi-readme.patch @@ -47,9 +47,9 @@ index f5fe8db..7ae8318 100644 -path = "CHANGELOG.rst" -pattern = "(^v.+?)\nv" - - [tool.isort] - from_first = true - include_trailing_comma = true + [tool.coverage.html] + branch = true + source = ["jsonschema"] -- 2.37.3 diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template index 272eb06edbdd6..44faf389e7d0d 100644 --- a/srcpkgs/python3-jsonschema/template +++ b/srcpkgs/python3-jsonschema/template @@ -1,19 +1,19 @@ # Template file for 'python3-jsonschema' pkgname=python3-jsonschema -version=4.17.3 -revision=2 +version=4.19.1 +revision=1 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" -depends="python3-attrs python3-idna python3-jsonpointer python3-pyrsistent - python3-rfc3339-validator python3-rfc3986-validator" -checkdepends="${depends} python3-pytest python3-pip" +depends="python3-attrs python3-jsonschema-specifications" +checkdepends="${depends} python3-pytest python3-idna python3-jsonpointer + python3-pip python3-rfc3339-validator python3-rfc3987" short_desc="Implementation of JSON Schema for Python3" maintainer="Jan Christian Grünhage " license="MIT" homepage="https://github.com/Julian/jsonschema" changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz" -checksum=0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d +checksum=ec84cc37cfa703ef7cd4928db24f9cb31428a5d0fa77747b8b51a847458e0bbf post_install() { vlicense COPYING LICENSE From 64daef0646b1961588d6be7e840b9dd476a01c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 16 Sep 2023 01:04:50 -0300 Subject: [PATCH 08/32] python3-openapi-spec-validator: update to 0.6.0. --- srcpkgs/python3-openapi-spec-validator/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-openapi-spec-validator/template b/srcpkgs/python3-openapi-spec-validator/template index f75c24694c30b..f123e954f6f2d 100644 --- a/srcpkgs/python3-openapi-spec-validator/template +++ b/srcpkgs/python3-openapi-spec-validator/template @@ -1,16 +1,16 @@ # Template file for 'python3-openapi-spec-validator' pkgname=python3-openapi-spec-validator -version=0.5.7 +version=0.6.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-jsonschema-spec python3-lazy-object-proxy python3-openapi-schema-validator" -checkdepends="$depends python3-pytest-cov python3-toml" +checkdepends="$depends python3-pytest-cov" short_desc="OpenAPI spec validator" maintainer="Gonzalo Tornaría " license="Apache-2.0" homepage="https://github.com/python-openapi/openapi-spec-validator" changelog="https://github.com/python-openapi/openapi-spec-validator/releases" distfiles="${PYPI_SITE}/o/openapi-spec-validator/openapi_spec_validator-${version}.tar.gz" -checksum=6c2d42180045a80fd6314de848b94310bdb0fa4949f4b099578b69f79d9fa5ac +checksum=68c4c212c88ef14c6b1a591b895bf742c455783c7ebba2507abd7dbc1365a616 From 00956e0e41c121567491d4913b2659b8a6ef23c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 16 Sep 2023 01:05:07 -0300 Subject: [PATCH 09/32] python3-openapi-schema-validator: update to 0.6.1. --- srcpkgs/python3-openapi-schema-validator/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-openapi-schema-validator/template b/srcpkgs/python3-openapi-schema-validator/template index bb26e4a7d6034..77139da12b350 100644 --- a/srcpkgs/python3-openapi-schema-validator/template +++ b/srcpkgs/python3-openapi-schema-validator/template @@ -1,18 +1,18 @@ # Template file for 'python3-openapi-schema-validator' pkgname=python3-openapi-schema-validator -version=0.4.4 +version=0.6.1 revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core" -depends="python3-jsonschema" -checkdepends="$depends python3-pytest-cov python3-toml" +depends="python3-jsonschema python3-rfc3339-validator" +checkdepends="$depends python3-pytest-cov" short_desc="OpenAPI schema validation for Python" maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/python-openapi/openapi-schema-validator" changelog="https://github.com/python-openapi/openapi-schema-validator/releases" distfiles="${PYPI_SITE}/o/openapi-schema-validator/openapi_schema_validator-${version}.tar.gz" -checksum=c573e2be2c783abae56c5a1486ab716ca96e09d1c3eab56020d1dc680aa57bf8 +checksum=b8b25e2cb600a0ed18452e675b5dd8cbb99009909c2641c973a4b02c93e33ca2 post_install() { vlicense LICENSE From 66695e8b773ea1001c2d6d05ac41c34bf07ce8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 16 Sep 2023 01:05:23 -0300 Subject: [PATCH 10/32] python3-openapi-core: update to 0.18.1. --- srcpkgs/python3-openapi-core/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-openapi-core/template b/srcpkgs/python3-openapi-core/template index 2dd5dceab1d6a..19bb7af32a364 100644 --- a/srcpkgs/python3-openapi-core/template +++ b/srcpkgs/python3-openapi-core/template @@ -1,6 +1,6 @@ # Template file for 'python3-openapi-core' pkgname=python3-openapi-core -version=0.17.1 +version=0.18.1 revision=1 build_style=python3-pep517 # disable tests requiring unpackaged dependencies @@ -11,17 +11,17 @@ make_check_args=" --ignore=tests/integration/contrib/starlette " hostmakedepends="python3-poetry-core" -depends="python3-isodate python3-more-itertools python3-openapi-spec-validator - python3-parse python3-Werkzeug" -checkdepends="$depends python3-pytest-cov python3-Flask python3-requests - python3-responses python3-toml python3-WebOb" +depends="python3-asgiref python3-isodate python3-more-itertools + python3-openapi-spec-validator python3-parse python3-Werkzeug" +checkdepends="$depends python3-pytest-cov python3-pytest-aiohttp + python3-Flask python3-requests python3-responses python3-WebOb" short_desc="Support for the OpenAPI Specification v3" maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/python-openapi/openapi-core" changelog="https://github.com/python-openapi/openapi-core/releases" distfiles="${PYPI_SITE}/o/openapi-core/openapi_core-${version}.tar.gz" -checksum=561b7e2b37b336e9c62d4634b9059d12d9bb2e1859062a39d3a0fa6afc8c9de6 +checksum=63fa13d9af226ac00119b0531ac9929e3dbb4cbe00216770784473fa6a03bc27 post_install() { vlicense LICENSE From fb968afc27d8c566e3a6957333ffb3de3ded1687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 26 Sep 2023 10:30:14 -0300 Subject: [PATCH 11/32] python3-comm: update to 0.1.4. --- srcpkgs/python3-comm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-comm/template b/srcpkgs/python3-comm/template index 29ebd5afd7722..13ad0328ee940 100644 --- a/srcpkgs/python3-comm/template +++ b/srcpkgs/python3-comm/template @@ -1,6 +1,6 @@ # Template file for 'python3-comm' pkgname=python3-comm -version=0.1.3 +version=0.1.4 revision=1 build_style=python3-pep517 hostmakedepends="hatchling" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://github.com/ipython/comm/" changelog="https://raw.githubusercontent.com/ipython/comm/main/CHANGELOG.md" distfiles="https://github.com/ipython/comm/archive/refs/tags/v$version.tar.gz" -checksum=9bdea650a6194bf1628b17c2668bf74bf5295c87a7528a8aa4fe4472904b26f2 +checksum=4b7c0b56439d6835c1f4abf31b81c931fd6a6eba9e38f11f74ac80d1a720bed7 post_install() { vlicense LICENSE From e1c75461077be6d1819a51e0e862f552089ffba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 26 Sep 2023 10:30:19 -0300 Subject: [PATCH 12/32] python3-traitlets: update to 5.10.1. --- srcpkgs/python3-traitlets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-traitlets/template b/srcpkgs/python3-traitlets/template index 3bafe071d86b1..a855034c14352 100644 --- a/srcpkgs/python3-traitlets/template +++ b/srcpkgs/python3-traitlets/template @@ -1,6 +1,6 @@ # Template file for 'python3-traitlets' pkgname=python3-traitlets -version=5.10.0 +version=5.10.1 revision=1 build_style=python3-pep517 hostmakedepends="hatchling" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://github.com/ipython/traitlets" changelog="https://github.com/ipython/traitlets/raw/main/CHANGELOG.md" distfiles="${PYPI_SITE}/t/traitlets/traitlets-${version}.tar.gz" -checksum=f584ea209240466e66e91f3c81aa7d004ba4cf794990b0c775938a1544217cd1 +checksum=db9c4aa58139c3ba850101913915c042bdba86f7c8a0dda1c6f7f92c5da8e542 post_install() { vlicense LICENSE From 80a19a4f1c7ebb081a725ed4b710da2c12cbe2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 4 Jun 2023 16:38:21 -0300 Subject: [PATCH 13/32] python3-ipython_genutils: fix check, adopt. --- srcpkgs/python3-ipython_genutils/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-ipython_genutils/template b/srcpkgs/python3-ipython_genutils/template index c2aca9e1eaccf..31925c265c135 100644 --- a/srcpkgs/python3-ipython_genutils/template +++ b/srcpkgs/python3-ipython_genutils/template @@ -2,16 +2,21 @@ pkgname=python3-ipython_genutils version=0.2.0 revision=7 -build_style=python3-module -hostmakedepends="python3-setuptools" +build_style=python3-pep517 +hostmakedepends="python3-wheel" depends="python3" +checkdepends="python3-nose" short_desc="Vestigial utilities from IPython" -maintainer="Orphaned " +maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/ipython/ipython_genutils" distfiles="${PYPI_SITE}/i/ipython_genutils/ipython_genutils-${version}.tar.gz" checksum=eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8 +do_check() { + nosetests +} + post_install() { vlicense COPYING.md LICENSE } From 32c68e15f5d64be099a26fbcfbe124020f3f33be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 1 May 2023 21:17:12 -0300 Subject: [PATCH 14/32] python3-jupyter_core: update to 5.3.1, adopt. --- .../patches/platform_dirs_true.patch | 25 ++++++++++++++++++ srcpkgs/python3-jupyter_core/template | 26 +++++++++++++------ 2 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/python3-jupyter_core/patches/platform_dirs_true.patch diff --git a/srcpkgs/python3-jupyter_core/patches/platform_dirs_true.patch b/srcpkgs/python3-jupyter_core/patches/platform_dirs_true.patch new file mode 100644 index 0000000000000..1975140643599 --- /dev/null +++ b/srcpkgs/python3-jupyter_core/patches/platform_dirs_true.patch @@ -0,0 +1,25 @@ +Default to using platformdirs + +--- a/jupyter_core/paths.py 2020-02-01 21:00:00.000000000 -0300 ++++ b/jupyter_core/paths.py 2023-06-04 00:49:36.985844333 -0300 +@@ -53,7 +53,7 @@ + We plan for this to default to False in jupyter_core version 5 and to True + in jupyter_core version 6. + """ +- return envset("JUPYTER_PLATFORM_DIRS", False) # type:ignore[return-value] ++ return envset("JUPYTER_PLATFORM_DIRS", True) # type:ignore[return-value] + + + def get_home_dir() -> str: +--- a/jupyter_core/tests/test_paths.py 2020-02-01 21:00:00.000000000 -0300 ++++ b/jupyter_core/tests/test_paths.py 2023-06-04 00:49:05.967219753 -0300 +@@ -86,7 +86,7 @@ + return os.path.abspath(os.path.realpath(os.path.expanduser(path))) + + +-home_jupyter = realpath("~/.jupyter") ++home_jupyter = realpath("~/.config/jupyter") + + + def test_envset(): + diff --git a/srcpkgs/python3-jupyter_core/template b/srcpkgs/python3-jupyter_core/template index 175a296b6e6ca..6a28f6f0ef29c 100644 --- a/srcpkgs/python3-jupyter_core/template +++ b/srcpkgs/python3-jupyter_core/template @@ -1,20 +1,30 @@ # Template file for 'python3-jupyter_core' pkgname=python3-jupyter_core -version=5.0.0 -revision=2 +version=5.3.1 +revision=1 build_style=python3-pep517 -hostmakedepends="python3-flit_core hatchling" +hostmakedepends="hatchling" depends="python3-traitlets python3-platformdirs" +checkdepends="$depends python3-pytest " short_desc="Jupyter core package" -maintainer="Orphaned " +maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://jupyter.org" +changelog="https://raw.githubusercontent.com/jupyter/jupyter_core/main/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jupyter_core/jupyter_core-${version}.tar.gz" -checksum=4ed68b7c606197c7e344a24b7195eef57898157075a69655a886074b6beb7043 +checksum=5ba5c7938a7f97a6b0481463f7ff0dbac7c15ba48cf46fa4035ca6e838aa1aba conflicts="python-jupyter_core<=4.4.0_3" -# checks create a cycle with python3-jypter_client and python3-ipython_ipykernel -make_check=no + +do_check() { + # Running via PYTHONPATH breaks a few tests so we use a venv + local testdir="${wrksrc}/.xbps-testdir/$(date +%s)" + python3 -m venv --system-site-packages --without-pip "${testdir}" + + local testpy="${testdir}/bin/python3" + "${testpy}" -m installer dist/*.whl + PATH="${testdir}/bin:${PATH}" "${testpy}" -m pytest +} post_install() { - vlicense COPYING.md LICENSE + vlicense LICENSE } From 6dff7ea7701a24a1debfeb73cffd5f08c1a5752d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 25 May 2023 18:39:23 -0300 Subject: [PATCH 15/32] New package: python3-jupyter_events-0.7.0 --- srcpkgs/python3-jupyter_events/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/python3-jupyter_events/template diff --git a/srcpkgs/python3-jupyter_events/template b/srcpkgs/python3-jupyter_events/template new file mode 100644 index 0000000000000..17ffe7d9ef377 --- /dev/null +++ b/srcpkgs/python3-jupyter_events/template @@ -0,0 +1,20 @@ +# Template file for 'python3-jupyter_events' +pkgname=python3-jupyter_events +version=0.7.0 +revision=1 +build_style=python3-pep517 +hostmakedepends="hatchling" +depends="python3-jsonschema python3-json-logger python3-yaml python3-traitlets + python3-click python3-rich python3-rfc3339-validator python3-rfc3987" +checkdepends="$depends python3-pytest-asyncio python3-pytest-console-scripts" +short_desc="Configurable event system for Jupyter applications and extensions" +maintainer="Gonzalo Tornaría " +license="BSD-3-Clause" +homepage="https://github.com/jupyter/jupyter_events" +changelog="https://raw.githubusercontent.com/jupyter/jupyter_events/main/CHANGELOG.md" +distfiles="https://github.com/jupyter/jupyter_events/archive/refs/tags/v${version}.tar.gz" +checksum=084b253d649b127b902bcef14a24d1e6468a0de5268436dc4a01b8c144aca131 + +post_install() { + vlicense LICENSE +} From 35bfd6fdc394489c038857d12344f6ba9386f5e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 23 May 2023 23:15:56 -0300 Subject: [PATCH 16/32] python3-jupyter_nbformat: update to 5.9.2, adopt. --- srcpkgs/python3-jupyter_nbformat/template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template index 70b9db5e67054..357d1053e002a 100644 --- a/srcpkgs/python3-jupyter_nbformat/template +++ b/srcpkgs/python3-jupyter_nbformat/template @@ -1,21 +1,21 @@ # Template file for 'python3-jupyter_nbformat' pkgname=python3-jupyter_nbformat -version=5.3.0 -revision=2 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-jsonschema python3-traitlets - python3-ipython_genutils python3-jupyter_core - python3-fastjsonschema" -checkdepends="python3-pytest python3-testpath $depends" +version=5.9.2 +revision=1 +build_style=python3-pep517 +hostmakedepends="hatchling hatch-nodejs-version" +depends="python3-fastjsonschema python3-jsonschema python3-jupyter_core + python3-traitlets" +checkdepends="$depends python3-pytest python3-testpath python3-pep440" short_desc="Jupyter notebook format" -maintainer="Orphaned " +maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/jupyter/nbformat" +changelog="https://raw.githubusercontent.com/jupyter/nbformat/main/CHANGELOG.md" distfiles="${PYPI_SITE}/n/nbformat/nbformat-${version}.tar.gz" -checksum=fcc5ab8cb74e20b19570b5be809e2dba9b82836fd2761a89066ad43394ba29f5 +checksum=5f98b5ba1997dff175e77e0c17d5c10a96eaed2cbd1de3533d1fc35d5e111192 conflicts="python-jupyter_nbformat<=4.4.0_3" post_install() { - vlicense COPYING.md LICENSE + vlicense LICENSE } From 87152bea6314f399cbfcec0b660a10dfafec83ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 24 May 2023 17:54:18 -0300 Subject: [PATCH 17/32] python3-jupyter_widgetsnbextension: update to 4.0.9, adopt. --- .../python3-jupyter_widgetsnbextension/template | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/template b/srcpkgs/python3-jupyter_widgetsnbextension/template index 4b6b899992a31..6015ea6e8d69a 100644 --- a/srcpkgs/python3-jupyter_widgetsnbextension/template +++ b/srcpkgs/python3-jupyter_widgetsnbextension/template @@ -1,19 +1,16 @@ # Template file for 'python3-jupyter_widgetsnbextension' pkgname=python3-jupyter_widgetsnbextension -version=3.5.1 -revision=4 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-jupyter_notebook" -checkdepends="$depends" +version=4.0.9 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-jupyter_packaging" short_desc="Interactive HTML widgets for Jupyter notebooks" -maintainer="Orphaned " +maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://pypi.org/project/widgetsnbextension/" distfiles="${PYPI_SITE}/w/widgetsnbextension/widgetsnbextension-${version}.tar.gz" -checksum=079f87d87270bce047512400efd70238820751a11d2d8cb137a5a5bdbaf255c7 -replaces="python-jupyter_widgetsnbextension-data>=0" -conf_files="/etc/jupyter/nbconfig/notebook.d/widgetsnbextension.json" +checksum=3c1f5e46dc1166dfd40a42d685e6a51396fd34ff878742a3e47c6f0cc4a2a385 +make_check=no # Upstream defines no tests post_install() { # /usr/etc is intended for *example configuration* From fe12b7b9e092e1b0ba5c11bd080696c8c642fdaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 24 May 2023 13:25:40 -0300 Subject: [PATCH 18/32] python3-jupyterlab_pygments: update to 0.2.2. --- srcpkgs/python3-jupyterlab_pygments/template | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/srcpkgs/python3-jupyterlab_pygments/template b/srcpkgs/python3-jupyterlab_pygments/template index cb6b1aded2e60..cf382fcb45af2 100644 --- a/srcpkgs/python3-jupyterlab_pygments/template +++ b/srcpkgs/python3-jupyterlab_pygments/template @@ -1,18 +1,22 @@ # Template file for 'python3-jupyterlab_pygments' pkgname=python3-jupyterlab_pygments -version=0.1.2 -revision=3 -build_style=python3-module -hostmakedepends="python3-setuptools" +version=0.2.2 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-jupyter_packaging" depends="python3-Pygments" short_desc="Pygments theme making use of JupyterLab CSS variables" maintainer="dkwo " license="BSD-3-Clause" homepage="https://github.com/jupyterlab/jupyterlab_pygments" distfiles="${PYPI_SITE}/j/jupyterlab_pygments/jupyterlab_pygments-${version}.tar.gz" -checksum=cfcda0873626150932f438eccf0f8bf22bfa92345b814890ab360d666b254146 -# Upstream defines no tests -make_check=no +checksum=7405d7fde60819d905a9fa8ce89e4cd830e318cdad22a0030f7a901da705585d +make_check=no # Upstream defines no tests + +post_patch() { + # jupyterlab not really needed for building + vsed -i -e 's|, "jupyterlab~=3.1"||' pyproject.toml +} post_install() { vlicense LICENSE From 5d54289b69f875d828641bdfed4c6de7e7f53454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 1 May 2023 23:01:30 -0300 Subject: [PATCH 19/32] New package: python3-pytest-jupyter-0.7.0 --- srcpkgs/python3-pytest-jupyter/template | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/python3-pytest-jupyter/template diff --git a/srcpkgs/python3-pytest-jupyter/template b/srcpkgs/python3-pytest-jupyter/template new file mode 100644 index 0000000000000..c93ad7314446c --- /dev/null +++ b/srcpkgs/python3-pytest-jupyter/template @@ -0,0 +1,25 @@ +# Template file for 'python3-pytest-jupyter' +pkgname=python3-pytest-jupyter +version=0.7.0 +revision=1 +build_style=python3-pep517 +hostmakedepends="hatchling" +depends="python3-jupyter_core python3-pytest-timeout" +checkdepends="$depends" +short_desc="Pytest plugins for Jupyter libraries and extensions" +maintainer="Gonzalo Tornaría " +license="BSD-3-Clause" +homepage="https://github.com/jupyter-server/pytest-jupyter" +changelog="https://raw.githubusercontent.com/jupyter-server/pytest-jupyter/main/CHANGELOG.md" +distfiles="${PYPI_SITE}/p/pytest_jupyter/pytest_jupyter-${version}.tar.gz" +checksum=6403b7f6f5eaaa5a9faffd73d2ff1097106a7dc5c3204292212487fc9fb71843 +make_check=extended # avoid a circular dependency + +if [ "$XBPS_CHECK_PKGS" = full ]; then + # this would cause a check cycle + checkdepends+=" python3-ipython_ipykernel python3-jupyter_server" +fi + +post_install() { + vlicense LICENSE +} From ff7f2b31353d1eca02491f07344b8297958e2b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 1 May 2023 22:43:07 -0300 Subject: [PATCH 20/32] python3-jupyter_client: update to 8.3.1, adopt. --- srcpkgs/python3-jupyter_client/template | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/srcpkgs/python3-jupyter_client/template b/srcpkgs/python3-jupyter_client/template index 6839108ea9627..3484b2a96bec0 100644 --- a/srcpkgs/python3-jupyter_client/template +++ b/srcpkgs/python3-jupyter_client/template @@ -1,21 +1,27 @@ # Template file for 'python3-jupyter_client' pkgname=python3-jupyter_client -version=7.4.5 +version=8.3.1 revision=1 build_style=python3-pep517 -hostmakedepends="python3-flit_core hatchling" -depends="python3-traitlets python3-jupyter_core python3-pyzmq - python3-dateutil python3-tornado python3-nest_asyncio python3-entrypoints" +hostmakedepends="hatchling" +depends="python3-dateutil python3-jupyter_core python3-pyzmq python3-tornado" +checkdepends="$depends inetutils-ifconfig iproute2 openssh + python3-pytest-jupyter python3-pytest-timeout" short_desc="Jupyter protocol client APIs" -maintainer="Orphaned " +maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/jupyter/jupyter_client" +changelog="https://raw.githubusercontent.com/jupyter/jupyter_client/main/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jupyter_client/jupyter_client-${version}.tar.gz" -checksum=63eae06c40e1f2d9afa14447511fddc065c95dea3f2491fda2acccf91221954a +checksum=60294b2d5b869356c893f57b1a877ea6510d60d45cf4b38057f1672d85699ac9 conflicts="python-jupyter_client<=5.2.4_2" -# checks create a cycle with python3-jupyter_core and python3-ipython_ipykernel -make_check=no +make_check=extended # avoid a circular dependency + +if [ "$XBPS_CHECK_PKGS" = full ]; then + # this would cause a build-time circular dependency + checkdepends+=" python3-ipython_ipykernel" +fi post_install() { - vlicense COPYING.md LICENSE + vlicense LICENSE } From acee8318047f11e10511cb311776b13aa27a0643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 2 May 2023 01:07:04 -0300 Subject: [PATCH 21/32] python3-ipython_ipykernel: update to 6.25.2, adopt. --- srcpkgs/python3-ipython_ipykernel/template | 38 +++++++++++++++------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template index 4034b98a6ff50..4ee757a022802 100644 --- a/srcpkgs/python3-ipython_ipykernel/template +++ b/srcpkgs/python3-ipython_ipykernel/template @@ -1,21 +1,37 @@ # Template file for 'python3-ipython_ipykernel' pkgname=python3-ipython_ipykernel -version=6.19.2 +version=6.25.2 revision=1 build_style=python3-pep517 -hostmakedepends="hatchling python3-jupyter_client python3-jupyter_core - python3-platformdirs" -depends="python3-ipython python3-traitlets python3-jupyter_client python3-tornado - python3-matplotlib-inline python3-nest_asyncio python3-packaging python3-psutil - python3 python3-comm python3-pyzmq" -short_desc="IPython kernel for Jupyter (Python3)" -maintainer="Orphaned " +# these tests fail in 6.25.2 +make_check_args=" + --deselect ipykernel/tests/test_eventloop.py::test_asyncio_interrupt + --deselect ipykernel/tests/test_embed_kernel.py::test_embed_kernel_func + --deselect ipykernel/tests/test_kernelspec.py::test_install_kernelspec" +hostmakedepends="hatchling python3-jupyter_client" +depends="python3-comm python3-ipython python3-jupyter_client + python3-nest_asyncio python3-packaging python3-psutil python3-tornado" +checkdepends="$depends python3-flaky python3-pytest-asyncio + python3-pytest-timeout python3-trio python3-curio python3-matplotlib" +short_desc="IPython kernel for Jupyter" +maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/ipython/ipykernel" +changelog="https://raw.githubusercontent.com/ipython/ipykernel/main/CHANGELOG.md" distfiles="${PYPI_SITE}/i/ipykernel/ipykernel-${version}.tar.gz" -checksum=1ab68d3d3654196266baa93990055413e167263ffbe4cfe834f871bcd3d3506d -make_check=no # cycle with python3-jupyter_core and python3-jupyter_client +checksum=f468ddd1f17acb48c8ce67fcfa49ba6d46d4f9ac0438c1f441be7c3d1372230b + +if [ "$XBPS_CHECK_PKGS" = full ]; then + # this would cause a build-time circular dependency + checkdepends+=" python3-ipyparallel" +else + # These tests require ipyparallel + make_check_args+=" + --ignore ipykernel/tests/test_pickleutil.py + --deselect ipykernel/tests/test_ipkernel_direct.py::test_do_apply + " +fi post_install() { - vlicense COPYING.md LICENSE + vlicense LICENSE } From c360451533138ee725eb768796034b2eac5a309c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 24 May 2023 23:03:23 -0300 Subject: [PATCH 22/32] python3-jupyter_ipywidgets: update to 8.1.1, adopt. --- srcpkgs/python3-jupyter_ipywidgets/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template index dee09caf562c0..55d14cac26b21 100644 --- a/srcpkgs/python3-jupyter_ipywidgets/template +++ b/srcpkgs/python3-jupyter_ipywidgets/template @@ -1,17 +1,18 @@ # Template file for 'python3-jupyter_ipywidgets' pkgname=python3-jupyter_ipywidgets -version=7.6.3 -revision=3 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-jupyter_widgetsnbextension python3-ipython_ipykernel python3-traitlets" -checkdepends="python3-pytest $depends" +version=8.1.1 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-wheel" +depends="python3-ipython_ipykernel" +checkdepends="$depends python3-pytest python3-jsonschema python3-pytz" short_desc="IPython widgets for the Jupyter notebook" -maintainer="Orphaned " +maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/jupyter-widgets/ipywidgets" +changelog="https://raw.githubusercontent.com/jupyter-widgets/ipywidgets/main/docs/source/changelog.md" distfiles="${PYPI_SITE}/i/ipywidgets/ipywidgets-${version}.tar.gz" -checksum=9f1a43e620530f9e570e4a493677d25f08310118d315b00e25a18f12913c41f0 +checksum=40211efb556adec6fa450ccc2a77d59ca44a060f4f9f136833df59c9f538e6e8 post_install() { vlicense LICENSE From cc3dc101711b0e21eeafb29d55b1ab8bef9a04b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 24 May 2023 23:14:20 -0300 Subject: [PATCH 23/32] python3-nbclient: update to 0.8.0. --- srcpkgs/python3-nbclient/template | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-nbclient/template b/srcpkgs/python3-nbclient/template index dca1870f7b9e7..9b2556aa53670 100644 --- a/srcpkgs/python3-nbclient/template +++ b/srcpkgs/python3-nbclient/template @@ -1,19 +1,25 @@ # Template file for 'python3-nbclient' pkgname=python3-nbclient -version=0.7.0 +version=0.8.0 revision=1 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-traitlets python3-jupyter_client - python3-jupyter_nbformat python3-async_generator python3-nest_asyncio" +build_style=python3-pep517 +hostmakedepends="hatchling" +depends="python3-jupyter_client python3-jupyter_nbformat" +checkdepends="$depends python3-pytest-asyncio python3-testpath + python3-flaky python3-jupyter_ipywidgets python3-xmltodict" short_desc="Client library for executing Jupyter notebooks" maintainer="dkwo " license="BSD-3-Clause" homepage="https://nbclient.readthedocs.io/en/latest/" +changelog="https://raw.githubusercontent.com/jupyter/nbclient/main/CHANGELOG.md" distfiles="${PYPI_SITE}/n/nbclient/nbclient-${version}.tar.gz" -checksum=a1d844efd6da9bc39d2209bf996dbd8e07bf0f36b796edfabaa8f8a9ab77c3aa -# Package might need to be installed for testing -make_check=no +checksum=f9b179cd4b2d7bca965f900a2ebf0db4a12ebff2f36a711cb66861e4ae158e55 +make_check=extended # avoid a circular dependency + +if [ "$XBPS_CHECK_PKGS" = full ]; then + # this would cause a build-time circular dependency + checkdepends+=" python3-jupyter_nbconvert" +fi post_install() { vlicense LICENSE From 1de5548e4d9b6738c5e37d2a3378833c915d3d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 15 Jun 2023 17:05:06 -0300 Subject: [PATCH 24/32] python3-mistune: update to 3.0.1, adopt. --- srcpkgs/python3-mistune/template | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-mistune/template b/srcpkgs/python3-mistune/template index c9c60af0b6b47..6a8a82dde4504 100644 --- a/srcpkgs/python3-mistune/template +++ b/srcpkgs/python3-mistune/template @@ -1,16 +1,18 @@ # Template file for 'python3-mistune' pkgname=python3-mistune -version=0.8.4 -revision=6 -build_style=python3-module -hostmakedepends="python3-setuptools" +version=3.0.1 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-setuptools python3-wheel" depends="python3" -short_desc="Fast markdown parser for Python3" -maintainer="Orphaned " +checkdepends="python3-pytest" +short_desc="Markdown parser for Python" +maintainer="Gonzalo Tornaría " license="BSD-3-Clause" -homepage="https://github.com/lepture/mistune" +homepage="https://mistune.lepture.com/" +changelog="https://raw.githubusercontent.com/lepture/mistune/master/docs/changes.rst" distfiles="${PYPI_SITE}/m/mistune/mistune-${version}.tar.gz" -checksum=59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e +checksum=e912116c13aa0944f9dc530db38eb88f6a77087ab128f49f84a48f4c05ea163c post_install() { vlicense LICENSE From 4b8d021d7b86edb696e6747d75cfd83689e0af90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 25 May 2023 15:11:44 -0300 Subject: [PATCH 25/32] python3-jupyter_nbconvert: update to 7.8.0, adopt. --- .../files/README.voidlinux | 2 - srcpkgs/python3-jupyter_nbconvert/template | 40 +++++++++++-------- 2 files changed, 24 insertions(+), 18 deletions(-) delete mode 100644 srcpkgs/python3-jupyter_nbconvert/files/README.voidlinux diff --git a/srcpkgs/python3-jupyter_nbconvert/files/README.voidlinux b/srcpkgs/python3-jupyter_nbconvert/files/README.voidlinux deleted file mode 100644 index 5efba6bbb86f1..0000000000000 --- a/srcpkgs/python3-jupyter_nbconvert/files/README.voidlinux +++ /dev/null @@ -1,2 +0,0 @@ -To convert notebooks to formats other than HTML and markdown install -python3-Sphinx and/or pandoc. diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template index f22b15735276f..5b5c1d41fedfe 100644 --- a/srcpkgs/python3-jupyter_nbconvert/template +++ b/srcpkgs/python3-jupyter_nbconvert/template @@ -1,26 +1,34 @@ # Template file for 'python3-jupyter_nbconvert' pkgname=python3-jupyter_nbconvert -version=6.4.5 -revision=2 -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-BeautifulSoup4" -checkdepends="python3-pytest python3-ipython_ipykernel - python3-jupyter_ipywidgets python3-Pebble pandoc inkscape $depends" +version=7.8.0 +revision=1 +build_style=python3-pep517 +# these two tests require nbconvert.tests (not installed) +make_check_args="-k not((test_convert_full_qualified_name)or(test_post_processor))" +hostmakedepends="hatchling" +depends="python3-BeautifulSoup4 python3-bleach python3-defusedxml + python3-Jinja2 python3-jupyter_core python3-jupyterlab_pygments + python3-MarkupSafe python3-mistune python3-nbclient + python3-jupyter_nbformat python3-packaging python3-pandocfilters + python3-tinycss2" +checkdepends="$depends python3-pytest python3-jupyter_ipywidgets + asciidoc inkscape pandoc python3-flaky" short_desc="Converting Jupyter notebooks" -maintainer="Orphaned " +maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/jupyter/nbconvert" +changelog="https://raw.githubusercontent.com/jupyter/nbconvert/main/CHANGELOG.md" distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz" -checksum=21163a8e2073c07109ca8f398836e45efdba2aacea68d6f75a8a545fef070d4e -conflicts="python-jupyter_nbconvert<=5.4.1_2" +checksum=f5bc15a1247e14dd41ceef0c0a3bc70020e016576eb0578da62f1c5b4f950479 + +pre_check() { + # templates must be in $JUPYTER_DATA_DIR/nbconvert/templates + # but they are in ${wrksrc}/share/templates + # fix with a symlink share/nbconvert -> share/. + [ -d share/nbconvert ] || ln -s . share/nbconvert + export JUPYTER_DATA_DIR="${wrksrc}/share" +} post_install() { vlicense LICENSE - vdoc "${FILESDIR}/README.voidlinux" } From 044ca65bbc09ee0d8285bb9cd28a46b85d61555f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 25 May 2023 19:05:16 -0300 Subject: [PATCH 26/32] New package: python3-jupyter_server_terminals-0.4.4 --- .../python3-jupyter_server_terminals/template | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 srcpkgs/python3-jupyter_server_terminals/template diff --git a/srcpkgs/python3-jupyter_server_terminals/template b/srcpkgs/python3-jupyter_server_terminals/template new file mode 100644 index 0000000000000..2223e3b67439d --- /dev/null +++ b/srcpkgs/python3-jupyter_server_terminals/template @@ -0,0 +1,26 @@ +# Template file for 'python3-jupyter_server_terminals' +pkgname=python3-jupyter_server_terminals +version=0.4.4 +revision=1 +build_style=python3-pep517 +hostmakedepends="hatchling" +depends="python3-terminado" +checkdepends="$depends python3-pytest-jupyter" +short_desc="Jupyter server extension providing support for terminals" +maintainer="Gonzalo Tornaría " +license="BSD-3-Clause" +homepage="https://github.com/jupyter-server/jupyter_server_terminals" +changelog="https://raw.githubusercontent.com/jupyter-server/jupyter_server_terminals/main/CHANGELOG.md" +distfiles="https://github.com/jupyter-server/jupyter_server_terminals/archive/refs/tags/v${version}.tar.gz" +checksum=19aacba9fc3a068495fa7b493e9f70dba8faeb3b9e6f6510f89fa07759024446 +make_check=extended # avoid a circular dependency + +if [ "$XBPS_CHECK_PKGS" = full ]; then + # this would cause a build-time circular dependency + checkdepends+=" python3-jupyter_server" +fi + +post_install() { + mv ${DESTDIR}/usr/etc ${DESTDIR} + vlicense LICENSE +} From e84db544af6edc71db98b76cbb9bbe13f415d241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 25 May 2023 22:30:26 -0300 Subject: [PATCH 27/32] python3-jupyter_server: update to 2.7.3. --- srcpkgs/python3-jupyter_server/template | 38 +++++++++++++++---------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template index 798aa4af2309f..b0bd9f2f758bc 100644 --- a/srcpkgs/python3-jupyter_server/template +++ b/srcpkgs/python3-jupyter_server/template @@ -1,26 +1,34 @@ # Template file for 'python3-jupyter_server' pkgname=python3-jupyter_server -version=1.23.1 +version=2.7.3 revision=1 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-anyio python3-jupyter_client python3-jupyter_nbformat - python3-jupyter_nbconvert python3-terminado - python3-prometheus_client python3-traitlets python3-tornado - python3-Jinja2 python3-send2trash python3-websocket-client" -checkdepends="${depends} python3-argon2 python3-packaging - python3-coverage python3-pytest-mock python3-requests - python3-pytest python3-pytest-timeout python3-pytest-asyncio" +build_style=python3-pep517 +hostmakedepends="hatchling hatch-jupyter-builder" +depends="python3-anyio python3-argon2 python3-jupyter_client + python3-jupyter_events python3-jupyter_nbconvert + python3-jupyter_server_terminals python3-overrides + python3-prometheus_client python3-send2trash + python3-websocket-client" +checkdepends="$depends pandoc python3-ipython_ipykernel + python3-pytest-console-scripts python3-pytest-jupyter + python3-pytest-xdist python3-requests python3-flaky" short_desc="Backend to Jupyter web applications" maintainer="dkwo " license="BSD-3-Clause" -homepage="https://jupyter.org" +homepage="https://github.com/jupyter-server/jupyter_server" changelog="https://raw.githubusercontent.com/jupyter-server/jupyter_server/main/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz" -checksum=cee48d9d96cecd0f94b7cb41ecd4f0ab05b01643769f61c5d397b7873bc9a1e2 -# missing pytest-tornasync, pytest-console-scripts -make_check=no +checksum=d4916c8581c4ebbc534cebdaa8eca2478d9f3bfdd88eae29fcab0120eac57649 + +if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then + # these tests fail on CI (connect to a tcp address) + make_check_args=" + --deselect=tests/extension/test_launch.py::test_launch_instance + --deselect=tests/extension/test_launch.py::test_base_url + --deselect=tests/extension/test_launch.py::test_token_file + " +fi post_install() { - vlicense COPYING.md + vlicense LICENSE } From 8359aecee6bbc8bd0f1be82a14c698f1dce8d376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 24 May 2023 12:09:02 -0300 Subject: [PATCH 28/32] python3-notebook_shim: update to 0.2.3. --- srcpkgs/python3-notebook_shim/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-notebook_shim/template b/srcpkgs/python3-notebook_shim/template index 37287de8e7d2e..c1e58a8e8159a 100644 --- a/srcpkgs/python3-notebook_shim/template +++ b/srcpkgs/python3-notebook_shim/template @@ -1,19 +1,20 @@ # Template file for 'python3-notebook_shim' pkgname=python3-notebook_shim -version=0.2.2 +version=0.2.3 revision=1 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-jupyter_server" +checkdepends="$depends python3-pytest-jupyter" short_desc="Shim layer for notebook traits and config" maintainer="dkwo " license="BSD-3-Clause" homepage="https://github.com/jupyter/notebook_shim" +changelog="https://raw.githubusercontent.com/jupyter/notebook_shim/main/CHANGELOG.md" distfiles="${PYPI_SITE}/n/notebook_shim/notebook_shim-${version}.tar.gz" -checksum=090e0baf9a5582ff59b607af523ca2db68ff216da0c69956b62cab2ef4fc9c3f -make_check=no # missing pytest_tornasync +checksum=f69388ac283ae008cd506dda10d0288b09a017d822d5e8c7129a152cbd3ce7e9 post_install() { + mv ${DESTDIR}/usr/etc ${DESTDIR} vlicense LICENSE - mv "${PKGDESTDIR}/usr/etc" ${PKGDESTDIR}/etc/ } From 2905afb3a9480028eef76af728dee69e11ee09d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 25 May 2023 23:12:45 -0300 Subject: [PATCH 29/32] python3-nbclassic: update to 1.0.0. --- srcpkgs/python3-nbclassic/template | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/srcpkgs/python3-nbclassic/template b/srcpkgs/python3-nbclassic/template index 4c751d222a606..6f6d16a47a4ed 100644 --- a/srcpkgs/python3-nbclassic/template +++ b/srcpkgs/python3-nbclassic/template @@ -1,25 +1,25 @@ # Template file for 'python3-nbclassic' pkgname=python3-nbclassic -version=0.4.8 +version=1.0.0 revision=1 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-jupyter_notebook python3-jupyter_server" -checkdepends="${depends} python3-pytest python3-pytest-fixture-config python3-pytest-subtests" +build_style=python3-pep517 +make_build_args="--skip-dependency-check" +hostmakedepends="python3-jupyter_packaging python3-jupyter_server" +depends="mathjax2 python3-notebook_shim" +checkdepends="$depends python3-pytest-jupyter" short_desc="Jupyter Notebook as a Jupyter Server Extension" maintainer="dkwo " license="BSD-3-Clause" -homepage="https://jupyter.org" +homepage="https://github.com/jupyter/nbclassic" +changelog="https://raw.githubusercontent.com/jupyter/nbclassic/main/CHANGELOG.md" distfiles="${PYPI_SITE}/n/nbclassic/nbclassic-${version}.tar.gz" -checksum=c74d8a500f8e058d46b576a41e5bc640711e1032cf7541dde5f73ea49497e283 -# missing fixtures: jp_create_notebook jp_fetch -make_check=no - -conf_files="/etc/jupyter/jupyter_server_config.d/*.json" +checksum=0ae11eb2319455d805596bf320336cda9554b41d99ab9a3c31bf8180bffa30e3 post_install() { vlicense LICENSE + mv ${DESTDIR}/usr/etc ${DESTDIR} - # jupyter honors /etc/juypter; move config files there - mv "${DESTDIR}/usr/etc" "${DESTDIR}/etc" + # use system mathjax2 + rm -rf ${DESTDIR}/${py3_sitelib}/nbclassic/static/components/MathJax + ln -sf /usr/share/mathjax ${DESTDIR}/${py3_sitelib}/nbclassic/static/components/MathJax } From 8ab710cff2c7dfdf27f4b2c1b74a8985dabdd056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 27 May 2023 17:50:24 -0300 Subject: [PATCH 30/32] python3-jupyterlab_server: update to 2.25.0. --- srcpkgs/python3-jupyterlab_server/template | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template index a09205776e6cb..f471aca0d56cd 100644 --- a/srcpkgs/python3-jupyterlab_server/template +++ b/srcpkgs/python3-jupyterlab_server/template @@ -1,18 +1,19 @@ # Template file for 'python3-jupyterlab_server' pkgname=python3-jupyterlab_server -version=2.10.3 -revision=2 -build_style=python3-module -hostmakedepends="python3-setuptools python3-jupyter_notebook python3-jupyter_server" -depends="python3-requests python3-json5 python3-Babel" -short_desc="Server components for JupyterLab and -like applications" +version=2.25.0 +revision=1 +build_style=python3-pep517 +hostmakedepends="hatchling" +depends="python3-jupyter_server python3-Babel python3-json5 python3-requests" +checkdepends="$depends python3-pytest-jupyter python3-openapi-core + python3-requests-mock python3-strict-rfc3339 python3-ruamel.yaml python3-pip" +short_desc="Server components for JupyterLab and JL-like applications" maintainer="dkwo " license="BSD-3-Clause" -homepage="https://jupyter.org" +homepage="https://github.com/jupyterlab/jupyterlab_server" +changelog="https://raw.githubusercontent.com/jupyterlab/jupyterlab_server/main/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jupyterlab_server/jupyterlab_server-${version}.tar.gz" -checksum=3fb84a5813d6d836ceda773fb2d4e9ef3c7944dbc1b45a8d59d98641a80de80a -# Tests require unpackaged dependencies -make_check=no +checksum=77c2f1f282d610f95e496e20d5bf1d2a7706826dfb7b18f3378ae2870d272fb7 post_install() { vlicense LICENSE From 77d4bf258ea41b63ff3c8c1461d4cad36fcf274d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 28 May 2023 18:19:20 -0300 Subject: [PATCH 31/32] jupyterlab: update to 4.0.6. --- srcpkgs/jupyterlab/template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template index 65597d3b63d5d..360a41f3a5b26 100644 --- a/srcpkgs/jupyterlab/template +++ b/srcpkgs/jupyterlab/template @@ -1,22 +1,22 @@ # Template file for 'jupyterlab' pkgname=jupyterlab -version=3.5.0 -revision=2 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-jupyterlab_server nodejs python3-nbclassic - python3-requests-unixsocket python3-jupyter_ipywidgets - python3-notebook_shim" +version=4.0.6 +revision=1 +build_style=python3-pep517 +hostmakedepends="hatchling hatch-jupyter-builder" +depends="nodejs python3-async-lru python3-ipython_ipykernel + python3-jupyterlab_server python3-notebook_shim python3-tomli" +checkdepends="$depends python3-pytest-jupyter python3-pytest-xdist" short_desc="JupyterLab computational environment" maintainer="dkwo " license="custom:jupyterlab" -homepage="https://jupyter.org" +homepage="https://github.com/jupyterlab/jupyterlab/" +changelog="https://raw.githubusercontent.com/jupyterlab/jupyterlab/main/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jupyterlab/jupyterlab-${version}.tar.gz" -checksum=e02556c8ea1b386963c4b464e4618aee153c5416b07ab481425c817a033323a2 -# Tests require unpackaged dependencies -make_check=no +checksum=6c43ae5a6a1fd2fdfafcb3454004958bde6da76331abb44cffc6f9e436b19ba1 post_install() { + mv ${DESTDIR}/usr/etc ${DESTDIR} vlicense LICENSE vinstall "${FILESDIR}/jupyterlab.sh" 644 etc/profile.d } From 9187d3c1cd0c82dad1fcce99f3988ff9b764bb2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 29 May 2023 16:40:44 -0300 Subject: [PATCH 32/32] python3-jupyter_notebook: update to 7.0.4. --- srcpkgs/python3-jupyter_notebook/template | 30 +++++++++-------------- srcpkgs/python3-jupyter_notebook/update | 2 +- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template index 620b6715abfc5..87895c86dbe87 100644 --- a/srcpkgs/python3-jupyter_notebook/template +++ b/srcpkgs/python3-jupyter_notebook/template @@ -1,27 +1,21 @@ # Template file for 'python3-jupyter_notebook' pkgname=python3-jupyter_notebook -version=6.4.10 -revision=3 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-Jinja2 python3-terminado python3-tornado - python3-ipython_genutils python3-traitlets python3-jupyter_core - python3-jupyter_client python3-jupyter_nbformat python3-jupyter_nbconvert - python3-ipython_ipykernel python3-send2trash python3-prometheus_client - mathjax2 python3-argon2" +version=7.0.4 +revision=1 +build_style=python3-pep517 +make_build_args="--skip-dependency-check" +hostmakedepends="hatchling hatch-jupyter-builder jupyterlab" +depends="python3-jupyter_client" +checkdepends="$depends python3-pytest-jupyter" short_desc="Jupyter interactive notebook" -maintainer="Orphaned " +maintainer="Gonzalo Tornaría " license="BSD-3-Clause" -homepage="https://jupyter.org/" +homepage="https://github.com/jupyter/notebook" +changelog="https://raw.githubusercontent.com/jupyter/notebook/main/CHANGELOG.md" distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz" -checksum=2408a76bc6289283a8eecfca67e298ec83c67db51a4c2e1b713dd180bb39e90e -conflicts="python-jupyter_notebook<=5.7.0_2" -# Tests require unpackaged selenium -make_check=no +checksum=0c1b458f72ce8774445c8ef9ed2492bd0b9ce9605ac996e2b066114f69795e71 post_install() { + mv ${DESTDIR}/usr/etc ${DESTDIR} vlicense LICENSE - # use system mathjax - rm -rf ${DESTDIR}/${py3_sitelib}/notebook/static/components/MathJax - ln -sf /usr/share/mathjax ${DESTDIR}/${py3_sitelib}/notebook/static/components/MathJax } diff --git a/srcpkgs/python3-jupyter_notebook/update b/srcpkgs/python3-jupyter_notebook/update index 1bb284fed4967..276c9bf787e58 100644 --- a/srcpkgs/python3-jupyter_notebook/update +++ b/srcpkgs/python3-jupyter_notebook/update @@ -1,2 +1,2 @@ pkgname=notebook -ignore="*a* *b* *rc*" +#ignore="*a* *b* *rc*"