* [gentoo-commits] repo/gentoo:master commit in: dev-python/sybil/files/, dev-python/sybil/
@ 2021-10-28 7:00 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2021-10-28 7:00 UTC (permalink / raw
To: gentoo-commits
commit: 479fece57e01e18cb98af01545a4bf2d299cfe5a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 28 05:19:06 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 28 07:00:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=479fece5
dev-python/sybil: Bump to 3.0.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/sybil/Manifest | 1 +
.../sybil/files/sybil-3.0.0-test-order.patch | 45 ++++++++++++++++++++++
dev-python/sybil/metadata.xml | 2 +-
dev-python/sybil/sybil-3.0.0.ebuild | 21 ++++++++++
4 files changed, 68 insertions(+), 1 deletion(-)
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index c7aaeb7e183..d344d357439 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1 +1,2 @@
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-3.0.0-test-order.patch b/dev-python/sybil/files/sybil-3.0.0-test-order.patch
new file mode 100644
index 00000000000..1badf5b06a1
--- /dev/null
+++ b/dev-python/sybil/files/sybil-3.0.0-test-order.patch
@@ -0,0 +1,45 @@
+From 4d1e1c891bd619a0dec0a265a930bf49050833d1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 27 Oct 2021 13:07:01 +0200
+Subject: [PATCH] Restore sorting of test paths to make tests reliable again
+
+11496eb5761761b687ad4889b4173d3124caa844 has replaced the all_documents
+method with a direct call to glob. This has implicitly resulted
+in removal of path sorting that in turn means that the test output
+depends on filesystem order now and is no longer reliable.
+In particular, the tests can now fail randomly depending
+on the underlying filesystem, unpack/checkout order, etc. Restore
+explicit sorting to make test order predictable again.
+
+Fixes #34
+---
+ sybil/integration/unittest.py | 2 +-
+ tests/test_sybil.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sybil/integration/unittest.py b/sybil/integration/unittest.py
+index 7129ddf..ce34caf 100644
+--- a/sybil/integration/unittest.py
++++ b/sybil/integration/unittest.py
+@@ -38,7 +38,7 @@ def unittest_integration(sybil: 'Sybil'):
+
+ def load_tests(loader=None, tests=None, pattern=None):
+ suite = TestSuite()
+- for path in sybil.path.glob('**/*'):
++ for path in sorted(sybil.path.glob('**/*')):
+ if path.is_file() and sybil.should_parse(path):
+ document = sybil.parse(path)
+
+diff --git a/tests/test_sybil.py b/tests/test_sybil.py
+index 74a04ea..72a5aea 100644
+--- a/tests/test_sybil.py
++++ b/tests/test_sybil.py
+@@ -243,7 +243,7 @@ def parse(document):
+
+ def test_namespace(capsys):
+ sybil = Sybil([parse], path='./samples')
+- documents = [sybil.parse(p) for p in sybil.path.glob('sample*.txt')]
++ documents = [sybil.parse(p) for p in sorted(sybil.path.glob('sample*.txt'))]
+ actual = []
+ for document in documents:
+ for example in document:
diff --git a/dev-python/sybil/metadata.xml b/dev-python/sybil/metadata.xml
index 24dad470d82..aba09c67223 100644
--- a/dev-python/sybil/metadata.xml
+++ b/dev-python/sybil/metadata.xml
@@ -8,6 +8,6 @@
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">sybil</remote-id>
- <remote-id type="github">cjw296/sybil</remote-id>
+ <remote-id type="github">simplistix/sybil</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-python/sybil/sybil-3.0.0.ebuild b/dev-python/sybil/sybil-3.0.0.ebuild
new file mode 100644
index 00000000000..5ac40aac71e
--- /dev/null
+++ b/dev-python/sybil/sybil-3.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Automated testing for the examples in your documentation"
+HOMEPAGE="https://github.com/simplistix/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}-test-order.patch
+)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/sybil/files/, dev-python/sybil/
@ 2022-03-31 14:08 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2022-03-31 14:08 UTC (permalink / raw
To: gentoo-commits
commit: dab13bdbda7c938bd71682d68cd9a99984285cf1
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 14:05:19 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 14:05:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab13bdb
dev-python/sybil: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/sybil/Manifest | 1 -
.../sybil/files/sybil-3.0.0-test-order.patch | 45 ----------------------
dev-python/sybil/sybil-3.0.0.ebuild | 21 ----------
3 files changed, 67 deletions(-)
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 7eb33000d04d..df143e6c4dbb 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,2 +1 @@
-DIST sybil-3.0.0.tar.gz 38011 BLAKE2B 7a42d5b0f3f13ac111d9edc9f74cb4d968f49680bb33d267ee762e830b134fa8c2e1697834d6a6a7aa09c9cd1dc52552379ca43e6667ee844f54f34b8bd3ffc7 SHA512 b6f5b5ebdeeab2ecbe17b6f83f0bc7e83e68f8e784b6a0eea292020db42294f8a1d0288d208f8a5803d5866038c3226f0b7d0d177c91469c4651364078d1bb4d
DIST sybil-3.0.1.tar.gz 38265 BLAKE2B 3a9dd8d85a5a6228944f104d255826b4dfee80f5a349da3a0fa69edcfa0953145378f002c1bf834e21c0d382fc96a993b927bdc92bb3e9a84d34998ad6ade62f SHA512 312c57f0de646b1e7a3b992806362c1020b2d567c805d248e94ab22a336a8fc77704234e123e1ec74987bfea620b2f8c4d3714d32aee03587c615d3d90fe5558
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
deleted file mode 100644
index 1badf5b06a19..000000000000
--- a/dev-python/sybil/files/sybil-3.0.0-test-order.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4d1e1c891bd619a0dec0a265a930bf49050833d1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 27 Oct 2021 13:07:01 +0200
-Subject: [PATCH] Restore sorting of test paths to make tests reliable again
-
-11496eb5761761b687ad4889b4173d3124caa844 has replaced the all_documents
-method with a direct call to glob. This has implicitly resulted
-in removal of path sorting that in turn means that the test output
-depends on filesystem order now and is no longer reliable.
-In particular, the tests can now fail randomly depending
-on the underlying filesystem, unpack/checkout order, etc. Restore
-explicit sorting to make test order predictable again.
-
-Fixes #34
----
- sybil/integration/unittest.py | 2 +-
- tests/test_sybil.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sybil/integration/unittest.py b/sybil/integration/unittest.py
-index 7129ddf..ce34caf 100644
---- a/sybil/integration/unittest.py
-+++ b/sybil/integration/unittest.py
-@@ -38,7 +38,7 @@ def unittest_integration(sybil: 'Sybil'):
-
- def load_tests(loader=None, tests=None, pattern=None):
- suite = TestSuite()
-- for path in sybil.path.glob('**/*'):
-+ for path in sorted(sybil.path.glob('**/*')):
- if path.is_file() and sybil.should_parse(path):
- document = sybil.parse(path)
-
-diff --git a/tests/test_sybil.py b/tests/test_sybil.py
-index 74a04ea..72a5aea 100644
---- a/tests/test_sybil.py
-+++ b/tests/test_sybil.py
-@@ -243,7 +243,7 @@ def parse(document):
-
- def test_namespace(capsys):
- sybil = Sybil([parse], path='./samples')
-- documents = [sybil.parse(p) for p in sybil.path.glob('sample*.txt')]
-+ documents = [sybil.parse(p) for p in sorted(sybil.path.glob('sample*.txt'))]
- actual = []
- for document in documents:
- for example in document:
diff --git a/dev-python/sybil/sybil-3.0.0.ebuild b/dev-python/sybil/sybil-3.0.0.ebuild
deleted file mode 100644
index 0b0c9f2b1cfe..000000000000
--- a/dev-python/sybil/sybil-3.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="https://github.com/simplistix/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}-test-order.patch
-)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/sybil/files/, dev-python/sybil/
@ 2024-02-18 3:28 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2024-02-18 3:28 UTC (permalink / raw
To: gentoo-commits
commit: 614e42e269e9236f5a75c23533aaaaceb7bdea64
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 02:42:07 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 02:42:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=614e42e2
dev-python/sybil: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/sybil/Manifest | 1 -
dev-python/sybil/files/sybil-6.0.2-pytest-8.patch | 40 ---------------------
dev-python/sybil/sybil-6.0.2-r1.ebuild | 44 -----------------------
3 files changed, 85 deletions(-)
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 8ccec810aac4..6334c9906f97 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,2 +1 @@
-DIST sybil-6.0.2.gh.tar.gz 67619 BLAKE2B ec723cb21d2ac1232bd6e9a3e3edb0bc65c705048c2d288df778b4dd19a1b46c956f7d2bd57dfa028d7a8a06357501ffc1226ba171e2073abec51f8d3c536d86 SHA512 9966173b5fb013be1f298b586052d8c10b76efb43bf5230f3d0b780e6d6238e7e33840eeb7c8b9860911351ea612766ed19ea2a61d48424465f3b58e408da5d2
DIST sybil-6.0.3.gh.tar.gz 67772 BLAKE2B e90b7a01373d931ca056bfce1336bab8a579a25e17000675d77cd849081275970b455c7bc77f30e0fd104073115915fc4f4477b010eafd35e57aec322fb42fc4 SHA512 1fb42b944b237556012ace6fcc5eb3d0f067f0ca043ceafa0e201a8076870fc7e06ae62813eec90d486de6e4b71ebf29176dfff6573de423480c688ff005004d
diff --git a/dev-python/sybil/files/sybil-6.0.2-pytest-8.patch b/dev-python/sybil/files/sybil-6.0.2-pytest-8.patch
deleted file mode 100644
index 2447289c0266..000000000000
--- a/dev-python/sybil/files/sybil-6.0.2-pytest-8.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d7428b4cfe5f817037030d025028bf09fd7992ee Mon Sep 17 00:00:00 2001
-From: Adam Dangoor <adamdangoor@gmail.com>
-Date: Mon, 29 Jan 2024 11:29:16 +0000
-Subject: [PATCH] Add fixes for Pytest 8.0.0
-
----
- CHANGELOG.rst | 5 +++++
- sybil/integration/pytest.py | 17 +++++++++++++----
- 2 files changed, 18 insertions(+), 4 deletions(-)
-
-diff --git a/sybil/integration/pytest.py b/sybil/integration/pytest.py
-index 8ce6c72..cad311d 100644
---- a/sybil/integration/pytest.py
-+++ b/sybil/integration/pytest.py
-@@ -53,12 +53,21 @@ def __init__(self, parent, sybil, example: Example) -> None:
- def request_fixtures(self, names):
- # pytest fixtures dance:
- fm = self.session._fixturemanager
-- closure = fm.getfixtureclosure(names, self)
-- initialnames, names_closure, arg2fixturedefs = closure
-- fixtureinfo = FuncFixtureInfo(names, initialnames, names_closure, arg2fixturedefs)
-+ if PYTEST_VERSION >= (8, 0, 0):
-+ closure = fm.getfixtureclosure(initialnames=names, parentnode=self, ignore_args=set())
-+ names_closure, arg2fixturedefs = closure
-+ fixtureinfo = FuncFixtureInfo(argnames=names, initialnames=names, names_closure=names_closure, name2fixturedefs=arg2fixturedefs)
-+ else:
-+ closure = fm.getfixtureclosure(names, self)
-+ initialnames, names_closure, arg2fixturedefs = closure
-+ fixtureinfo = FuncFixtureInfo(names, initialnames, names_closure, arg2fixturedefs)
- self._fixtureinfo = fixtureinfo
- self.funcargs = {}
-- self._request = fixtures.FixtureRequest(self, _ispytest=True)
-+ if PYTEST_VERSION >= (8, 0, 0):
-+ self._request = fixtures.TopRequest(pyfuncitem=self, _ispytest=True)
-+ self.fixturenames = names_closure
-+ else:
-+ self._request = fixtures.FixtureRequest(self, _ispytest=True)
-
- def reportinfo(self) -> Tuple[Union["os.PathLike[str]", str], Optional[int], str]:
- info = '%s line=%i column=%i' % (
diff --git a/dev-python/sybil/sybil-6.0.2-r1.ebuild b/dev-python/sybil/sybil-6.0.2-r1.ebuild
deleted file mode 100644
index 0a280c114202..000000000000
--- a/dev-python/sybil/sybil-6.0.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="
- https://github.com/simplistix/sybil/
- https://pypi.org/project/sybil/
-"
-# tests are missing in sdist, as of 5.0.1
-SRC_URI="
- https://github.com/simplistix/sybil/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-BDEPEND="
- test? (
- dev-python/myst-parser[${PYTHON_USEDEP}]
- dev-python/seedir[${PYTHON_USEDEP}]
- dev-python/testfixtures[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- # https://github.com/simplistix/sybil/pull/108
- "${FILESDIR}/${P}-pytest-8.patch"
-)
-
-python_test() {
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- epytest
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-02-18 3:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-31 14:08 [gentoo-commits] repo/gentoo:master commit in: dev-python/sybil/files/, dev-python/sybil/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-02-18 3:28 Michał Górny
2021-10-28 7:00 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox