From 2001e758bb78c5c0c83af1bbc0147cc9d444d4ffbf0f5b5d5715c89f37978810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 13 Sep 2019 14:37:19 +0000 Subject: [PATCH 1/2] - Update to 19.7.0: * The callable argument to twisted.internet.task.deferLater() is no longer required. (#9577) * twisted.internet.utils.getProcessOutputAndValue now accepts stdinBytes to write to the child process's standard input. (#9607) * Add new twisted.logger.capturedLogs context manager for capturing observed log events in tests. (#9617) * twisted.internet.base.PluggableResolverMixin, which implements the pluggable resolver interfaces for easier re-use in other reactors, has been factored out of ReactorBase. (#9632) * The PyPI page for Twisted has been enhanced to include more information and useful links. (#9648) - Refresh patch: * skip_MultiCast.patch - Remove merged patch hyperlink.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Twisted?expand=0&rev=82 --- Twisted-19.2.1.tar.bz2 | 3 --- Twisted-19.7.0.tar.bz2 | 3 +++ hyperlink.patch | 36 ------------------------------------ python-Twisted.changes | 13 +++++++++++++ python-Twisted.spec | 3 +-- skip_MultiCast.patch | 10 ++++++---- 6 files changed, 23 insertions(+), 45 deletions(-) delete mode 100644 Twisted-19.2.1.tar.bz2 create mode 100644 Twisted-19.7.0.tar.bz2 delete mode 100644 hyperlink.patch diff --git a/Twisted-19.2.1.tar.bz2 b/Twisted-19.2.1.tar.bz2 deleted file mode 100644 index 144b6f0..0000000 --- a/Twisted-19.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa2c04c2d68a9be7fc3975ba4947f653a57a656776f24be58ff0fe4b9aaf3e52 -size 3097651 diff --git a/Twisted-19.7.0.tar.bz2 b/Twisted-19.7.0.tar.bz2 new file mode 100644 index 0000000..5abe6db --- /dev/null +++ b/Twisted-19.7.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5db93026568f60cacdc0615fcd21d46f694a6bfad0ef3ff53cde2b4bb85a39d +size 3092680 diff --git a/hyperlink.patch b/hyperlink.patch deleted file mode 100644 index 1600ecf..0000000 --- a/hyperlink.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 46fc370d6b49a241fb05815ccdc7406f0e430183 Mon Sep 17 00:00:00 2001 -From: Tom Most -Date: Mon, 8 Apr 2019 22:38:23 -0700 -Subject: [PATCH] Remove test_parseEqualSignInParamValue - -Twisted should not test Hyperlink's behavior so extensively, as -discussed at https://github.com/python-hyper/hyperlink/pull/39 ---- - src/twisted/python/test/test_url.py | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/src/twisted/python/test/test_url.py b/src/twisted/python/test/test_url.py -index e36c2ca01b..7d55f10fd1 100644 ---- a/src/twisted/python/test/test_url.py -+++ b/src/twisted/python/test/test_url.py -@@ -476,20 +476,6 @@ def test_queryRemove(self): - ) - - -- def test_parseEqualSignInParamValue(self): -- """ -- Every C{=}-sign after the first in a query parameter is simply included -- in the value of the parameter. -- """ -- u = URL.fromText('http://localhost/?=x=x=x') -- self.assertEqual(u.get(u''), ['x=x=x']) -- self.assertEqual(u.asText(), 'http://localhost/?=x%3Dx%3Dx') -- u = URL.fromText('http://localhost/?foo=x=x=x&bar=y') -- self.assertEqual(u.query, (('foo', 'x=x=x'), -- ('bar', 'y'))) -- self.assertEqual(u.asText(), 'http://localhost/?foo=x%3Dx%3Dx&bar=y') -- -- - def test_empty(self): - """ - An empty L{URL} should serialize as the empty string. diff --git a/python-Twisted.changes b/python-Twisted.changes index d91ede7..bd1673c 100644 --- a/python-Twisted.changes +++ b/python-Twisted.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Sep 13 13:09:16 UTC 2019 - Tomáš Chvátal + +- Update to 19.7.0: + * The callable argument to twisted.internet.task.deferLater() is no longer required. (#9577) + * twisted.internet.utils.getProcessOutputAndValue now accepts stdinBytes to write to the child process's standard input. (#9607) + * Add new twisted.logger.capturedLogs context manager for capturing observed log events in tests. (#9617) + * twisted.internet.base.PluggableResolverMixin, which implements the pluggable resolver interfaces for easier re-use in other reactors, has been factored out of ReactorBase. (#9632) + * The PyPI page for Twisted has been enhanced to include more information and useful links. (#9648) +- Refresh patch: + * skip_MultiCast.patch +- Remove merged patch hyperlink.patch + ------------------------------------------------------------------- Wed Jun 12 05:55:44 UTC 2019 - Thomas Bechtold diff --git a/python-Twisted.spec b/python-Twisted.spec index 143400c..397dc38 100644 --- a/python-Twisted.spec +++ b/python-Twisted.spec @@ -20,7 +20,7 @@ %define oldpython python %define modname Twisted Name: python-Twisted -Version: 19.2.1 +Version: 19.7.0 Release: 0 Summary: An asynchronous networking framework written in Python License: MIT @@ -30,7 +30,6 @@ Source: https://files.pythonhosted.org/packages/source/T/Twisted/%{modna Patch1: skip_MultiCast.patch Patch2: no-pygtkcompat.patch Patch3: test-mktime-invalid-tm_isdst.patch -Patch4: hyperlink.patch BuildRequires: %{python_module Automat >= 0.3.0} BuildRequires: %{python_module PyHamcrest >= 1.9.0} BuildRequires: %{python_module appdirs >= 1.4.0} diff --git a/skip_MultiCast.patch b/skip_MultiCast.patch index b4fc9ab..438afe4 100644 --- a/skip_MultiCast.patch +++ b/skip_MultiCast.patch @@ -1,7 +1,9 @@ ---- a/src/twisted/test/test_udp.py -+++ b/src/twisted/test/test_udp.py -@@ -503,6 +503,7 @@ class ReactorShutdownInteractionTests(un - class MulticastTests(unittest.TestCase): +Index: Twisted-19.7.0/src/twisted/test/test_udp.py +=================================================================== +--- Twisted-19.7.0.orig/src/twisted/test/test_udp.py ++++ Twisted-19.7.0/src/twisted/test/test_udp.py +@@ -514,6 +514,7 @@ class MulticastTests(unittest.TestCase): + skip = "Does not work on Azure Pipelines" def setUp(self): + raise unittest.SkipTest("Multicast networking doesn't work with OBS") From 4b4c81e79c50498dbca1565b053aac0c9d05df8a6e40c21ec6a38362756009e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 16 Sep 2019 07:36:25 +0000 Subject: [PATCH 2/2] Accepting request 730984 from home:jayvdb:py3only - Remove mailmail when only building Python 3 flavour OBS-URL: https://build.opensuse.org/request/show/730984 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Twisted?expand=0&rev=83 --- python-Twisted.changes | 5 +++++ python-Twisted.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/python-Twisted.changes b/python-Twisted.changes index bd1673c..67d1ab6 100644 --- a/python-Twisted.changes +++ b/python-Twisted.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Sep 14 15:29:06 UTC 2019 - John Vandenberg + +- Remove mailmail when only building Python 3 flavour + ------------------------------------------------------------------- Fri Sep 13 13:09:16 UTC 2019 - Tomáš Chvátal diff --git a/python-Twisted.spec b/python-Twisted.spec index 397dc38..4dfaf26 100644 --- a/python-Twisted.spec +++ b/python-Twisted.spec @@ -137,6 +137,10 @@ done %python_clone %{buildroot}%{_bindir}/mailmail %python_clone %{buildroot}%{_mandir}/man1/mailmail.1 %endif +%if ! 0%{?have_python2} || 0%{?skip_python2} +rm %{buildroot}%{_bindir}/mailmail %{buildroot}%{_mandir}/man1/mailmail.1 +%endif + # no manpage for twist yet: %python_clone %{buildroot}%{_bindir}/twist