Control: tags 936194 + patch

Dear maintainer,

I've prepared an NMU for beanbag (versioned as 1.9.2-1.2). The diff
is attached to this message.

I've uploaded directly to unstable as it fixes an RC bug opened 2+ years ago.

Regards.

diff -Nru beanbag-1.9.2/debian/changelog beanbag-1.9.2/debian/changelog
--- beanbag-1.9.2/debian/changelog	2017-03-09 07:17:47.000000000 -0500
+++ beanbag-1.9.2/debian/changelog	2019-10-17 20:02:39.000000000 -0400
@@ -1,3 +1,12 @@
+beanbag (1.9.2-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop python2 support; Closes: #936194
+  * debian/patches/python-3.6-compat
+    - fix compatibility with python 3.6+, patch by Logan Rosen; Closes: #867504
+
+ -- Sandro Tosi <mo...@debian.org>  Thu, 17 Oct 2019 20:02:39 -0400
+
 beanbag (1.9.2-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru beanbag-1.9.2/debian/control beanbag-1.9.2/debian/control
--- beanbag-1.9.2/debian/control	2017-03-09 07:17:47.000000000 -0500
+++ beanbag-1.9.2/debian/control	2019-10-17 19:57:20.000000000 -0400
@@ -2,21 +2,11 @@
 Maintainer: Anthony Towns <a...@debian.org>
 Section: python
 Priority: optional
-Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9), dh-python, python3-all, python3-setuptools, python-docutils, python-sphinx (>= 1.1), python-pytest, python3-pytest, python-requests, python3-requests
+Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools, python3-docutils, python3-sphinx, python3-pytest, python3-requests
 Standards-Version: 3.9.8
 Vcs-Git: https://github.com/ajtowns/beanbag.git
 Homepage: https://pypi.python.org/pypi/beanbag
 
-Package: python-beanbag
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
-Suggests: python-beanbag-doc, python-requests-oauthlib
-Description: Helper module for accessing REST APIs - python2
- BeanBag is a simple module that lets you access REST APIs in an easy
- way. See `http://beanbag.readthedocs.org/` for more information.
- .
- This package installs the library for Python 2.
-
 Package: python3-beanbag
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
diff -Nru beanbag-1.9.2/debian/patches/python-3.6-compat beanbag-1.9.2/debian/patches/python-3.6-compat
--- beanbag-1.9.2/debian/patches/python-3.6-compat	1969-12-31 19:00:00.000000000 -0500
+++ beanbag-1.9.2/debian/patches/python-3.6-compat	2019-10-17 20:02:25.000000000 -0400
@@ -0,0 +1,27 @@
+Description: Fix failing unit tests with Python 3.6+
+Author: Charalampos Stratakis <cstra...@redhat.com>
+Bug: https://github.com/ajtowns/beanbag/pull/10
+Last-Update: 2019-01-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/beanbag/namespace.py
++++ b/beanbag/namespace.py
+@@ -102,6 +102,9 @@
+             basebases = (NamespaceBase,)
+ 
+         qn = None
++
++        classcell = nmspc.pop('__classcell__', None)
++
+         if "__qualname__" in nmspc:
+             qn = nmspc["__qualname__"]
+             nmspc["__qualname__"] = qn + "Base"
+@@ -114,6 +117,8 @@
+             conv_nmspc["__module__"] = nmspc["__module__"]
+         if qn is not None:
+             conv_nmspc["__qualname__"] = qn
++        if classcell is not None:
++            conv_nmspc['__classcell__'] = classcell
+ 
+         cls = type.__new__(mcls, name, bases, conv_nmspc)
+         basecls.Namespace = cls
diff -Nru beanbag-1.9.2/debian/patches/series beanbag-1.9.2/debian/patches/series
--- beanbag-1.9.2/debian/patches/series	2017-03-09 07:17:47.000000000 -0500
+++ beanbag-1.9.2/debian/patches/series	2019-10-17 20:02:25.000000000 -0400
@@ -1 +1,2 @@
 fix-code-in-example-file
+python-3.6-compat
diff -Nru beanbag-1.9.2/debian/rules beanbag-1.9.2/debian/rules
--- beanbag-1.9.2/debian/rules	2017-03-09 07:13:28.000000000 -0500
+++ beanbag-1.9.2/debian/rules	2019-10-17 19:57:30.000000000 -0400
@@ -4,7 +4,7 @@
 export PYBUILD_TEST_PYTEST = 1
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
 	dh_auto_build

Reply via email to