diff options
Diffstat (limited to 'dev-python/jupyter-events')
4 files changed, 3 insertions, 146 deletions
diff --git a/dev-python/jupyter-events/Manifest b/dev-python/jupyter-events/Manifest index cbbd8c11274c..5e23141568e8 100644 --- a/dev-python/jupyter-events/Manifest +++ b/dev-python/jupyter-events/Manifest @@ -1,6 +1,3 @@ -AUX jupyter-events-0.10.0-test.patch 2918 BLAKE2B dae8b0720cc9beaf31d73c22b58adbae710aa88fa985373425fbab0996163f7afcba6ce5d301fb31fd328557f899db95241dcc42a50bb80bf21aac9f8b5b80bf SHA512 6b7b9e6165fd053a1fb29b1540a0da563c56047de9039019df1d778419ac355345c95975293289b115a9c3a3d298ff9db983bb972afa31b9ca43c741d8363604 -DIST jupyter_events-0.10.0.tar.gz 61516 BLAKE2B 12cf323f65cd52a6c0aa29e7b75e7899ec245752a7c4e17d32650ae3e9b27f47a7e593b491747667dfc58bde5e0745077c72317dbfa6db1f266d7ada14bc8f6a SHA512 6e56b48a238353fbd5e6a1a8cb3fcc5a506063aa555c96172ec2e03a14fb527b39d03a9897de49353927e8993a770d028d6d0d2c9a92785c4b727e3da66676df DIST jupyter_events-0.11.0.tar.gz 62039 BLAKE2B 0a6d4598c763c59595d66e8ea30c0c056e48600a024e138258a6d0b306a002b10bf2eabaad78bb7ca1280b214660cd682737518c503437ba4921451473cb0d92 SHA512 a19458ca9e2b9c44af1a7b4b80259aa4f67b318a5bf6ca7a9b4e24c6e6923b64947b6de8f9476e354b090542bfd9af5b7db2479df0e08ff3617d7c0f32cc267e -EBUILD jupyter-events-0.10.0.ebuild 1231 BLAKE2B ffdcb7fea6b14e14ef06c450d7fe160f03228c64c1713036ee70d39b86ab9ba212814880695648bc6160c7389dab33937f6add2bfe8ae335635fc372962539b3 SHA512 f94d1c3b42f03472638c0f1ed2480d7b2f4e4219f9eda513850224720f5124023d3a836721becf85ec6bdc4c41ddd43362ba3952a0a04335713abdf3cfb423ec -EBUILD jupyter-events-0.11.0.ebuild 1087 BLAKE2B 1ef279384dbbddb080b5ada8bead41b9351c4b42459a52eaf7f4c73bc909933de2ea8e79e7e37673aaf1fd324fe53324ffb1a8bc803de681e848ea6e36221a33 SHA512 31be4618bd252e3cbe0d690162f8a43dd3bd569009583781bdf891f80fd40c49689fc2bc2646fff90b53134fd546830dcb8ad31994e4e277213c430b37eebd98 +EBUILD jupyter-events-0.11.0.ebuild 1080 BLAKE2B 081ab03a9824bbcf36f451706decaac107c9847fd2dfa659a28d7b128e524d3d2ea203f33d98a815ac42afa7bb270526ba8cd0a46b3cd67329e15d81152ebfbf SHA512 d2a2fe2cc5726a9f478c255ac6b6a279fc8f381dc8603e9f553076f3ebe8171e053c591757556ded878e8b6385821d3839628115f60234463d7c9ca9b891ce2d MISC metadata.xml 537 BLAKE2B dfe33b67ac51a46c9ad33d4b0e02ff39d5aa1780d70f92f12b7ee8ac336c43caa79201bebd42c461373bfdc7608580487ec000613cf92765fec352b70a8aec13 SHA512 689e8a1125b4da96db6d6c4495933ee29d24666ad9e7e3af891170f8da512ac388c005836402c74418476cb9838f278c19f5267840533cef0e02091d47fa43ea diff --git a/dev-python/jupyter-events/files/jupyter-events-0.10.0-test.patch b/dev-python/jupyter-events/files/jupyter-events-0.10.0-test.patch deleted file mode 100644 index 44695c174cdd..000000000000 --- a/dev-python/jupyter-events/files/jupyter-events-0.10.0-test.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 6c6219710e08784b3b8beed25d17240ea7f9ef93 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Fri, 12 Jul 2024 11:05:40 +0200 -Subject: [PATCH 1/2] Improve compatibility with patched python-json-logger on - py3.12+ - -Discard the `taskName` field from event capsule, to preserve -compatibility both with current python-json-logger versions, and with -versions containing the Python 3.12 fix -from madzak/python-json-logger#188 that removes the reserved `taskName` -field. ---- - tests/test_logger.py | 15 +++++---------- - 1 file changed, 5 insertions(+), 10 deletions(-) - -diff --git a/tests/test_logger.py b/tests/test_logger.py -index 8a0a499..986aade 100644 ---- a/tests/test_logger.py -+++ b/tests/test_logger.py -@@ -166,8 +166,7 @@ def test_emit(): - "__metadata_version__": 1, - "something": "blah", - } -- if sys.version_info >= (3, 12): -- expected["taskName"] = None -+ event_capsule.pop("taskName", None) - assert event_capsule == expected - - -@@ -214,8 +213,7 @@ def test_message_field(): - "something": "blah", - "message": "a message was seen", - } -- if sys.version_info >= (3, 12): -- expected["taskName"] = None -+ event_capsule.pop("taskName", None) - assert event_capsule == expected - - -@@ -263,8 +261,7 @@ def test_nested_message_field(): - "__metadata_version__": 1, - "thing": {"message": "a nested message was seen"}, - } -- if sys.version_info >= (3, 12): -- expected["taskName"] = None -+ event_capsule.pop("taskName", None) - assert event_capsule == expected - - -@@ -428,8 +425,7 @@ def test_unique_logger_instances(): - "__metadata_version__": 1, - "something": "blah", - } -- if sys.version_info >= (3, 12): -- expected["taskName"] = None -+ event_capsule0.pop("taskName", None) - assert event_capsule0 == expected - - event_capsule1 = json.loads(output1.getvalue()) -@@ -443,8 +439,7 @@ def test_unique_logger_instances(): - "__metadata_version__": 1, - "something": "blah", - } -- if sys.version_info >= (3, 12): -- expected["taskName"] = None -+ event_capsule1.pop("taskName", None) - assert event_capsule1 == expected - - - -From 5ad1b27eb8424f1c33067eb68859f9ed0d7ede74 Mon Sep 17 00:00:00 2001 -From: "pre-commit-ci[bot]" - <66853113+pre-commit-ci[bot]@users.noreply.github.com> -Date: Fri, 12 Jul 2024 09:08:44 +0000 -Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks - -for more information, see https://pre-commit.ci ---- - tests/test_logger.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tests/test_logger.py b/tests/test_logger.py -index 986aade..ecd56ab 100644 ---- a/tests/test_logger.py -+++ b/tests/test_logger.py -@@ -3,7 +3,6 @@ - import io - import json - import logging --import sys - from datetime import datetime, timedelta, timezone - from unittest.mock import MagicMock - diff --git a/dev-python/jupyter-events/jupyter-events-0.10.0.ebuild b/dev-python/jupyter-events/jupyter-events-0.10.0.ebuild deleted file mode 100644 index 241a36a33ff2..000000000000 --- a/dev-python/jupyter-events/jupyter-events-0.10.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( pypy3 python3_{10..13} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Jupyter Event System library" -HOMEPAGE=" - https://jupyter.org/ - https://github.com/jupyter/jupyter_events/ - https://pypi.org/project/jupyter-events/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -# jsonschema[format-nongpl] deps are always on in our ebuild -RDEPEND=" - >=dev-python/jsonschema-4.18.0[${PYTHON_USEDEP}] - >=dev-python/python-json-logger-2.0.4[${PYTHON_USEDEP}] - >=dev-python/pyyaml-5.3[${PYTHON_USEDEP}] - dev-python/referencing[${PYTHON_USEDEP}] - >=dev-python/traitlets-5.3[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/click[${PYTHON_USEDEP}] - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-console-scripts[${PYTHON_USEDEP}] - dev-python/rich[${PYTHON_USEDEP}] - ) -" - -# TODO: package jupyterlite-sphinx -# distutils_enable_sphinx docs -distutils_enable_tests pytest - -PATCHES=( - # fix compatibility with patched python-json-logger - # https://github.com/jupyter/jupyter_events/pull/100 - "${FILESDIR}/${P}-test.patch" -) diff --git a/dev-python/jupyter-events/jupyter-events-0.11.0.ebuild b/dev-python/jupyter-events/jupyter-events-0.11.0.ebuild index b30d637e912e..67132ac1a856 100644 --- a/dev-python/jupyter-events/jupyter-events-0.11.0.ebuild +++ b/dev-python/jupyter-events/jupyter-events-0.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" # jsonschema[format-nongpl] deps are always on in our ebuild RDEPEND=" |