From eeca9bf90c613695d1cca642f60fb470be9f2ed6641a78bcaddf0c3ada9825fc Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 4 Jan 2023 21:25:00 +0000 Subject: [PATCH 1/3] Accepting request 1056058 from home:bnavigator:branches:devel:languages:python - Update to 22.10.2 * Update to greenlet 2.0. This fixes a deallocation issue that required a change in greenlet's ABI. The design of greenlet 2.0 is intended to prevent future fixes and enhancements from requiring an ABI change, making it easier to update gevent and greenlet independently. * Caution: greenlet 2.0 requires a modern-ish C++ compiler. This may mean certain older platforms are no longer supported. See :issue:`1909`. OBS-URL: https://build.opensuse.org/request/show/1056058 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gevent?expand=0&rev=81 --- gevent-22.10.1.tar.gz | 3 --- gevent-22.10.2.tar.gz | 3 +++ python-gevent-rpmlintrc | 1 - python-gevent.changes | 13 ++++++++++++ python-gevent.spec | 44 ++++++++++++++++++++--------------------- 5 files changed, 38 insertions(+), 26 deletions(-) delete mode 100644 gevent-22.10.1.tar.gz create mode 100644 gevent-22.10.2.tar.gz diff --git a/gevent-22.10.1.tar.gz b/gevent-22.10.1.tar.gz deleted file mode 100644 index 5239fa4..0000000 --- a/gevent-22.10.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a7ef503d3f2623013f0685861d571ad129bca9f1550bd60eead0b67eac30a78 -size 4797676 diff --git a/gevent-22.10.2.tar.gz b/gevent-22.10.2.tar.gz new file mode 100644 index 0000000..4a9ac22 --- /dev/null +++ b/gevent-22.10.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01ea78981520c9cdbe3722e1760a8ed0165a0b576cb5209f67881595561509da +size 4800293 diff --git a/python-gevent-rpmlintrc b/python-gevent-rpmlintrc index 79e86e8..6d5fdb8 100644 --- a/python-gevent-rpmlintrc +++ b/python-gevent-rpmlintrc @@ -1,2 +1 @@ addFilter("zero-length .*tests/nullcert\.pem") -addFilter("pem-certificate .*tests/.*\.pem") diff --git a/python-gevent.changes b/python-gevent.changes index 32197b4..26035f8 100644 --- a/python-gevent.changes +++ b/python-gevent.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jan 4 19:49:54 UTC 2023 - Ben Greiner + +- Update to 22.10.2 + * Update to greenlet 2.0. This fixes a deallocation issue that + required a change in greenlet's ABI. The design of greenlet 2.0 + is intended to prevent future fixes and enhancements from + requiring an ABI change, making it easier to update gevent and + greenlet independently. + * Caution: greenlet 2.0 requires a modern-ish C++ compiler. This + may mean certain older platforms are no longer supported. See + :issue:`1909`. + ------------------------------------------------------------------- Sun Oct 16 17:41:54 UTC 2022 - Dirk Müller diff --git a/python-gevent.spec b/python-gevent.spec index ef99e6b..fbac6d7 100644 --- a/python-gevent.spec +++ b/python-gevent.spec @@ -1,7 +1,7 @@ # # spec file for package python-gevent # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,40 +23,31 @@ %define use_bundled_libev 0 %endif -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define modname gevent Name: python-gevent -Version: 22.10.1 +Version: 22.10.2 Release: 0 Summary: Python network library that uses greenlet and libevent License: MIT Group: Development/Languages/Python URL: http://www.gevent.org/ # Source: https://files.pythonhosted.org/packages/source/g/gevent/gevent-%%{version}.tar.gz -Source0: https://github.com/gevent/%{modname}/archive/%{version}.tar.gz#/%{modname}-%{version}.tar.gz +Source0: https://github.com/gevent/gevent/archive/%{version}.tar.gz#/gevent-%{version}.tar.gz Source100: %{name}-rpmlintrc # gcc7 for 15.1 produces no-return-in-nonvoid-function, but the same compiler for 15.2 not # usually, as long as no return value is used, this shouldn't be treated as an error # let's selectively disable the warning around the offending code Patch0: fix-no-return-in-nonvoid-function.patch Patch1: skip-tests-in-leap.patch -BuildRequires: %{python_module Cython} -BuildRequires: %{python_module cffi} +BuildRequires: %{python_module Cython >= 3.0~a11} +BuildRequires: %{python_module cffi >= 1.12.3} BuildRequires: %{python_module devel} -BuildRequires: %{python_module dnspython} -BuildRequires: %{python_module greenlet >= 1.1.0} -BuildRequires: %{python_module objgraph} -BuildRequires: %{python_module psutil} -BuildRequires: %{python_module requests} +BuildRequires: %{python_module greenlet >= 2} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module zope.event} -BuildRequires: %{python_module zope.interface} +BuildRequires: %{python_module wheel} BuildRequires: fdupes -# /etc/protocols needed for tests -BuildRequires: netcfg BuildRequires: pkgconfig BuildRequires: python-rpm-macros -BuildRequires: python3-testsuite BuildRequires: pkgconfig(libcares) %if ! 0%{use_bundled_libev} BuildRequires: pkgconfig(libev) @@ -73,6 +64,17 @@ Recommends: python-psutil %else Requires: python-psutil %endif +# SECTION test +# /etc/protocols needed for tests +BuildRequires: netcfg +BuildRequires: %{python_module dnspython} +BuildRequires: %{python_module objgraph} +BuildRequires: %{python_module psutil} +BuildRequires: %{python_module requests} +BuildRequires: %{python_module zope.event} +BuildRequires: %{python_module zope.interface} +BuildRequires: python3-testsuite +# /SECTION %python_subpackages %description @@ -117,12 +119,10 @@ sed -i -e '1{/bin.*python/d}' src/gevent/tests/*.py export LIBEV_EMBED=%{use_bundled_libev} export CARES_EMBED=0 export CFLAGS="%{optflags} -fno-strict-aliasing" -%python_build +%pyproject_wheel %install -export LIBEV_EMBED=%{use_bundled_libev} -export CARES_EMBED=0 -%python_install +%pyproject_install %{python_expand # fix script interpreter-line and exec bit sed -i '1{s|^#!.*bin.*python.*$|#!%{__$python}|}' %{buildroot}%{$python_sitearch}/gevent/testing/testrunner.py chmod +x %{buildroot}%{$python_sitearch}/gevent/testing/testrunner.py @@ -170,7 +170,7 @@ fi %files %{python_files} %doc AUTHORS README.rst TODO CHANGES.rst CONTRIBUTING.rst %license LICENSE* -%{python_sitearch}/gevent-%{version}-py*.egg-info +%{python_sitearch}/gevent-%{version}.dist-info %{python_sitearch}/gevent/ %files -n python-gevent-doc From 1e86137035897d24a7b5ada3c46f9dc98da4c1090d35b009f3be20d0890eee85 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 5 Jan 2023 07:49:30 +0000 Subject: [PATCH 2/3] Accepting request 1056128 from devel:languages:python Revert to 22.10.0, greenlet 2.0 breaks openstack, so it's reverted for now OBS-URL: https://build.opensuse.org/request/show/1056128 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gevent?expand=0&rev=82 --- gevent-22.10.1.tar.gz | 3 +++ gevent-22.10.2.tar.gz | 3 --- python-gevent-rpmlintrc | 1 + python-gevent.changes | 13 ------------ python-gevent.spec | 44 ++++++++++++++++++++--------------------- 5 files changed, 26 insertions(+), 38 deletions(-) create mode 100644 gevent-22.10.1.tar.gz delete mode 100644 gevent-22.10.2.tar.gz diff --git a/gevent-22.10.1.tar.gz b/gevent-22.10.1.tar.gz new file mode 100644 index 0000000..5239fa4 --- /dev/null +++ b/gevent-22.10.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a7ef503d3f2623013f0685861d571ad129bca9f1550bd60eead0b67eac30a78 +size 4797676 diff --git a/gevent-22.10.2.tar.gz b/gevent-22.10.2.tar.gz deleted file mode 100644 index 4a9ac22..0000000 --- a/gevent-22.10.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01ea78981520c9cdbe3722e1760a8ed0165a0b576cb5209f67881595561509da -size 4800293 diff --git a/python-gevent-rpmlintrc b/python-gevent-rpmlintrc index 6d5fdb8..79e86e8 100644 --- a/python-gevent-rpmlintrc +++ b/python-gevent-rpmlintrc @@ -1 +1,2 @@ addFilter("zero-length .*tests/nullcert\.pem") +addFilter("pem-certificate .*tests/.*\.pem") diff --git a/python-gevent.changes b/python-gevent.changes index 26035f8..32197b4 100644 --- a/python-gevent.changes +++ b/python-gevent.changes @@ -1,16 +1,3 @@ -------------------------------------------------------------------- -Wed Jan 4 19:49:54 UTC 2023 - Ben Greiner - -- Update to 22.10.2 - * Update to greenlet 2.0. This fixes a deallocation issue that - required a change in greenlet's ABI. The design of greenlet 2.0 - is intended to prevent future fixes and enhancements from - requiring an ABI change, making it easier to update gevent and - greenlet independently. - * Caution: greenlet 2.0 requires a modern-ish C++ compiler. This - may mean certain older platforms are no longer supported. See - :issue:`1909`. - ------------------------------------------------------------------- Sun Oct 16 17:41:54 UTC 2022 - Dirk Müller diff --git a/python-gevent.spec b/python-gevent.spec index fbac6d7..ef99e6b 100644 --- a/python-gevent.spec +++ b/python-gevent.spec @@ -1,7 +1,7 @@ # # spec file for package python-gevent # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,31 +23,40 @@ %define use_bundled_libev 0 %endif +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define modname gevent Name: python-gevent -Version: 22.10.2 +Version: 22.10.1 Release: 0 Summary: Python network library that uses greenlet and libevent License: MIT Group: Development/Languages/Python URL: http://www.gevent.org/ # Source: https://files.pythonhosted.org/packages/source/g/gevent/gevent-%%{version}.tar.gz -Source0: https://github.com/gevent/gevent/archive/%{version}.tar.gz#/gevent-%{version}.tar.gz +Source0: https://github.com/gevent/%{modname}/archive/%{version}.tar.gz#/%{modname}-%{version}.tar.gz Source100: %{name}-rpmlintrc # gcc7 for 15.1 produces no-return-in-nonvoid-function, but the same compiler for 15.2 not # usually, as long as no return value is used, this shouldn't be treated as an error # let's selectively disable the warning around the offending code Patch0: fix-no-return-in-nonvoid-function.patch Patch1: skip-tests-in-leap.patch -BuildRequires: %{python_module Cython >= 3.0~a11} -BuildRequires: %{python_module cffi >= 1.12.3} +BuildRequires: %{python_module Cython} +BuildRequires: %{python_module cffi} BuildRequires: %{python_module devel} -BuildRequires: %{python_module greenlet >= 2} -BuildRequires: %{python_module pip} +BuildRequires: %{python_module dnspython} +BuildRequires: %{python_module greenlet >= 1.1.0} +BuildRequires: %{python_module objgraph} +BuildRequires: %{python_module psutil} +BuildRequires: %{python_module requests} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module wheel} +BuildRequires: %{python_module zope.event} +BuildRequires: %{python_module zope.interface} BuildRequires: fdupes +# /etc/protocols needed for tests +BuildRequires: netcfg BuildRequires: pkgconfig BuildRequires: python-rpm-macros +BuildRequires: python3-testsuite BuildRequires: pkgconfig(libcares) %if ! 0%{use_bundled_libev} BuildRequires: pkgconfig(libev) @@ -64,17 +73,6 @@ Recommends: python-psutil %else Requires: python-psutil %endif -# SECTION test -# /etc/protocols needed for tests -BuildRequires: netcfg -BuildRequires: %{python_module dnspython} -BuildRequires: %{python_module objgraph} -BuildRequires: %{python_module psutil} -BuildRequires: %{python_module requests} -BuildRequires: %{python_module zope.event} -BuildRequires: %{python_module zope.interface} -BuildRequires: python3-testsuite -# /SECTION %python_subpackages %description @@ -119,10 +117,12 @@ sed -i -e '1{/bin.*python/d}' src/gevent/tests/*.py export LIBEV_EMBED=%{use_bundled_libev} export CARES_EMBED=0 export CFLAGS="%{optflags} -fno-strict-aliasing" -%pyproject_wheel +%python_build %install -%pyproject_install +export LIBEV_EMBED=%{use_bundled_libev} +export CARES_EMBED=0 +%python_install %{python_expand # fix script interpreter-line and exec bit sed -i '1{s|^#!.*bin.*python.*$|#!%{__$python}|}' %{buildroot}%{$python_sitearch}/gevent/testing/testrunner.py chmod +x %{buildroot}%{$python_sitearch}/gevent/testing/testrunner.py @@ -170,7 +170,7 @@ fi %files %{python_files} %doc AUTHORS README.rst TODO CHANGES.rst CONTRIBUTING.rst %license LICENSE* -%{python_sitearch}/gevent-%{version}.dist-info +%{python_sitearch}/gevent-%{version}-py*.egg-info %{python_sitearch}/gevent/ %files -n python-gevent-doc From 38c415fde92b4b0314b24787d94cf7dc0a0ea2fbbfe48ff412eaf74c18f406ce Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 15 Mar 2023 14:34:31 +0000 Subject: [PATCH 3/3] Accepting request 1072125 from home:dirkmueller:acdc - Clean up the SPEC file. OBS-URL: https://build.opensuse.org/request/show/1072125 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gevent?expand=0&rev=83 --- python-gevent.changes | 5 +++++ python-gevent.spec | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/python-gevent.changes b/python-gevent.changes index 32197b4..ebf9508 100644 --- a/python-gevent.changes +++ b/python-gevent.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 8 15:30:19 UTC 2023 - Matej Cepl + +- Clean up the SPEC file. + ------------------------------------------------------------------- Sun Oct 16 17:41:54 UTC 2022 - Dirk Müller diff --git a/python-gevent.spec b/python-gevent.spec index ef99e6b..d1d312c 100644 --- a/python-gevent.spec +++ b/python-gevent.spec @@ -1,7 +1,7 @@ # # spec file for package python-gevent # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,22 +16,20 @@ # +%define modname gevent # on TW, gevent is able to use system libev, Leaps et.al. need the bundled version %if 0%{?suse_version} <= 1500 %define use_bundled_libev 1 %else %define use_bundled_libev 0 %endif - -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define modname gevent Name: python-gevent Version: 22.10.1 Release: 0 Summary: Python network library that uses greenlet and libevent License: MIT Group: Development/Languages/Python -URL: http://www.gevent.org/ +URL: https://www.gevent.org/ # Source: https://files.pythonhosted.org/packages/source/g/gevent/gevent-%%{version}.tar.gz Source0: https://github.com/gevent/%{modname}/archive/%{version}.tar.gz#/%{modname}-%{version}.tar.gz Source100: %{name}-rpmlintrc @@ -58,9 +56,6 @@ BuildRequires: pkgconfig BuildRequires: python-rpm-macros BuildRequires: python3-testsuite BuildRequires: pkgconfig(libcares) -%if ! 0%{use_bundled_libev} -BuildRequires: pkgconfig(libev) -%endif BuildRequires: pkgconfig(libuv) Requires: python-cffi Requires: python-dnspython @@ -68,6 +63,9 @@ Requires: python-greenlet Requires: python-requests Requires: python-zope.event Requires: python-zope.interface +%if ! 0%{use_bundled_libev} +BuildRequires: pkgconfig(libev) +%endif %if 0%{?suse_version} || 0%{?fedora_version} || 0%{?rhel} >= 8 Recommends: python-psutil %else @@ -170,8 +168,8 @@ fi %files %{python_files} %doc AUTHORS README.rst TODO CHANGES.rst CONTRIBUTING.rst %license LICENSE* -%{python_sitearch}/gevent-%{version}-py*.egg-info -%{python_sitearch}/gevent/ +%{python_sitearch}/gevent-%{version}*-info +%{python_sitearch}/gevent %files -n python-gevent-doc %license LICENSE*