forked from pool/python-Twisted
Accepting request 645890 from devel:languages:python
- Version update to 18.9.0: * Fixes for the 3.7 python - Remove merged python37.patch - Add patch openssl111.patch which fixes tests with new pyOpenssl * Asserts changed behaviour - Do not write bytecode stuff when running the tests - Add BuildRequires python-tz, which seems to be required to test suite to pass. - Also, add skip_MultiCast.patch to skip tests requiring full netrworking stack. - Add missing Requires. - Fix the dependencies to match up upstream setup.py - Run the tests - Add patch to build with python3.7: * python37.patch - Add missing dependency on pyamcrest - Remove unused patch lp1102685.diff OBS-URL: https://build.opensuse.org/request/show/645890 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-Twisted?expand=0&rev=31
This commit is contained in:
Git OBS Bridge
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:95ae985716e8107816d8d0df249d558dbaabb677987cc2ace45272c166b267e4
|
||||
size 3063847
|
||||
3
Twisted-18.9.0.tar.bz2
Normal file
3
Twisted-18.9.0.tar.bz2
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395
|
||||
size 3088398
|
||||
@@ -1,34 +0,0 @@
|
||||
=== modified file 'twisted/internet/gireactor.py'
|
||||
Index: Twisted-15.0.0/twisted/internet/gireactor.py
|
||||
===================================================================
|
||||
--- Twisted-15.0.0.orig/twisted/internet/gireactor.py
|
||||
+++ Twisted-15.0.0/twisted/internet/gireactor.py
|
||||
@@ -37,9 +37,12 @@ else:
|
||||
from twisted.python.modules import theSystemPath
|
||||
_pygtkcompatPresent = True
|
||||
try:
|
||||
- theSystemPath["gi.pygtkcompat"]
|
||||
+ theSystemPath["pygtkcompat"]
|
||||
except KeyError:
|
||||
- _pygtkcompatPresent = False
|
||||
+ try:
|
||||
+ theSystemPath["gi.pygtkcompat"]
|
||||
+ except KeyError:
|
||||
+ _pygtkcompatPresent = False
|
||||
|
||||
|
||||
# Modules that we want to ensure aren't imported if we're on older versions of
|
||||
@@ -75,8 +78,11 @@ else:
|
||||
# Newer version of gi, so we can try to initialize compatibility layer; if
|
||||
# real pygtk was already imported we'll get ImportError at this point
|
||||
# rather than segfault, so unconditional import is fine.
|
||||
- import gi.pygtkcompat
|
||||
- gi.pygtkcompat.enable()
|
||||
+ try:
|
||||
+ import pygtkcompat
|
||||
+ except ImportError:
|
||||
+ from gi import pygtkcompat
|
||||
+ pygtkcompat.enable()
|
||||
# At this point importing gobject will get you gi version, and importing
|
||||
# e.g. gtk will either fail in non-segfaulty way or use gi version if user
|
||||
# does gi.pygtkcompat.enable_gtk(). So, no need to prevent imports of
|
||||
42
openssl111.patch
Normal file
42
openssl111.patch
Normal file
@@ -0,0 +1,42 @@
|
||||
Index: Twisted-18.9.0/src/twisted/test/test_sslverify.py
|
||||
===================================================================
|
||||
--- Twisted-18.9.0.orig/src/twisted/test/test_sslverify.py
|
||||
+++ Twisted-18.9.0/src/twisted/test/test_sslverify.py
|
||||
@@ -898,21 +898,6 @@ class OpenSSLOptionsTests(OpenSSLOptions
|
||||
self.assertEqual(opts._cipherString.encode('ascii'), ctx._cipherList)
|
||||
|
||||
|
||||
- def test_givesMeaningfulErrorMessageIfNoCipherMatches(self):
|
||||
- """
|
||||
- If there is no valid cipher that matches the user's wishes,
|
||||
- a L{ValueError} is raised.
|
||||
- """
|
||||
- self.assertRaises(
|
||||
- ValueError,
|
||||
- sslverify.OpenSSLCertificateOptions,
|
||||
- privateKey=self.sKey,
|
||||
- certificate=self.sCert,
|
||||
- acceptableCiphers=
|
||||
- sslverify.OpenSSLAcceptableCiphers.fromOpenSSLCipherString('')
|
||||
- )
|
||||
-
|
||||
-
|
||||
def test_honorsAcceptableCiphersArgument(self):
|
||||
"""
|
||||
If acceptable ciphers are passed, they are used.
|
||||
@@ -2706,15 +2691,6 @@ class ExpandCipherStringTests(unittest.T
|
||||
if skipSSL:
|
||||
skip = skipSSL
|
||||
|
||||
- def test_doesNotStumbleOverEmptyList(self):
|
||||
- """
|
||||
- If the expanded cipher list is empty, an empty L{list} is returned.
|
||||
- """
|
||||
- self.assertEqual(
|
||||
- [],
|
||||
- sslverify._expandCipherString(u'', SSL.SSLv23_METHOD, 0)
|
||||
- )
|
||||
-
|
||||
|
||||
def test_doesNotSwallowOtherSSLErrors(self):
|
||||
"""
|
||||
@@ -1,3 +1,40 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 1 09:21:03 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
- Version update to 18.9.0:
|
||||
* Fixes for the 3.7 python
|
||||
- Remove merged python37.patch
|
||||
- Add patch openssl111.patch which fixes tests with new pyOpenssl
|
||||
* Asserts changed behaviour
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 22 08:48:37 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
- Do not write bytecode stuff when running the tests
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 19 13:27:25 UTC 2018 - Matěj Cepl <mcepl@suse.com>
|
||||
|
||||
- Add BuildRequires python-tz, which seems to be required to test suite
|
||||
to pass.
|
||||
- Also, add skip_MultiCast.patch to skip tests requiring full
|
||||
netrworking stack.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 12 09:06:36 UTC 2018 - ecsos@opensuse.org
|
||||
|
||||
- Add missing Requires.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 11 08:32:44 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
- Fix the dependencies to match up upstream setup.py
|
||||
- Run the tests
|
||||
- Add patch to build with python3.7:
|
||||
* python37.patch
|
||||
- Add missing dependency on pyamcrest
|
||||
- Remove unused patch lp1102685.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 17 19:42:41 UTC 2018 - dmueller@suse.com
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
@@ -20,37 +20,53 @@
|
||||
%define oldpython python
|
||||
%define modname Twisted
|
||||
Name: python-Twisted
|
||||
Version: 18.7.0
|
||||
Version: 18.9.0
|
||||
Release: 0
|
||||
Summary: An asynchronous networking framework written in Python
|
||||
License: MIT
|
||||
Group: Development/Languages/Python
|
||||
Url: http://twistedmatrix.com/
|
||||
URL: http://twistedmatrix.com/
|
||||
Source: https://files.pythonhosted.org/packages/source/T/Twisted/%{modname}-%{version}.tar.bz2
|
||||
# PATCH-FIX-UPSTREAM -- https://twistedmatrix.com/trac/ticket/6280
|
||||
Patch0: lp1102685.diff
|
||||
BuildRequires: %{python_module constantly}
|
||||
Patch1: skip_MultiCast.patch
|
||||
Patch2: openssl111.patch
|
||||
BuildRequires: %{python_module Automat >= 0.3.0}
|
||||
BuildRequires: %{python_module PyHamcrest >= 1.9.0}
|
||||
BuildRequires: %{python_module appdirs >= 1.4.0}
|
||||
BuildRequires: %{python_module attrs >= 17.4.0}
|
||||
BuildRequires: %{python_module constantly >= 15.1}
|
||||
BuildRequires: %{python_module cryptography >= 1.5}
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: %{python_module hyperlink}
|
||||
BuildRequires: %{python_module incremental}
|
||||
BuildRequires: %{python_module pyOpenSSL}
|
||||
BuildRequires: %{python_module h2 >= 3.0}
|
||||
BuildRequires: %{python_module hyperlink >= 17.1.1}
|
||||
BuildRequires: %{python_module idna >= 0.6}
|
||||
BuildRequires: %{python_module incremental >= 16.10.1}
|
||||
BuildRequires: %{python_module pyOpenSSL >= 16.0.0}
|
||||
BuildRequires: %{python_module pyasn1}
|
||||
BuildRequires: %{python_module pyserial >= 3.0}
|
||||
BuildRequires: %{python_module pyserial}
|
||||
BuildRequires: %{python_module pytest}
|
||||
BuildRequires: %{python_module python-subunit}
|
||||
BuildRequires: %{python_module pytz}
|
||||
BuildRequires: %{python_module service_identity}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: %{python_module zope.interface}
|
||||
BuildRequires: %{python_module zope.interface >= 4.4.2}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-rpm-macros
|
||||
Requires: python-Automat >= 0.3.0
|
||||
Requires: python-PyHamcrest >= 1.9.0
|
||||
Requires: python-appdirs >= 1.4.0
|
||||
Requires: python-attrs >= 17.4.0
|
||||
Requires: python-constantly >= 15.1
|
||||
Requires: python-cryptography
|
||||
Requires: python-cryptography >= 1.5
|
||||
Requires: python-h2 >= 3.0
|
||||
Requires: python-hyperlink >= 17.1.1
|
||||
Requires: python-idna >= 0.6
|
||||
Requires: python-incremental >= 16.10.1
|
||||
Requires: python-pyOpenSSL >= 16.0.0
|
||||
Requires: python-pyasn1
|
||||
Requires: python-pyserial >= 3.0
|
||||
Requires: python-service_identity
|
||||
Requires: python-zope.interface >= 4.4.2
|
||||
Recommends: python-service_identity
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%ifpython2
|
||||
Provides: %{oldpython}-twisted = %{version}
|
||||
Obsoletes: %{oldpython}-twisted < %{version}
|
||||
@@ -93,8 +109,7 @@ This package contains the documentation for python-Twisted
|
||||
|
||||
%prep
|
||||
%setup -q -n %{modname}-%{version}
|
||||
#%%patch0 -p1
|
||||
#sed -i "1d" twisted/{mail/test/pop3testserver,trial/test/scripttest}.py
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
%python_build
|
||||
@@ -106,7 +121,7 @@ install -dm0755 %{buildroot}%{_mandir}/man1/
|
||||
install -m0644 docs/*/man/*.1 %{buildroot}%{_mandir}/man1/ # Install man pages
|
||||
find docs -type f -print0 | xargs -0 chmod a-x # Fix doc-file dependency by removing x flags
|
||||
#sed -i "s/\r//" docs/core/howto/listings/udp/{MulticastClient,MulticastServer}.py
|
||||
%fdupes %{buildroot}%{_prefix}
|
||||
%python_expand %fdupes %{buildroot}%{$python_sitearch}
|
||||
|
||||
# Prepare for update-alternatives usage
|
||||
for p in twistd cftp ckeygen conch pyhtmlizer tkconch trial ; do
|
||||
@@ -122,12 +137,16 @@ done
|
||||
# no manpage for twist yet:
|
||||
%python_clone %{buildroot}%{_bindir}/twist
|
||||
|
||||
%check
|
||||
export LANG=en_US.UTF-8
|
||||
export PATH=%{buildroot}%{_bindir}:$PATH
|
||||
export PYTHONDONTWRITEBYTECODE=1
|
||||
%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m twisted.trial twisted
|
||||
|
||||
%files -n %{name}-doc
|
||||
%defattr(-,root,root,-)
|
||||
%doc docs/*
|
||||
|
||||
%files %{python_files}
|
||||
%defattr(-,root,root,-)
|
||||
%license LICENSE
|
||||
%doc NEWS.rst README.rst
|
||||
%{_bindir}/*-%{python_bin_suffix}
|
||||
|
||||
10
skip_MultiCast.patch
Normal file
10
skip_MultiCast.patch
Normal file
@@ -0,0 +1,10 @@
|
||||
--- 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):
|
||||
|
||||
def setUp(self):
|
||||
+ raise unittest.SkipTest("Multicast networking doesn't work with OBS")
|
||||
self.server = Server()
|
||||
self.client = Client()
|
||||
# multicast won't work if we listen over loopback, apparently
|
||||
Reference in New Issue
Block a user