Accepting request 1137718 from devel:languages:python
- Clean up the SPEC file - Update to version 21.2.0 * See https://github.com/benoitc/gunicorn/blob/21.2.0/docs/source/news.rst or the packaged news.rst - Removed support-eventlet-30-3.patch OBS-URL: https://build.opensuse.org/request/show/1137718 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-gunicorn?expand=0&rev=24
This commit is contained in:
commit
fcb9121d5e
BIN
gunicorn-20.1.0.tar.gz
(Stored with Git LFS)
BIN
gunicorn-20.1.0.tar.gz
(Stored with Git LFS)
Binary file not shown.
3
gunicorn-21.2.0.tar.gz
Normal file
3
gunicorn-21.2.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:88ec8bff1d634f98e61b9f65bc4bf3cd918a90806c6f5c48bc5603849ec81033
|
||||
size 3632557
|
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 8 23:05:51 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||
|
||||
- Clean up the SPEC file
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 8 09:03:41 UTC 2024 - Andreas Schneider <asn@cryptomilk.org>
|
||||
|
||||
- Update to version 21.2.0
|
||||
* See https://github.com/benoitc/gunicorn/blob/21.2.0/docs/source/news.rst
|
||||
or the packaged news.rst
|
||||
- Removed support-eventlet-30-3.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 23 23:07:34 UTC 2023 - Matej Cepl <mcepl@suse.com>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -27,25 +27,17 @@
|
||||
%define skip_python2 1
|
||||
%{?sle15_python_module_pythons}
|
||||
Name: python-gunicorn%{psuffix}
|
||||
Version: 20.1.0
|
||||
Version: 21.2.0
|
||||
Release: 0
|
||||
Summary: WSGI HTTP Server for UNIX
|
||||
License: MIT
|
||||
Group: Development/Languages/Python
|
||||
URL: https://gunicorn.org
|
||||
Source: https://files.pythonhosted.org/packages/source/g/gunicorn/gunicorn-%{version}.tar.gz
|
||||
Patch0: support-eventlet-30-3.patch
|
||||
BuildRequires: %{python_module importlib_metadata}
|
||||
BuildRequires: %{python_module setuptools >= 3.0}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: python3-Sphinx
|
||||
%if %{with test}
|
||||
BuildRequires: %{python_module eventlet}
|
||||
BuildRequires: %{python_module gevent >= 1.4}
|
||||
BuildRequires: %{python_module gunicorn}
|
||||
BuildRequires: %{python_module pytest}
|
||||
%endif
|
||||
Requires: python-setuptools >= 3.0
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun):update-alternatives
|
||||
Suggests: python-evenlet
|
||||
@ -54,6 +46,18 @@ Suggests: python-gthread
|
||||
Suggests: python-setproctitle
|
||||
Suggests: python-tornado
|
||||
BuildArch: noarch
|
||||
%if 0%{?sle_version} >= 150500
|
||||
# Fixes the build on Leap
|
||||
BuildRequires: %{python_module Sphinx}
|
||||
%else
|
||||
BuildRequires: python3-Sphinx
|
||||
%endif
|
||||
%if %{with test}
|
||||
BuildRequires: %{python_module eventlet}
|
||||
BuildRequires: %{python_module gevent >= 1.4}
|
||||
BuildRequires: %{python_module gunicorn}
|
||||
BuildRequires: %{python_module pytest}
|
||||
%endif
|
||||
%python_subpackages
|
||||
|
||||
%description
|
||||
@ -108,13 +112,14 @@ sphinx-build -b html -d docs/build/doctrees docs/source docs/build/html
|
||||
%files %{python_files}
|
||||
%license LICENSE
|
||||
%python_alternative %{_bindir}/gunicorn
|
||||
%{python_sitelib}/*
|
||||
%{python_sitelib}/gunicorn
|
||||
%{python_sitelib}/gunicorn-%{version}*-info
|
||||
|
||||
%if 0%{?suse_version} > 1500
|
||||
%files -n python-gunicorn-doc
|
||||
%license LICENSE
|
||||
%endif
|
||||
%doc README.rst NOTICE THANKS docs/build/html
|
||||
%doc README.rst NOTICE THANKS docs/build/html docs/source/news.rst
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
@ -1,50 +0,0 @@
|
||||
From 6a8ebb4844b2f28596ffe7421eb9f7d08c8dc4d8 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Shepelev <temotor@gmail.com>
|
||||
Date: Thu, 6 May 2021 12:54:06 +0300
|
||||
Subject: [PATCH] eventlet worker: ALREADY_HANDLED -> WSGI_LOCAL
|
||||
|
||||
Eventlet v0.30.3+ removed wsgi.ALREADY_HANDLED in favor of
|
||||
`wsgi.WSGI_LOCAL.already_handled: bool`
|
||||
|
||||
Sorry, this breaking change happened during only patch
|
||||
version increase 0.30.2 -> 0.30.3
|
||||
|
||||
https://github.com/eventlet/eventlet/issues/543
|
||||
https://github.com/eventlet/eventlet/pull/544
|
||||
---
|
||||
gunicorn/workers/geventlet.py | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py
|
||||
index ffdb206c0..ea82f3d62 100644
|
||||
--- a/gunicorn/workers/geventlet.py
|
||||
+++ b/gunicorn/workers/geventlet.py
|
||||
@@ -17,11 +17,16 @@
|
||||
|
||||
from eventlet import hubs, greenthread
|
||||
from eventlet.greenio import GreenSocket
|
||||
-from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED
|
||||
+import eventlet.wsgi
|
||||
import greenlet
|
||||
|
||||
from gunicorn.workers.base_async import AsyncWorker
|
||||
|
||||
+# ALREADY_HANDLED is removed in 0.30.3+ now it's `WSGI_LOCAL.already_handled: bool`
|
||||
+# https://github.com/eventlet/eventlet/pull/544
|
||||
+EVENTLET_WSGI_LOCAL = getattr(eventlet.wsgi, "WSGI_LOCAL", None)
|
||||
+EVENTLET_ALREADY_HANDLED = getattr(eventlet.wsgi, "ALREADY_HANDLED", None)
|
||||
+
|
||||
|
||||
def _eventlet_socket_sendfile(self, file, offset=0, count=None):
|
||||
# Based on the implementation in gevent which in turn is slightly
|
||||
@@ -125,6 +130,10 @@ def patch(self):
|
||||
patch_sendfile()
|
||||
|
||||
def is_already_handled(self, respiter):
|
||||
+ # eventlet >= 0.30.3
|
||||
+ if getattr(EVENTLET_WSGI_LOCAL, "already_handled", None):
|
||||
+ raise StopIteration()
|
||||
+ # eventlet < 0.30.3
|
||||
if respiter == EVENTLET_ALREADY_HANDLED:
|
||||
raise StopIteration()
|
||||
return super().is_already_handled(respiter)
|
Loading…
x
Reference in New Issue
Block a user