forked from pool/python-eventlet
Accepting request 880422 from home:bnavigator:branches:devel:languages:python
- Update to 0.30.2 * greendns: patch ssl to fix RecursionError on SSLContext.options.__set__ #677 - Release 0.30.1 * patcher: built-in open() did not accept kwargs #683 - Release 0.30.0 * pyopenssl tsafe module was deprecated and removed in v20.0.0 * deprecate pyevent hub * Deprecate CPython 2.7 and 3.4 support * py39: Add _at_fork_reinit method to Semaphores - Drop pr_672-remove-OpenSSL-tsafe.patch merged upstream OBS-URL: https://build.opensuse.org/request/show/880422 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-eventlet?expand=0&rev=80
This commit is contained in:
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9faff63631b01277c463ae91cd4ab3f25a2f0f5abe3219d43a386ef1daa6159a
|
||||
size 400673
|
3
eventlet-0.30.2.tar.gz
Normal file
3
eventlet-0.30.2.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1811b122d9a45eb5bafba092d36911bca825f835cb648a862bbf984030acff9d
|
||||
size 401552
|
@@ -1,37 +0,0 @@
|
||||
From be0d520c9bc9e3b3959f84d80c65e418e6081887 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Shepelev <temotor@gmail.com>
|
||||
Date: Wed, 2 Dec 2020 01:10:02 +0300
|
||||
Subject: [PATCH] pyopenssl tsafe module was deprecated and removed in v20.0.0
|
||||
|
||||
https://github.com/eventlet/eventlet/issues/671
|
||||
https://github.com/pyca/pyopenssl/pull/913
|
||||
---
|
||||
eventlet/green/OpenSSL/__init__.py | 7 ++++++-
|
||||
tests/openssl_test.py | 1 -
|
||||
4 files changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/eventlet/green/OpenSSL/__init__.py b/eventlet/green/OpenSSL/__init__.py
|
||||
index d86147645..1b2500971 100644
|
||||
--- a/eventlet/green/OpenSSL/__init__.py
|
||||
+++ b/eventlet/green/OpenSSL/__init__.py
|
||||
@@ -1,4 +1,9 @@
|
||||
from . import crypto
|
||||
from . import SSL
|
||||
-from . import tsafe
|
||||
+try:
|
||||
+ # pyopenssl tsafe module was deprecated and removed in v20.0.0
|
||||
+ # https://github.com/pyca/pyopenssl/pull/913
|
||||
+ from . import tsafe
|
||||
+except ImportError:
|
||||
+ pass
|
||||
from .version import __version__
|
||||
diff --git a/tests/openssl_test.py b/tests/openssl_test.py
|
||||
index a127408b8..1108adaf6 100644
|
||||
--- a/tests/openssl_test.py
|
||||
+++ b/tests/openssl_test.py
|
||||
@@ -12,5 +12,4 @@ def test_import():
|
||||
|
||||
import eventlet.green.OpenSSL.SSL
|
||||
import eventlet.green.OpenSSL.crypto
|
||||
- import eventlet.green.OpenSSL.tsafe
|
||||
import eventlet.green.OpenSSL.version
|
@@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 21 21:19:52 UTC 2021 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
- Update to 0.30.2
|
||||
* greendns: patch ssl to fix RecursionError on
|
||||
SSLContext.options.__set__ #677
|
||||
- Release 0.30.1
|
||||
* patcher: built-in open() did not accept kwargs #683
|
||||
- Release 0.30.0
|
||||
* pyopenssl tsafe module was deprecated and removed in v20.0.0
|
||||
* deprecate pyevent hub
|
||||
* Deprecate CPython 2.7 and 3.4 support
|
||||
* py39: Add _at_fork_reinit method to Semaphores
|
||||
- Drop pr_672-remove-OpenSSL-tsafe.patch merged upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 10 22:43:44 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
|
||||
|
||||
|
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-eventlet
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
||||
Name: python-eventlet
|
||||
Version: 0.29.1
|
||||
Version: 0.30.2
|
||||
Release: 0
|
||||
Summary: Concurrent networking library for Python
|
||||
License: MIT
|
||||
@@ -28,32 +28,30 @@ Source: https://files.pythonhosted.org/packages/source/e/eventlet/eventl
|
||||
# PATCH-FEATURE-UPSTREAM remove_nose.patch gh#eventlet/eventlet#638 mcepl@suse.com
|
||||
# Removes dependency on nose
|
||||
Patch0: remove_nose.patch
|
||||
# PATCH-FIX-UPSTREAM newdnspython.patch gh#eventlet/eventlet#638 mcepl@suse.com
|
||||
# patch is from gh#rthalley/dnspython#519
|
||||
# PATCH-FIX-UPSTREAM newdnspython.patch mcepl@suse.com -- patch is from gh#rthalley/dnspython#519, discussion in gh#eventlet/eventlet#638
|
||||
Patch1: newdnspython.patch
|
||||
# PATCH-FEATURE-UPSTREAM pr_639.patch gh#eventlet/eventlet#639 jayvdb@gmail.com
|
||||
Patch2: pr_639.patch
|
||||
# Really remove the dependency on nose
|
||||
Patch3: remove_nose_part_2.patch
|
||||
# PATCH-FIX-UPSTREAM -- gh#eventlet/eventlet#672 remove OpenSSL.tsafe
|
||||
Patch4: pr_672-remove-OpenSSL-tsafe.patch
|
||||
BuildRequires: %{python_module dnspython >= 1.15.0}
|
||||
BuildRequires: %{python_module greenlet >= 0.3}
|
||||
BuildRequires: %{python_module pyOpenSSL}
|
||||
BuildRequires: %{python_module pytest}
|
||||
BuildRequires: %{python_module pyzmq}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: %{python_module six >= 1.10.0}
|
||||
BuildRequires: %{python_module testsuite}
|
||||
%if 0%{?suse_version} < 1550
|
||||
BuildRequires: python2-monotonic >= 1.4
|
||||
%endif
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: netcfg
|
||||
BuildRequires: python-rpm-macros
|
||||
# SECTION TEST requirements
|
||||
# eventlet parses /etc/protocols which is not available in normal build envs
|
||||
# Tests
|
||||
BuildRequires: sysconfig-netconfig
|
||||
BuildRequires: %{python_module dnspython >= 1.15.0}
|
||||
BuildRequires: %{python_module greenlet >= 0.3}
|
||||
BuildRequires: %{python_module pyOpenSSL}
|
||||
BuildRequires: %{python_module pytest}
|
||||
BuildRequires: %{python_module pyzmq}
|
||||
BuildRequires: %{python_module six >= 1.10.0}
|
||||
BuildRequires: %{python_module testsuite}
|
||||
# /SECTION
|
||||
Requires: netcfg
|
||||
Requires: python-dnspython >= 1.15.0
|
||||
Requires: python-greenlet >= 0.3
|
||||
@@ -78,9 +76,8 @@ interpreter, or as part of a larger application.
|
||||
%setup -q -n eventlet-%{version}
|
||||
%autopatch -p1
|
||||
|
||||
sed -i "s|^#!.*||" eventlet/support/greendns.py # Fix non-executable script
|
||||
# https://github.com/eventlet/eventlet/issues/638
|
||||
sed -i "/assert num_readers/ i \ return" tests/__init__.py
|
||||
# Fix non-executable script
|
||||
sed -i '1{/^#!/ d}' eventlet/support/greendns.py
|
||||
|
||||
%build
|
||||
%python_build
|
||||
|
Reference in New Issue
Block a user