* [gentoo-commits] repo/gentoo:master commit in: www-servers/gunicorn/files/, www-servers/gunicorn/
@ 2021-03-15 15:37 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2021-03-15 15:37 UTC (permalink / raw
To: gentoo-commits
commit: 21544ce0cfce90ce900da3226926d14f346544f3
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 15:27:37 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 15:37:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21544ce0
www-servers/gunicorn: make worker tests optional rather than skip them altogether
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../gunicorn-20.1.0-tests_optional_modules.patch | 22 ++++++++++++++++++++++
www-servers/gunicorn/gunicorn-20.1.0.ebuild | 8 ++++----
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/www-servers/gunicorn/files/gunicorn-20.1.0-tests_optional_modules.patch b/www-servers/gunicorn/files/gunicorn-20.1.0-tests_optional_modules.patch
new file mode 100644
index 00000000000..d04c300c207
--- /dev/null
+++ b/www-servers/gunicorn/files/gunicorn-20.1.0-tests_optional_modules.patch
@@ -0,0 +1,22 @@
+--- a/tests/workers/test_geventlet.py
++++ b/tests/workers/test_geventlet.py
+@@ -3,5 +3,8 @@
+ # This file is part of gunicorn released under the MIT license.
+ # See the NOTICE for more information.
+
++import pytest
++pytest.importorskip('eventlet')
++
+ def test_import():
+ __import__('gunicorn.workers.geventlet')
+--- a/tests/workers/test_ggevent.py
++++ b/tests/workers/test_ggevent.py
+@@ -3,5 +3,8 @@
+ # This file is part of gunicorn released under the MIT license.
+ # See the NOTICE for more information.
+
++import pytest
++pytest.importorskip('gevent')
++
+ def test_import():
+ __import__('gunicorn.workers.ggevent')
diff --git a/www-servers/gunicorn/gunicorn-20.1.0.ebuild b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
index 7905e095b6e..cb38379151a 100644
--- a/www-servers/gunicorn/gunicorn-20.1.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
@@ -19,17 +19,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-mac
RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.1.0-tests_optional_modules.patch
+)
+
DOCS=( README.rst )
distutils_enable_sphinx 'docs/source' --no-autodoc
distutils_enable_tests pytest
src_prepare() {
- # These fail if respective optional packages have not been installed
- rm -f tests/workers/test_g{eventlet,gevent}.py
-
sed -e 's:--cov=gunicorn --cov-report=xml::' -i setup.cfg || die
-
distutils-r1_src_prepare
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/gunicorn/files/, www-servers/gunicorn/
@ 2021-06-19 12:26 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2021-06-19 12:26 UTC (permalink / raw
To: gentoo-commits
commit: 4430667ae7647b2cc72fa34e7d617824bb8b70ca
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 12:14:47 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 12:26:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4430667a
www-servers/gunicorn: Patch eventlet-related test failures
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/gunicorn-20.1.0-new-eventlet.patch | 31 ++++++++++++++++++++++
www-servers/gunicorn/gunicorn-20.1.0.ebuild | 3 ++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/www-servers/gunicorn/files/gunicorn-20.1.0-new-eventlet.patch b/www-servers/gunicorn/files/gunicorn-20.1.0-new-eventlet.patch
new file mode 100644
index 00000000000..0ba4faffe63
--- /dev/null
+++ b/www-servers/gunicorn/files/gunicorn-20.1.0-new-eventlet.patch
@@ -0,0 +1,31 @@
+From a244b149b15c4417b4f0a4b4a57a1f8c296e968e Mon Sep 17 00:00:00 2001
+From: Daniel Bibik <55541040+Boring-Mind@users.noreply.github.com>
+Date: Mon, 10 May 2021 12:31:29 +0300
+Subject: [PATCH] Fix compatibility with latest eventlet
+
+Fix issue with import error while using latest eventlet (>=0.30.3).
+
+Changes made in eventlet: https://github.com/benoitc/gunicorn/pull/2581
+---
+ gunicorn/workers/geventlet.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py
+index ffdb206c0..06477e74d 100644
+--- a/gunicorn/workers/geventlet.py
++++ b/gunicorn/workers/geventlet.py
+@@ -17,7 +17,13 @@
+
+ from eventlet import hubs, greenthread
+ from eventlet.greenio import GreenSocket
+-from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED
++
++try:
++ from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED
++except ImportError:
++ # Since eventlet 0.30.3
++ from eventlet.wsgi import WSGI_LOCAL as EVENTLET_ALREADY_HANDLED
++
+ import greenlet
+
+ from gunicorn.workers.base_async import AsyncWorker
diff --git a/www-servers/gunicorn/gunicorn-20.1.0.ebuild b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
index 937224d87db..db3c9a31a67 100644
--- a/www-servers/gunicorn/gunicorn-20.1.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..9} )
inherit distutils-r1 optfeature
@@ -22,6 +22,7 @@ RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
PATCHES=(
"${FILESDIR}"/${PN}-20.1.0-tests_optional_modules.patch
+ "${FILESDIR}"/${P}-new-eventlet.patch
)
DOCS=( README.rst )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/gunicorn/files/, www-servers/gunicorn/
@ 2023-08-19 18:19 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2023-08-19 18:19 UTC (permalink / raw
To: gentoo-commits
commit: 181ddd28242e772984a148fadde238597c6757a2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 18:17:36 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 18:17:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=181ddd28
www-servers/gunicorn: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
www-servers/gunicorn/Manifest | 3 --
.../files/gunicorn-20.1.0-new-eventlet.patch | 31 -------------
.../gunicorn-20.1.0-tests_optional_modules.patch | 22 ----------
www-servers/gunicorn/gunicorn-20.1.0-r1.ebuild | 50 ---------------------
www-servers/gunicorn/gunicorn-21.0.1.ebuild | 51 ----------------------
www-servers/gunicorn/gunicorn-21.1.0.ebuild | 51 ----------------------
6 files changed, 208 deletions(-)
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 9cd89a17bf7f..ce58d1b98610 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,4 +1 @@
-DIST gunicorn-20.1.0.gh.tar.gz 354960 BLAKE2B bae414a8da7a4dbdf79e0b46f517138534521a1a8544f4ea2e1e27e6778d2f6ad8d6a8af02590fedad47d305acdea53f1cdbc4deeda3619fc4a5ffef0932bea1 SHA512 4fd905f62adc30e044cf2a56a1a77e14bc633258267d6bfbd4f6a68494f93f377e9fb9ed94fab7f11f9d7813857a680974a88c4b6bf97d4f1b74792a81810111
-DIST gunicorn-21.0.1.gh.tar.gz 361025 BLAKE2B bf6b5dafa5b19f9cafe7556339a2ad264f8abbcaf9c8ccdc958f5019a3935b2a1bc3d56411387c578731f0b517d8f31eeb94087abf9fbf99477727b948bb84a3 SHA512 81081192ad5400f65898a37524ef097a3793aa242028ea30de7b478b605fb14dccdd0eb18d9e8102d8218c33a228143637fec7e02902ceaaa8ce95ea8a2f8be4
-DIST gunicorn-21.1.0.gh.tar.gz 361055 BLAKE2B 77605a60eda72ac73bd80a504821bdb765828655d671ec27b72a1e061367012d45c2ae0347475737a16bc33729e419d2a23022dc14dfbf84c01b3345e486c037 SHA512 269a875bc98bc9b71fba75d212e181074664c8d5a045fdd8ecefb36272106affe66ecce699a5e343c88c8325b3123802ac15af60fac37d0b658cf1f1fb8fe7f9
DIST gunicorn-21.2.0.gh.tar.gz 361112 BLAKE2B 94c868435ecca25d4c83e348bff219d26f53fe28e15d284c00f6f981ee88a5a32e802014b121f1314ec337684fa7bb37fcc21e2ec2aeab4275e526aa84f22677 SHA512 47c21293bd5340e43074c87694d13241b2867437ad993b204ee4bd21ea923350763a424b3f7ce59737b10cd526d12127b1ae95ef60410eca9924605b522d637c
diff --git a/www-servers/gunicorn/files/gunicorn-20.1.0-new-eventlet.patch b/www-servers/gunicorn/files/gunicorn-20.1.0-new-eventlet.patch
deleted file mode 100644
index 0ba4faffe639..000000000000
--- a/www-servers/gunicorn/files/gunicorn-20.1.0-new-eventlet.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a244b149b15c4417b4f0a4b4a57a1f8c296e968e Mon Sep 17 00:00:00 2001
-From: Daniel Bibik <55541040+Boring-Mind@users.noreply.github.com>
-Date: Mon, 10 May 2021 12:31:29 +0300
-Subject: [PATCH] Fix compatibility with latest eventlet
-
-Fix issue with import error while using latest eventlet (>=0.30.3).
-
-Changes made in eventlet: https://github.com/benoitc/gunicorn/pull/2581
----
- gunicorn/workers/geventlet.py | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py
-index ffdb206c0..06477e74d 100644
---- a/gunicorn/workers/geventlet.py
-+++ b/gunicorn/workers/geventlet.py
-@@ -17,7 +17,13 @@
-
- from eventlet import hubs, greenthread
- from eventlet.greenio import GreenSocket
--from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED
-+
-+try:
-+ from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED
-+except ImportError:
-+ # Since eventlet 0.30.3
-+ from eventlet.wsgi import WSGI_LOCAL as EVENTLET_ALREADY_HANDLED
-+
- import greenlet
-
- from gunicorn.workers.base_async import AsyncWorker
diff --git a/www-servers/gunicorn/files/gunicorn-20.1.0-tests_optional_modules.patch b/www-servers/gunicorn/files/gunicorn-20.1.0-tests_optional_modules.patch
deleted file mode 100644
index d04c300c2076..000000000000
--- a/www-servers/gunicorn/files/gunicorn-20.1.0-tests_optional_modules.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/tests/workers/test_geventlet.py
-+++ b/tests/workers/test_geventlet.py
-@@ -3,5 +3,8 @@
- # This file is part of gunicorn released under the MIT license.
- # See the NOTICE for more information.
-
-+import pytest
-+pytest.importorskip('eventlet')
-+
- def test_import():
- __import__('gunicorn.workers.geventlet')
---- a/tests/workers/test_ggevent.py
-+++ b/tests/workers/test_ggevent.py
-@@ -3,5 +3,8 @@
- # This file is part of gunicorn released under the MIT license.
- # See the NOTICE for more information.
-
-+import pytest
-+pytest.importorskip('gevent')
-+
- def test_import():
- __import__('gunicorn.workers.ggevent')
diff --git a/www-servers/gunicorn/gunicorn-20.1.0-r1.ebuild b/www-servers/gunicorn/gunicorn-20.1.0-r1.ebuild
deleted file mode 100644
index 85f53b598bde..000000000000
--- a/www-servers/gunicorn/gunicorn-20.1.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="
- https://gunicorn.org/
- https://github.com/benoitc/gunicorn/
- https://pypi.org/project/gunicorn/
-"
-SRC_URI="
- https://github.com/benoitc/gunicorn/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT PSF-2 doc? ( BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
- dev-python/setproctitle[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.1.0-tests_optional_modules.patch
- "${FILESDIR}"/${P}-new-eventlet.patch
-)
-
-DOCS=( README.rst )
-
-distutils_enable_sphinx 'docs/source' --no-autodoc
-distutils_enable_tests pytest
-
-src_prepare() {
- sed -e 's:--cov=gunicorn --cov-report=xml::' -i setup.cfg || die
- distutils-r1_src_prepare
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/source/_build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/www-servers/gunicorn/gunicorn-21.0.1.ebuild b/www-servers/gunicorn/gunicorn-21.0.1.ebuild
deleted file mode 100644
index e08fbcb4748f..000000000000
--- a/www-servers/gunicorn/gunicorn-21.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="
- https://gunicorn.org/
- https://github.com/benoitc/gunicorn/
- https://pypi.org/project/gunicorn/
-"
-SRC_URI="
- https://github.com/benoitc/gunicorn/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT PSF-2 doc? ( BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/setproctitle[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.rst )
-
-distutils_enable_sphinx 'docs/source' --no-autodoc
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
- # removed deps
- tests/workers/test_geventlet.py
- tests/workers/test_ggevent.py
-)
-
-src_prepare() {
- sed -e 's:--cov=gunicorn --cov-report=xml::' -i setup.cfg || die
- distutils-r1_src_prepare
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/source/_build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/www-servers/gunicorn/gunicorn-21.1.0.ebuild b/www-servers/gunicorn/gunicorn-21.1.0.ebuild
deleted file mode 100644
index e08fbcb4748f..000000000000
--- a/www-servers/gunicorn/gunicorn-21.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="
- https://gunicorn.org/
- https://github.com/benoitc/gunicorn/
- https://pypi.org/project/gunicorn/
-"
-SRC_URI="
- https://github.com/benoitc/gunicorn/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT PSF-2 doc? ( BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/setproctitle[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.rst )
-
-distutils_enable_sphinx 'docs/source' --no-autodoc
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
- # removed deps
- tests/workers/test_geventlet.py
- tests/workers/test_ggevent.py
-)
-
-src_prepare() {
- sed -e 's:--cov=gunicorn --cov-report=xml::' -i setup.cfg || die
- distutils-r1_src_prepare
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/source/_build/html/. )
-
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-19 18:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-19 12:26 [gentoo-commits] repo/gentoo:master commit in: www-servers/gunicorn/files/, www-servers/gunicorn/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-08-19 18:19 Michał Górny
2021-03-15 15:37 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox