Package: python-gevent
Version: 20.9.0-2
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for python-gevent (versioned as 20.9.0-2.1) which fixes
the serious bug "python-gevent build-depends on removed package" and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Like Sandro Tosi, I invite you to consider maintaining this package under Debian
Python Team.
Regards.
diff -Nru python-gevent-20.9.0/debian/changelog
python-gevent-20.9.0/debian/changelog
--- python-gevent-20.9.0/debian/changelog 2021-03-02 06:55:02.000000000
+0100
+++ python-gevent-20.9.0/debian/changelog 2021-10-08 13:32:45.000000000
+0200
@@ -1,3 +1,13 @@
+python-gevent (20.9.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix upstream GitHub archive links
+ * No longer manually build a -dbg package. Closes: #995138, #994354
+ * debian/patches/drop_mysphinxext: cherry-picked from upstream, fixes a
+ FTBFS.
+
+ -- Michael R. Crusoe <cru...@debian.org> Fri, 08 Oct 2021 13:32:45 +0200
+
python-gevent (20.9.0-2) unstable; urgency=medium
* Fix dh_installdocs invocation in arch target (closes: #983825).
diff -Nru python-gevent-20.9.0/debian/control
python-gevent-20.9.0/debian/control
--- python-gevent-20.9.0/debian/control 2021-01-05 20:03:08.000000000 +0100
+++ python-gevent-20.9.0/debian/control 2021-10-08 13:32:45.000000000 +0200
@@ -5,14 +5,13 @@
dh-exec,
libevent-dev (>= 1.4),
python3-greenlet,
- python3-greenlet-dbg,
python3-setuptools,
- python3-cffi, python3-cffi-backend-dbg,
- python3-all-dev, python3-all-dbg, python3-greenlet (>= 0.4.15),
+ python3-cffi,
+ python3-all-dev, python3-greenlet (>= 0.4.15),
python3-repoze.sphinx.autointerface,
python3-sphinx,
python3-sphinxcontrib.programoutput,
- cython3, cython3-dbg,
+ cython3,
libev-dev, libc-ares-dev, libuv1-dev
Standards-Version: 4.5.1
Section: python
@@ -35,20 +34,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends},
python3-greenlet
Provides: ${python3:Provides}
XB-Python-Version: ${python3:Versions}
-Suggests: python-gevent-doc, python3-gevent-dbg, python3-openssl
+Suggests: python-gevent-doc, python3-openssl
Description: gevent is a coroutine-based Python networking library
gevent uses greenlet to provide a high-level synchronous API on top of
libevent event loop.
-
-Package: python3-gevent-dbg
-Section: debug
-Architecture: any
-Depends: ${misc:Depends}, python3-gevent (= ${binary:Version}),
${shlibs:Depends}, ${python3:Depends},
- python3-greenlet-dbg
-Provides: ${python3:Provides}
-XB-Python-Version: ${python3:Versions}
-Description: gevent is a coroutine-based Python networking library - debugging
symbols
- gevent uses greenlet to provide a high-level synchronous API on top of
- libevent event loop.
- .
- This is the debugging symbols for gevent.
diff -Nru python-gevent-20.9.0/debian/patches/drop_mysphinxext
python-gevent-20.9.0/debian/patches/drop_mysphinxext
--- python-gevent-20.9.0/debian/patches/drop_mysphinxext 1970-01-01
01:00:00.000000000 +0100
+++ python-gevent-20.9.0/debian/patches/drop_mysphinxext 2021-10-08
13:32:45.000000000 +0200
@@ -0,0 +1,107 @@
+From 46b32bc7d34adb0df063eaca579c7a2164a76cc9 Mon Sep 17 00:00:00 2001
+From: Jason Madden <jamad...@gmail.com>
+Date: Tue, 8 Dec 2020 05:39:11 -0600
+Subject: [PATCH] Remove mysphinxext.py. It seemed unused. (Fixes a FTBFS)
+
+Bumping its 'noisy' value up, while there were plenty of missing-reference
+events it got called for, it never actually printed the line that showed it
+resolved something.
+
+--- python-gevent.orig/docs/conf.py
++++ python-gevent/docs/conf.py
+@@ -19,8 +19,6 @@
+ # for better documentation extraction and ease of tweaking docs.
+ os.environ['PURE_PYTHON'] = '1'
+
+-sys.path.append(os.path.dirname(__file__)) # for mysphinxext
+-
+ # If extensions (or modules to document with autodoc) are in another
directory,
+ # add these directories to sys.path here. If the directory is relative to the
+ # documentation root, use os.path.abspath to make it absolute, like shown
here.
+@@ -45,9 +43,6 @@
+ # Third-party
+ 'repoze.sphinx.autointerface',
+ 'sphinxcontrib.programoutput',
+-
+- # Ours
+- 'mysphinxext',
+ ]
+
+ intersphinx_mapping = {
+--- python-gevent.orig/docs/mysphinxext.py
++++ /dev/null
+@@ -1,74 +0,0 @@
+-from __future__ import print_function
+-from sphinx.ext.autodoc import cut_lines
+-from sphinx.ext import intersphinx
+-from docutils import nodes
+-
+-noisy = 0
+-message_cache = set()
+-
+-
+-def missing_reference(app, env, node, contnode):
+- """Search the index for missing references.
+- For example, resolve :class:`Event` to :class:`Event
<gevent.event.Event>`"""
+- # XXX methods and functions resolved by this function miss their ()
+-
+- if intersphinx.missing_reference(app, env, node, contnode) is not None:
+- # is there a better way to give intersphinx a bigger priority?
+- return
+-
+- env = app.builder.env
+-
+- type = node['reftype']
+- target = node['reftarget']
+- modname = node.get('py:module')
+- classname = node.get('py:class')
+-
+- if modname and classname:
+- return
+-
+- def new_reference(refuri, reftitle):
+- newnode = nodes.reference('', '')
+- newnode['refuri'] = refuri
+- newnode['reftitle'] = reftitle
+- newnode['py:class'] = 'external-xref'
+- newnode['classname'] = 'external-xref'
+- newnode.append(contnode)
+- msg = 'Resolved missing-reference: :%5s:`%s` -> %s' % (type, target,
refuri)
+- if noisy >= 1 or msg not in message_cache:
+- print(msg)
+- message_cache.add(msg)
+- return newnode
+-
+- if noisy >= 1:
+- print('Looking for %s' % [type, target, modname, classname])
+- print(node)
+-
+- for docname, items in env.indexentries.items():
+- if noisy >= 2:
+- print(docname)
+- for _x in items:
+- if noisy >= 4:
+- print(_x)
+- (i_type, i_string, i_target, i_aliasname) = _x[:4]
+- if noisy >= 3:
+- print('---', [i_type, i_string, i_target, i_aliasname])
+- if i_aliasname.endswith(target):
+- stripped_aliasname = i_aliasname[len(docname):]
+- if stripped_aliasname:
+- assert stripped_aliasname[0] == '.',
repr(stripped_aliasname)
+- stripped_aliasname = stripped_aliasname[1:]
+- if stripped_aliasname == target:
+- if noisy >= 1:
+- print('--- found %s %s in %s' % (type, target,
i_aliasname))
+- return new_reference(docname + '.html#' +
i_aliasname, i_aliasname)
+-
+- if type == 'mod':
+- modules = [x for x in env.indexentries.keys() if
x.startswith('gevent.')]
+- target = 'gevent.' + target
+- if target in modules:
+- return new_reference(target + '.html', target)
+-
+-
+-def setup(app):
+- app.connect('missing-reference', missing_reference)
+- app.connect('autodoc-process-docstring', cut_lines(2, what=['module']))
diff -Nru python-gevent-20.9.0/debian/patches/series
python-gevent-20.9.0/debian/patches/series
--- python-gevent-20.9.0/debian/patches/series 2018-07-22 15:55:09.000000000
+0200
+++ python-gevent-20.9.0/debian/patches/series 2021-10-08 13:32:45.000000000
+0200
@@ -1,2 +1,3 @@
use-local-intersphinx-inventory.patch
fix-Hurd-FTBFS.patch
+drop_mysphinxext
diff -Nru python-gevent-20.9.0/debian/python3-gevent-dbg.install
python-gevent-20.9.0/debian/python3-gevent-dbg.install
--- python-gevent-20.9.0/debian/python3-gevent-dbg.install 2019-10-27
08:45:10.000000000 +0100
+++ python-gevent-20.9.0/debian/python3-gevent-dbg.install 1970-01-01
01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-#! /usr/bin/dh-exec
-usr/lib/python3*/*-packages/gevent/*.cpython-*d*-${DEB_HOST_MULTIARCH}.so
-usr/lib/python3*/*-packages/gevent/libev/*.cpython-*d*-${DEB_HOST_MULTIARCH}.so
-usr/lib/python3*/*-packages/gevent/resolver/*.cpython-*d*-${DEB_HOST_MULTIARCH}.so
diff -Nru python-gevent-20.9.0/debian/rules python-gevent-20.9.0/debian/rules
--- python-gevent-20.9.0/debian/rules 2021-03-02 04:07:52.000000000 +0100
+++ python-gevent-20.9.0/debian/rules 2021-10-08 13:32:45.000000000 +0200
@@ -57,19 +57,13 @@
dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv
override_dh_strip:
-ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
- dh_strip -p python3-gevent --dbg-package=python3-gevent-dbg
-endif
+ dh_strip -p python3-gevent --dbgsym-migration='python3-gevent-dbg (<<
20.9.0-2~)'
# TODO: check for failures, but disable for now
override_dh_auto_test:
# chmod +x $(CURDIR)/src/greentest/testrunner.py
# cd $(CURDIR)/src/greentest && PYTHONPATH=../.. ./testrunner.py
-override_dh_installdocs-arch:
- dh_installdocs -ppython3-gevent-dbg --link-doc=python3-gevent
- dh_installdocs -a
-
override_dh_installdocs-indep:
dh_installdocs -i
# remove privacy tracking links
diff -Nru python-gevent-20.9.0/debian/watch python-gevent-20.9.0/debian/watch
--- python-gevent-20.9.0/debian/watch 2014-02-01 21:15:44.000000000 +0100
+++ python-gevent-20.9.0/debian/watch 2021-10-08 13:32:45.000000000 +0200
@@ -1,4 +1,3 @@
-version=3
+version=4
opts=uversionmangle=s/(\d)[\.\-]?((?:rc|RC|pre)\.?\d+(?:-\d+)?)$/$1~$2/;s/^((?:\d+\.)*\d+)([ab]\d*)$/$1~$2/
\
-https://github.com/surfly/gevent/tags \
-.*/archive/(?:upstream/)?(?:v||version-|release-|X|R)(\d\S*)\.tar\.gz
+https://github.com/surfly/gevent/releases (?:.*?/)?v?(\d[\d.]*)\.tar\.gz
