From fb0d68427e138fbae97cee2495d5b54c6eef67ec1975ff636173c06da0f7afdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 31 Jan 2019 10:12:19 +0000 Subject: [PATCH 1/2] =?UTF-8?q?-=20Version=20update=20to=201.4.0:=20=20=20?= =?UTF-8?q?*=20generate=20with=20cython=200.29=20=20=20*=20Refactored=20th?= =?UTF-8?q?e=20gevent=20test=20runner=20and=20test=20suite=20to=20make=20t?= =?UTF-8?q?hem=20more=20reusable.=20In=20particular,=20the=20tests=20are?= =?UTF-8?q?=20now=20run=20with=20python=20-m=20gevent.tests.=20See=20issue?= =?UTF-8?q?=20#1293.=20=20=20*=20Formatting=20run=20info=20no=20longer=20i?= =?UTF-8?q?ncludes=20gevent.local.local=20objects=20that=20have=20no=20val?= =?UTF-8?q?ue=20in=20the=20greenlet.=20See=20issue=20#1275.=20=20=20*=20Fi?= =?UTF-8?q?xed=20negative=20length=20in=20pywsgi=E2=80=99s=20Input=20read?= =?UTF-8?q?=20functions=20for=20non=20chunked=20body.=20Reported=20in=20is?= =?UTF-8?q?sue=20#1274=20by=20tzickel.=20=20=20*=20Fix=20opening=20files?= =?UTF-8?q?=20in=20text=20mode=20in=20CPython=202=20on=20Windows=20by=20pa?= =?UTF-8?q?tching=20libuv.=20See=20issue=20#1282=20reported=20by=20wiggin1?= =?UTF-8?q?5.=20=20=20*=20gevent=20now=20depends=20on=20greenlet=200.4.14?= =?UTF-8?q?=20or=20above.=20=20=20*=20gevent.local.local=20subclasses=20co?= =?UTF-8?q?rrectly=20supports=20@staticmethod=20functions.=20Reported=20by?= =?UTF-8?q?=20Brendan=20Powers=20in=20issue=20#1266.=20-=20Do=20NOT=20bund?= =?UTF-8?q?le=20c-ares=20and=20libev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gevent?expand=0&rev=47 --- 0001-always-obey-GEVENT_NO_CFFI_BUILD.patch | 163 ++++++++++++++++++++ gevent-1.3.5.tar.gz | 3 - gevent-1.4.0.tar.gz | 3 + python-gevent.changes | 13 ++ python-gevent.spec | 29 ++-- 5 files changed, 196 insertions(+), 15 deletions(-) create mode 100644 0001-always-obey-GEVENT_NO_CFFI_BUILD.patch delete mode 100644 gevent-1.3.5.tar.gz create mode 100644 gevent-1.4.0.tar.gz diff --git a/0001-always-obey-GEVENT_NO_CFFI_BUILD.patch b/0001-always-obey-GEVENT_NO_CFFI_BUILD.patch new file mode 100644 index 0000000..a6eed28 --- /dev/null +++ b/0001-always-obey-GEVENT_NO_CFFI_BUILD.patch @@ -0,0 +1,163 @@ + + + +0001-always-obey-GEVENT_NO_CFFI_BUILD.patch - rpms/python-gevent.git - python-gevent + + + + + + + + + + + + +
+ + + + +
+summaryrefslogtreecommitdiffstats
+ + + +
+
+
blob: 7f768eca75310bd7119bc30a1770296e9f6dbba1 (plain) + + +
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+
From 05650624fe2524ecb1bdbbd4facc5d988275e542 Mon Sep 17 00:00:00 2001
+From: Dan Callaghan <dcallagh@redhat.com>
+Date: Wed, 7 Jun 2017 13:55:53 +1000
+Subject: [PATCH] always obey GEVENT_NO_CFFI_BUILD
+
+If libev is not embedded, we still want to set GEVENT_NO_CFFI_BUILD=1 to
+prevent setup.py from trying to configure libev, regardless whether cffi
+modules will actually be built or not.
+---
+ setup.py | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 9c229ad..ea4dcaf 100755
+--- a/setup.py
++++ b/setup.py
+@@ -90,16 +90,17 @@
+ except ImportError:
+     pass
+ else:
+-    if IGNORE_CFFI and not PYPY:
+-        # Allow distributors to turn off CFFI builds
+-        # even if it's available, because CFFI always embeds
+-        # our copy of libev and they may not want that.
+-        del cffi_modules[:]
+     # Note that we don't add cffi to install_requires, it's
+     # optional. We tend to build and distribute wheels with the CFFI
+     # modules built and they can be imported if CFFI is installed.
+     # install_requires.append('cffi >= 1.3.0')
++    pass
+ 
++if IGNORE_CFFI and not PYPY:
++    # Allow distributors to turn off CFFI builds
++    # even if it's available, because CFFI always embeds
++    # our copy of libev and they may not want that.
++    del cffi_modules[:]
+ 
+ # If we are running info / help commands, or we're being imported by
+ # tools like pyroma, we don't need to build anything
+-- 
+2.9.4
+
+
+
+ +
+ + diff --git a/gevent-1.3.5.tar.gz b/gevent-1.3.5.tar.gz deleted file mode 100644 index d040de5..0000000 --- a/gevent-1.3.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f15861f3cc92f49663ca88c4774d26d8044783a65fbc28071a2bd1c7bf36ff0 -size 4609085 diff --git a/gevent-1.4.0.tar.gz b/gevent-1.4.0.tar.gz new file mode 100644 index 0000000..4ddd76e --- /dev/null +++ b/gevent-1.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1eb7fa3b9bd9174dfe9c3b59b7a09b768ecd496debfc4976a9530a3e15c990d1 +size 5169595 diff --git a/python-gevent.changes b/python-gevent.changes index e4ac7f4..437c9de 100644 --- a/python-gevent.changes +++ b/python-gevent.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jan 31 09:42:44 UTC 2019 - Tomáš Chvátal + +- Version update to 1.4.0: + * generate with cython 0.29 + * Refactored the gevent test runner and test suite to make them more reusable. In particular, the tests are now run with python -m gevent.tests. See issue #1293. + * Formatting run info no longer includes gevent.local.local objects that have no value in the greenlet. See issue #1275. + * Fixed negative length in pywsgi’s Input read functions for non chunked body. Reported in issue #1274 by tzickel. + * Fix opening files in text mode in CPython 2 on Windows by patching libuv. See issue #1282 reported by wiggin15. + * gevent now depends on greenlet 0.4.14 or above. + * gevent.local.local subclasses correctly supports @staticmethod functions. Reported by Brendan Powers in issue #1266. +- Do NOT bundle c-ares and libev + ------------------------------------------------------------------- Wed Jan 9 08:26:33 UTC 2019 - Tomáš Chvátal diff --git a/python-gevent.spec b/python-gevent.spec index 7d36805..5ae9b93 100644 --- a/python-gevent.spec +++ b/python-gevent.spec @@ -17,10 +17,8 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -# Tests require network connection -%bcond_with tests Name: python-gevent -Version: 1.3.5 +Version: 1.4.0 Release: 0 Summary: Python network library that uses greenlet and libevent License: MIT @@ -28,17 +26,20 @@ Group: Development/Languages/Python URL: http://www.gevent.org/ Source: https://files.pythonhosted.org/packages/source/g/gevent/gevent-%{version}.tar.gz Source100: %{name}-rpmlintrc +Patch0: 0001-always-obey-GEVENT_NO_CFFI_BUILD.patch BuildRequires: %{python_module cffi} BuildRequires: %{python_module devel} -BuildRequires: %{python_module greenlet} +BuildRequires: %{python_module greenlet >= 0.4.14} +BuildRequires: %{python_module mock} +BuildRequires: %{python_module objgraph} BuildRequires: %{python_module setuptools} +BuildRequires: c-ares-devel BuildRequires: fdupes +BuildRequires: libev-devel BuildRequires: python-rpm-macros +BuildRequires: python3-testsuite Requires: python-cffi Requires: python-greenlet -%if %{with tests} -BuildRequires: %{python_module nose} -%endif %if 0%{?suse_version} || 0%{?fedora_version} || 0%{?rhel} >= 8 Recommends: python-psutil %else @@ -73,21 +74,25 @@ Documentation and examples for %{name}. %prep %setup -q -n gevent-%{version} +%patch0 -p1 %build +export LIBEV_EMBED=0 +export CARES_EMBED=0 +export GEVENT_NO_CFFI_BUILD=1 %python_build %install +export LIBEV_EMBED=0 +export CARES_EMBED=0 +export GEVENT_NO_CFFI_BUILD=1 %python_install %python_expand %fdupes %{buildroot}%{$python_sitearch} -%if %{with tests} %check -pushd src/greentest +# tests passed as 20 need network connection with no way to skip export GEVENT_RESOLVER=thread -%python_exec testrunner.py --config known_failures.py -popd -%endif +%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m gevent.tests || : %files %{python_files} %doc AUTHORS README.rst TODO CHANGES.rst CONTRIBUTING.rst From c8a35e87150af219980c0388c0b2ce643fea22ed1664ba6f0d3e81d5b226edd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 31 Jan 2019 10:14:40 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gevent?expand=0&rev=48 --- 0001-always-obey-GEVENT_NO_CFFI_BUILD.patch | 163 -------------------- python-gevent.spec | 2 - 2 files changed, 165 deletions(-) delete mode 100644 0001-always-obey-GEVENT_NO_CFFI_BUILD.patch diff --git a/0001-always-obey-GEVENT_NO_CFFI_BUILD.patch b/0001-always-obey-GEVENT_NO_CFFI_BUILD.patch deleted file mode 100644 index a6eed28..0000000 --- a/0001-always-obey-GEVENT_NO_CFFI_BUILD.patch +++ /dev/null @@ -1,163 +0,0 @@ - - - -0001-always-obey-GEVENT_NO_CFFI_BUILD.patch - rpms/python-gevent.git - python-gevent - - - - - - - - - - - - -
- - - - -
-summaryrefslogtreecommitdiffstats
- - - -
-
-
blob: 7f768eca75310bd7119bc30a1770296e9f6dbba1 (plain) - - -
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-
From 05650624fe2524ecb1bdbbd4facc5d988275e542 Mon Sep 17 00:00:00 2001
-From: Dan Callaghan <dcallagh@redhat.com>
-Date: Wed, 7 Jun 2017 13:55:53 +1000
-Subject: [PATCH] always obey GEVENT_NO_CFFI_BUILD
-
-If libev is not embedded, we still want to set GEVENT_NO_CFFI_BUILD=1 to
-prevent setup.py from trying to configure libev, regardless whether cffi
-modules will actually be built or not.
----
- setup.py | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 9c229ad..ea4dcaf 100755
---- a/setup.py
-+++ b/setup.py
-@@ -90,16 +90,17 @@
- except ImportError:
-     pass
- else:
--    if IGNORE_CFFI and not PYPY:
--        # Allow distributors to turn off CFFI builds
--        # even if it's available, because CFFI always embeds
--        # our copy of libev and they may not want that.
--        del cffi_modules[:]
-     # Note that we don't add cffi to install_requires, it's
-     # optional. We tend to build and distribute wheels with the CFFI
-     # modules built and they can be imported if CFFI is installed.
-     # install_requires.append('cffi >= 1.3.0')
-+    pass
- 
-+if IGNORE_CFFI and not PYPY:
-+    # Allow distributors to turn off CFFI builds
-+    # even if it's available, because CFFI always embeds
-+    # our copy of libev and they may not want that.
-+    del cffi_modules[:]
- 
- # If we are running info / help commands, or we're being imported by
- # tools like pyroma, we don't need to build anything
--- 
-2.9.4
-
-
-
- -
- - diff --git a/python-gevent.spec b/python-gevent.spec index 5ae9b93..a211612 100644 --- a/python-gevent.spec +++ b/python-gevent.spec @@ -26,7 +26,6 @@ Group: Development/Languages/Python URL: http://www.gevent.org/ Source: https://files.pythonhosted.org/packages/source/g/gevent/gevent-%{version}.tar.gz Source100: %{name}-rpmlintrc -Patch0: 0001-always-obey-GEVENT_NO_CFFI_BUILD.patch BuildRequires: %{python_module cffi} BuildRequires: %{python_module devel} BuildRequires: %{python_module greenlet >= 0.4.14} @@ -74,7 +73,6 @@ Documentation and examples for %{name}. %prep %setup -q -n gevent-%{version} -%patch0 -p1 %build export LIBEV_EMBED=0