From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5E3CD158086 for ; Thu, 2 Dec 2021 09:57:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F08AE0855; Thu, 2 Dec 2021 09:57:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C507E07D4 for ; Thu, 2 Dec 2021 09:57:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 570F73430CA for ; Thu, 2 Dec 2021 09:57:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C1C7E201 for ; Thu, 2 Dec 2021 09:57:17 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1638438116.4ad4303ec9ffbaffa02cece5a31790d055af4e6a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sybil/, dev-python/sybil/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/sybil/Manifest dev-python/sybil/files/sybil-2.0.1-py310.patch dev-python/sybil/sybil-2.0.1.ebuild X-VCS-Directories: dev-python/sybil/files/ dev-python/sybil/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4ad4303ec9ffbaffa02cece5a31790d055af4e6a X-VCS-Branch: master Date: Thu, 2 Dec 2021 09:57:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9c8e302f-5be7-45a5-bf02-83a7d28b2a8d X-Archives-Hash: 9384ffc187bd5456a64d852d2ca5ea5c commit: 4ad4303ec9ffbaffa02cece5a31790d055af4e6a Author: Michał Górny gentoo org> AuthorDate: Thu Dec 2 09:41:56 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Dec 2 09:41:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad4303e dev-python/sybil: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/sybil/Manifest | 1 - dev-python/sybil/files/sybil-2.0.1-py310.patch | 94 -------------------------- dev-python/sybil/sybil-2.0.1.ebuild | 21 ------ 3 files changed, 116 deletions(-) diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest index d344d3574395..b9f456145acf 100644 --- a/dev-python/sybil/Manifest +++ b/dev-python/sybil/Manifest @@ -1,2 +1 @@ -DIST sybil-2.0.1.tar.gz 29316 BLAKE2B cf03bc1595efab535d1248b9d267dcd01547f02539977c12b8753e70d13ea0744a6ab76dc1e44fd1c46d192577aa4c1a9b5d5d52678928acfd63937358fa3e33 SHA512 4f3be7686c1acf6812623a756fa79b41e3fbe5d4c3b4c7cf5dfe39fbe56806b4ef3acd24e25968ab9119b2c65ad5c30eabe32f1a93fb62ba8d3893ef123e69f0 DIST sybil-3.0.0.tar.gz 38011 BLAKE2B 7a42d5b0f3f13ac111d9edc9f74cb4d968f49680bb33d267ee762e830b134fa8c2e1697834d6a6a7aa09c9cd1dc52552379ca43e6667ee844f54f34b8bd3ffc7 SHA512 b6f5b5ebdeeab2ecbe17b6f83f0bc7e83e68f8e784b6a0eea292020db42294f8a1d0288d208f8a5803d5866038c3226f0b7d0d177c91469c4651364078d1bb4d diff --git a/dev-python/sybil/files/sybil-2.0.1-py310.patch b/dev-python/sybil/files/sybil-2.0.1-py310.patch deleted file mode 100644 index 15d46bae929b..000000000000 --- a/dev-python/sybil/files/sybil-2.0.1-py310.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 022fe7d654bdeba6db6eb26c0f9434f0882174bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 9 Jun 2021 10:49:33 +0200 -Subject: [PATCH 1/3] tests: adjust for slightly different whitespace under - python3.10 - -'> raise' is now '> raise' (extra space). - -For https://bugzilla.redhat.com/show_bug.cgi?id=1908278. -The tests now pass with python3-3.9.5-2.fc34.x86_64 and -python3-3.10.0~b2-3.fc35.x86_64. ---- - tests/test_functional.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/test_functional.py b/tests/test_functional.py -index f8d41de..5a2e356 100644 ---- a/tests/test_functional.py -+++ b/tests/test_functional.py -@@ -99,14 +99,14 @@ def pytest_sessionfinish(self, session): - 'sybil teardown 4\n' - 'session_fixture teardown') - out.then_find('_ fail.rst line=1 column=1 _') -- out.then_find( "> raise Exception('the start!')") -+ out.then_find( " raise Exception('the start!')") - out.then_find('_ fail.rst line=8 column=1 _') - out.then_find('Y count was 3 instead of 2') - out.then_find('fail.rst:8: SybilFailure') - out.then_find('_ fail.rst line=10 column=1 _') - out.then_find('ValueError: X count was 3 instead of 4') - out.then_find('_ fail.rst line=14 column=1 _') -- out.then_find("> raise Exception('boom!')") -+ out.then_find(" raise Exception('boom!')") - out.then_find('fail.rst:18: Exception') - - - -From 9723fc90f0b1f8f48c1109d501a31309f93add92 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 9 Jun 2021 10:50:06 +0200 -Subject: [PATCH 2/3] tests: adjust for different line numbers under python3.10 - -I think this is related to -https://docs.python.org/3.10/whatsnew/3.10.html#pep-626-precise-line-numbers-for-debugging-and-other-tools - -For https://bugzilla.redhat.com/show_bug.cgi?id=1908278. -The tests now pass with python3-3.9.5-2.fc34.x86_64 and -python3-3.10.0~b2-3.fc35.x86_64. ---- - tests/test_codeblock.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/test_codeblock.py b/tests/test_codeblock.py -index c9f8b17..c30ae3a 100644 ---- a/tests/test_codeblock.py -+++ b/tests/test_codeblock.py -@@ -44,7 +44,7 @@ def test_future_imports(): - ) - # the future import line drops the firstlineno by 1 - code = compile_codeblock(regions[0].parsed, document.path) -- assert code.co_firstlineno == 2 -+ assert code.co_firstlineno in (1, 2) # we get 1 under python3.10 - assert evaluate_region(regions[1], namespace) is None - assert buffer.getvalue() == ( - 'pathalogical worst case for line numbers\n' -@@ -52,7 +52,7 @@ def test_future_imports(): - ) - # the future import line drops the firstlineno by 1 - code = compile_codeblock(regions[1].parsed, document.path) -- assert code.co_firstlineno == 8 -+ assert code.co_firstlineno in (1, 8) # we get 1 under python3.10 - - - def test_windows_line_endings(tmp_path): - -From 11862367a760045cc34c11cf888b04f9ca6f4e2d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 9 Jun 2021 10:51:56 +0200 -Subject: [PATCH 3/3] gitignore: ignore __pycache__ directories - ---- - .gitignore | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/.gitignore b/.gitignore -index ee824be..0afa48a 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -5,4 +5,5 @@ - .coverage* - _build/ - .*cache/ -+__pycache__/ - pytestdebug.log diff --git a/dev-python/sybil/sybil-2.0.1.ebuild b/dev-python/sybil/sybil-2.0.1.ebuild deleted file mode 100644 index 64290a699b51..000000000000 --- a/dev-python/sybil/sybil-2.0.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -DESCRIPTION="Automated testing for the examples in your documentation" -HOMEPAGE="https://github.com/cjw296/sybil" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" - -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}"/${P}-py310.patch -)