Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sybil/files/, dev-python/sybil/
Date: Thu, 31 Mar 2022 14:08:33
Message-Id: 1648735519.dab13bdbda7c938bd71682d68cd9a99984285cf1.mgorny@gentoo
1 commit: dab13bdbda7c938bd71682d68cd9a99984285cf1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 31 14:05:19 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 31 14:05:19 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab13bdb
7
8 dev-python/sybil: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/sybil/Manifest | 1 -
13 .../sybil/files/sybil-3.0.0-test-order.patch | 45 ----------------------
14 dev-python/sybil/sybil-3.0.0.ebuild | 21 ----------
15 3 files changed, 67 deletions(-)
16
17 diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
18 index 7eb33000d04d..df143e6c4dbb 100644
19 --- a/dev-python/sybil/Manifest
20 +++ b/dev-python/sybil/Manifest
21 @@ -1,2 +1 @@
22 -DIST sybil-3.0.0.tar.gz 38011 BLAKE2B 7a42d5b0f3f13ac111d9edc9f74cb4d968f49680bb33d267ee762e830b134fa8c2e1697834d6a6a7aa09c9cd1dc52552379ca43e6667ee844f54f34b8bd3ffc7 SHA512 b6f5b5ebdeeab2ecbe17b6f83f0bc7e83e68f8e784b6a0eea292020db42294f8a1d0288d208f8a5803d5866038c3226f0b7d0d177c91469c4651364078d1bb4d
23 DIST sybil-3.0.1.tar.gz 38265 BLAKE2B 3a9dd8d85a5a6228944f104d255826b4dfee80f5a349da3a0fa69edcfa0953145378f002c1bf834e21c0d382fc96a993b927bdc92bb3e9a84d34998ad6ade62f SHA512 312c57f0de646b1e7a3b992806362c1020b2d567c805d248e94ab22a336a8fc77704234e123e1ec74987bfea620b2f8c4d3714d32aee03587c615d3d90fe5558
24
25 diff --git a/dev-python/sybil/files/sybil-3.0.0-test-order.patch b/dev-python/sybil/files/sybil-3.0.0-test-order.patch
26 deleted file mode 100644
27 index 1badf5b06a19..000000000000
28 --- a/dev-python/sybil/files/sybil-3.0.0-test-order.patch
29 +++ /dev/null
30 @@ -1,45 +0,0 @@
31 -From 4d1e1c891bd619a0dec0a265a930bf49050833d1 Mon Sep 17 00:00:00 2001
32 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
33 -Date: Wed, 27 Oct 2021 13:07:01 +0200
34 -Subject: [PATCH] Restore sorting of test paths to make tests reliable again
35 -
36 -11496eb5761761b687ad4889b4173d3124caa844 has replaced the all_documents
37 -method with a direct call to glob. This has implicitly resulted
38 -in removal of path sorting that in turn means that the test output
39 -depends on filesystem order now and is no longer reliable.
40 -In particular, the tests can now fail randomly depending
41 -on the underlying filesystem, unpack/checkout order, etc. Restore
42 -explicit sorting to make test order predictable again.
43 -
44 -Fixes #34
45 ----
46 - sybil/integration/unittest.py | 2 +-
47 - tests/test_sybil.py | 2 +-
48 - 2 files changed, 2 insertions(+), 2 deletions(-)
49 -
50 -diff --git a/sybil/integration/unittest.py b/sybil/integration/unittest.py
51 -index 7129ddf..ce34caf 100644
52 ---- a/sybil/integration/unittest.py
53 -+++ b/sybil/integration/unittest.py
54 -@@ -38,7 +38,7 @@ def unittest_integration(sybil: 'Sybil'):
55 -
56 - def load_tests(loader=None, tests=None, pattern=None):
57 - suite = TestSuite()
58 -- for path in sybil.path.glob('**/*'):
59 -+ for path in sorted(sybil.path.glob('**/*')):
60 - if path.is_file() and sybil.should_parse(path):
61 - document = sybil.parse(path)
62 -
63 -diff --git a/tests/test_sybil.py b/tests/test_sybil.py
64 -index 74a04ea..72a5aea 100644
65 ---- a/tests/test_sybil.py
66 -+++ b/tests/test_sybil.py
67 -@@ -243,7 +243,7 @@ def parse(document):
68 -
69 - def test_namespace(capsys):
70 - sybil = Sybil([parse], path='./samples')
71 -- documents = [sybil.parse(p) for p in sybil.path.glob('sample*.txt')]
72 -+ documents = [sybil.parse(p) for p in sorted(sybil.path.glob('sample*.txt'))]
73 - actual = []
74 - for document in documents:
75 - for example in document:
76
77 diff --git a/dev-python/sybil/sybil-3.0.0.ebuild b/dev-python/sybil/sybil-3.0.0.ebuild
78 deleted file mode 100644
79 index 0b0c9f2b1cfe..000000000000
80 --- a/dev-python/sybil/sybil-3.0.0.ebuild
81 +++ /dev/null
82 @@ -1,21 +0,0 @@
83 -# Copyright 2019-2021 Gentoo Authors
84 -# Distributed under the terms of the GNU General Public License v2
85 -
86 -EAPI=8
87 -
88 -PYTHON_COMPAT=( python3_{8..10} )
89 -inherit distutils-r1
90 -
91 -DESCRIPTION="Automated testing for the examples in your documentation"
92 -HOMEPAGE="https://github.com/simplistix/sybil"
93 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
94 -
95 -LICENSE="MIT"
96 -SLOT="0"
97 -KEYWORDS="amd64 ~arm arm64 ~riscv x86"
98 -
99 -distutils_enable_tests pytest
100 -
101 -PATCHES=(
102 - "${FILESDIR}"/${P}-test-order.patch
103 -)