diff --git a/incremental-21.patch b/incremental-21.patch new file mode 100644 index 0000000..0cfe85c --- /dev/null +++ b/incremental-21.patch @@ -0,0 +1,65 @@ +From ab934c065177422a7121e44c792c56c32962c4e4 Mon Sep 17 00:00:00 2001 +From: Thomas Grainger +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(-) + +Index: Twisted-21.2.0/pyproject.toml +=================================================================== +--- Twisted-21.2.0.orig/pyproject.toml ++++ Twisted-21.2.0/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" + +Index: Twisted-21.2.0/setup.cfg +=================================================================== +--- Twisted-21.2.0.orig/setup.cfg ++++ Twisted-21.2.0/setup.cfg +@@ -28,7 +28,7 @@ python_requires = >=3.5.4 + 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 +Index: Twisted-21.2.0/src/twisted/python/test/test_versions.py +=================================================================== +--- Twisted-21.2.0.orig/src/twisted/python/test/test_versions.py ++++ Twisted-21.2.0/src/twisted/python/test/test_versions.py +@@ -126,7 +126,7 @@ class VersionsTests(TestCase): + 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 @@ class VersionsTests(TestCase): + """ + 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 @@ class VersionsTests(TestCase): + """ + 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/python-Twisted.changes b/python-Twisted.changes index 5f49221..4ddc8d4 100644 --- a/python-Twisted.changes +++ b/python-Twisted.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 17 10:15:13 UTC 2021 - Dirk Müller + +- add incremental-21.patch: support newer incremental versions + ------------------------------------------------------------------- Wed Mar 10 06:11:42 UTC 2021 - Steve Kowalik diff --git a/python-Twisted.spec b/python-Twisted.spec index 14e3b71..320e84f 100644 --- a/python-Twisted.spec +++ b/python-Twisted.spec @@ -36,6 +36,8 @@ Patch2: no-test_successResultOfWithFailureHasTraceback.patch Patch3: 1521_delegate_parseqs_stdlib_bpo42967.patch # We don't want to package yet another module, and it is easily skippable Patch4: no-cython_test_exception_raiser.patch +# PATCH-FIX-UPSTREAM incremental-21.patch https://github.com/twisted/twisted/commit/ab934c065177422a7121e44c792c56c32962c4e4.patch +Patch5: incremental-21.patch BuildRequires: %{python_module Automat >= 0.8.0} BuildRequires: %{python_module PyHamcrest >= 1.9.0} BuildRequires: %{python_module appdirs >= 1.4.0} @@ -47,7 +49,7 @@ BuildRequires: %{python_module devel} BuildRequires: %{python_module h2 >= 3.0} BuildRequires: %{python_module hyperlink >= 17.1.1} BuildRequires: %{python_module idna >= 2.4} -BuildRequires: %{python_module incremental >= 16.10.1} +BuildRequires: %{python_module incremental >= 21.3.0} BuildRequires: %{python_module pyOpenSSL >= 16.0.0} BuildRequires: %{python_module pyasn1} BuildRequires: %{python_module pyserial >= 3.0} @@ -71,7 +73,7 @@ Requires: python-cryptography >= 2.6 Requires: python-h2 >= 3.0 Requires: python-hyperlink >= 17.1.1 Requires: python-idna >= 2.4 -Requires: python-incremental >= 16.10.1 +Requires: python-incremental >= 21.3.0 Requires: python-pyOpenSSL >= 16.0.0 Requires: python-pyasn1 Requires: python-pyserial >= 3.0