commit: f07ae90446439f161858e0c011e29ab0fa70c332 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Mar 21 22:29:50 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Mar 21 22:42:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f07ae904
dev-python/twisted: Fix tests with incremental-21.3.0 Closes: https://bugs.gentoo.org/774126 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> .../files/twisted-21.2.0-incremental-21.patch | 65 ++++++++++++++++++++++ dev-python/twisted/twisted-21.2.0.ebuild | 7 ++- 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/dev-python/twisted/files/twisted-21.2.0-incremental-21.patch b/dev-python/twisted/files/twisted-21.2.0-incremental-21.patch new file mode 100644 index 00000000000..c726d32cb89 --- /dev/null +++ b/dev-python/twisted/files/twisted-21.2.0-incremental-21.patch @@ -0,0 +1,65 @@ +From ab934c065177422a7121e44c792c56c32962c4e4 Mon Sep 17 00:00:00 2001 +From: Thomas Grainger <[email protected]> +Date: Tue, 2 Mar 2021 11:27:56 +0000 +Subject: [PATCH] update tests for incremental >= 21.3.0 + +--- + pyproject.toml | 2 +- + setup.cfg | 2 +- + src/twisted/python/test/test_versions.py | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index a7d531b003d..ca12b3ef7e0 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -2,7 +2,7 @@ + requires = [ + "setuptools >= 35.0.2", + "wheel >= 0.29.0", +- "incremental >= 16.10.1", ++ "incremental >= 21.3.0", + ] + build-backend = "setuptools.build_meta" + +diff --git a/setup.cfg b/setup.cfg +index 17501b91ecf..07094f7ea6b 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -28,7 +28,7 @@ python_requires = >=3.6.7 + install_requires = + zope.interface >= 4.4.2 + constantly >= 15.1 +- incremental >= 16.10.1 ++ incremental >= 21.3.0 + Automat >= 0.8.0 + hyperlink >= 17.1.1 + attrs >= 19.2.0 +diff --git a/src/twisted/python/test/test_versions.py b/src/twisted/python/test/test_versions.py +index 022010a6eec..6707169b1f8 100644 +--- a/src/twisted/python/test/test_versions.py ++++ b/src/twisted/python/test/test_versions.py +@@ -126,7 +126,7 @@ def test_strWithPrerelease(self): + Calling C{str} on a version with a prerelease includes the prerelease. + """ + self.assertEqual( +- str(Version("dummy", 1, 0, 0, prerelease=1)), "[dummy, version 1.0.0rc1]" ++ str(Version("dummy", 1, 0, 0, prerelease=1)), "[dummy, version 1.0.0.rc1]" + ) + + def testShort(self): +@@ -145,7 +145,7 @@ def test_getVersionStringWithPrerelease(self): + """ + self.assertEqual( + getVersionString(Version("whatever", 8, 0, 0, prerelease=1)), +- "whatever 8.0.0rc1", ++ "whatever 8.0.0.rc1", + ) + + def test_base(self): +@@ -158,4 +158,4 @@ def test_baseWithPrerelease(self): + """ + The base version includes 'preX' for versions with prereleases. + """ +- self.assertEqual(Version("foo", 1, 0, 0, prerelease=8).base(), "1.0.0rc8") ++ self.assertEqual(Version("foo", 1, 0, 0, prerelease=8).base(), "1.0.0.rc8") diff --git a/dev-python/twisted/twisted-21.2.0.ebuild b/dev-python/twisted/twisted-21.2.0.ebuild index 6fdafa97f65..eec2177e7cb 100644 --- a/dev-python/twisted/twisted-21.2.0.ebuild +++ b/dev-python/twisted/twisted-21.2.0.ebuild @@ -14,6 +14,7 @@ HOMEPAGE="https://www.twistedmatrix.com/trac/"; SRC_URI=" https://github.com/twisted/twisted/archive/${P}.tar.gz https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"; +S=${WORKDIR}/${PN}-${P} LICENSE="MIT" SLOT="0" @@ -59,7 +60,7 @@ RDEPEND=" !dev-python/twisted-web " BDEPEND=" - >=dev-python/incremental-16.10.1[${PYTHON_USEDEP}] + >=dev-python/incremental-21.3.0[${PYTHON_USEDEP}] test? ( >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] dev-python/bcrypt[${PYTHON_USEDEP}] @@ -76,9 +77,9 @@ BDEPEND=" ) " -S=${WORKDIR}/${PN}-${P} - python_prepare_all() { + eapply "${FILESDIR}"/${P}-incremental-21.patch + # upstream test for making releases; not very useful and requires # sphinx (including on py2) rm src/twisted/python/test/test_release.py || die
