Your message dated Mon, 20 Nov 2017 13:26:19 +0000
with message-id
<1511184379.3182773.1178440824.3b833...@webmail.messagingengine.com>
and subject line Re: Bug#881287: python-daiquiri: Add python2 support
has caused the Debian Bug report #881287,
regarding python-daiquiri: Add python2 support
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
881287: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881287
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: python-daiquiri
Version: 1.3.0-1
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu bionic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* d/control, d/rules, d/tests/*: Add python 2 support.
Thanks for considering the patch.
-- System Information:
Debian Release: buster/sid
APT prefers bionic
APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-daiquiri-1.3.0/debian/control
python-daiquiri-1.3.0/debian/control
--- python-daiquiri-1.3.0/debian/control 2017-09-20 03:29:15.000000000
-0400
+++ python-daiquiri-1.3.0/debian/control 2017-11-09 10:17:33.000000000
-0500
@@ -5,6 +5,10 @@
Build-Depends:
debhelper (>= 10),
dh-python,
+ python-all,
+ python-pbr,
+ python-testtools,
+ python-setuptools,
python3-all,
python3-pbr,
python3-testtools,
@@ -15,6 +19,32 @@
Vcs-Browser: https://github.com/lamby/pkg-python-daiquiri
Homepage: https://github.com/jd/daiquiri
+Package: python-daiquiri
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${python:Depends},
+Description: Python library to easily setup basic logging functionality
+ The daiquiri library provides an easy way to configure logging. It also
+ provides some custom formatters and handlers.
+ .
+ Its promise is to setup a complete standard Python logging system with just
+ one function call. Nothing more, nothing less. The interesting features are:
+ .
+ * Logs to stderr by default.
+ * Use colors if logging to a terminal.
+ * Support file logging.
+ * Use program name as the name of the logging file so providing just a
+ directory for logging will work.
+ * Support syslog.
+ * Support journald.
+ * JSON output support.
+ * Support of arbitrary key/value context information providing.
+ * Capture the warnings emitted by the warnings module.
+ * Native logging of any exception.
+ .
+ This is the Python 2 version of the package.
+
Package: python3-daiquiri
Architecture: all
Depends:
diff -Nru python-daiquiri-1.3.0/debian/rules python-daiquiri-1.3.0/debian/rules
--- python-daiquiri-1.3.0/debian/rules 2017-09-20 03:29:15.000000000 -0400
+++ python-daiquiri-1.3.0/debian/rules 2017-11-09 10:17:33.000000000 -0500
@@ -5,7 +5,7 @@
export PBR_VERSION = $(DEB_VERSION_UPSTREAM)
%:
- dh $@ --with python3 --buildsystem=pybuild
+ dh $@ --with python2,python3 --buildsystem=pybuild
override_dh_auto_test:
# Tests require python-json-logger, which is not yet packaged for
diff -Nru python-daiquiri-1.3.0/debian/tests/0001-smoketest
python-daiquiri-1.3.0/debian/tests/0001-smoketest
--- python-daiquiri-1.3.0/debian/tests/0001-smoketest 2017-09-20
03:29:15.000000000 -0400
+++ python-daiquiri-1.3.0/debian/tests/0001-smoketest 1969-12-31
19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-#!/usr/bin/env python3
-
-import daiquiri
-
-daiquiri.setup()
-
-logger = daiquiri.getLogger(__name__)
-
-logger.info("Info")
-logger.warning("Warning")
-logger.error("Error")
diff -Nru python-daiquiri-1.3.0/debian/tests/0001-smoketest-python2
python-daiquiri-1.3.0/debian/tests/0001-smoketest-python2
--- python-daiquiri-1.3.0/debian/tests/0001-smoketest-python2 1969-12-31
19:00:00.000000000 -0500
+++ python-daiquiri-1.3.0/debian/tests/0001-smoketest-python2 2017-11-09
10:17:33.000000000 -0500
@@ -0,0 +1,11 @@
+#!/usr/bin/env python2
+
+import daiquiri
+
+daiquiri.setup()
+
+logger = daiquiri.getLogger(__name__)
+
+logger.info("Info")
+logger.warning("Warning")
+logger.error("Error")
diff -Nru python-daiquiri-1.3.0/debian/tests/0001-smoketest-python3
python-daiquiri-1.3.0/debian/tests/0001-smoketest-python3
--- python-daiquiri-1.3.0/debian/tests/0001-smoketest-python3 1969-12-31
19:00:00.000000000 -0500
+++ python-daiquiri-1.3.0/debian/tests/0001-smoketest-python3 2017-11-09
10:17:33.000000000 -0500
@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+
+import daiquiri
+
+daiquiri.setup()
+
+logger = daiquiri.getLogger(__name__)
+
+logger.info("Info")
+logger.warning("Warning")
+logger.error("Error")
diff -Nru python-daiquiri-1.3.0/debian/tests/control
python-daiquiri-1.3.0/debian/tests/control
--- python-daiquiri-1.3.0/debian/tests/control 2017-09-20 03:29:15.000000000
-0400
+++ python-daiquiri-1.3.0/debian/tests/control 2017-11-09 10:17:33.000000000
-0500
@@ -1,2 +1,2 @@
-Tests: 0001-smoketest
+Tests: 0001-smoketest-python2 0001-smoketest-python3
Restrictions: allow-stderr
--- End Message ---
--- Begin Message ---
Hi Corey,
> Sorry, I don't know how I missed your previous message. If you don't mind I
> don't think we should add the py2 support. I'm fine with that.
Sure; closing this bug to match :)
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` [email protected] / chris-lamb.co.uk
`-
--- End Message ---
