diff -Nru python-tornado-4.5.1/debian/changelog python-tornado-4.5.1/debian/changelog --- python-tornado-4.5.1/debian/changelog 2017-06-20 12:29:13.000000000 -0500 +++ python-tornado-4.5.1/debian/changelog 2017-06-21 01:04:56.000000000 -0500 @@ -1,3 +1,11 @@ +python-tornado (4.5.1-2ubuntu1) artful; urgency=medium + + * Merge from Debian Sid (LP: #1699426). Remaining changes: + - Don't run flaky tests for now. + - Use pymysql as a drop-in replacement for MySQLdb. + + -- Simon Quigley Wed, 21 Jun 2017 01:04:56 -0500 + python-tornado (4.5.1-2) unstable; urgency=medium * Uploading to unstable @@ -13,6 +21,33 @@ -- Ondřej Nový Fri, 12 May 2017 16:23:50 +0200 +python-tornado (4.5.1-0ubuntu1) artful; urgency=medium + + * New upstream release. + + -- Michael Hudson-Doyle Tue, 13 Jun 2017 12:25:22 +1200 + +python-tornado (4.4.3-1ubuntu3) artful; urgency=medium + + * Add support for ensure future and dont run flaky tests for + now. + + -- Bhavani Shankar Tue, 16 May 2017 19:52:25 +0530 + +python-tornado (4.4.3-1ubuntu2) artful; urgency=medium + + * No change rebuild to add Python 3.6 support. + + -- Michael Hudson-Doyle Tue, 16 May 2017 20:19:53 +1200 + +python-tornado (4.4.3-1ubuntu1) artful; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/pymysql-replacement.patch, debian/control: Use pymysql as drop in + replacement for MySQLdb. + + -- Gianfranco Costamagna Sat, 22 Apr 2017 14:56:17 +0200 + python-tornado (4.4.3-1) unstable; urgency=medium * New upstream bugfix release @@ -20,6 +55,14 @@ -- Ondřej Nový Thu, 13 Apr 2017 14:57:17 +0200 +python-tornado (4.4.2-1ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/pymysql-replacement.patch, debian/control: Use pymysql as drop in + replacement for MySQLdb. + + -- Gianfranco Costamagna Tue, 11 Oct 2016 17:57:21 +0200 + python-tornado (4.4.2-1) unstable; urgency=medium * New upstream release. @@ -27,6 +70,14 @@ -- Julien Puydt Fri, 07 Oct 2016 15:58:20 +0200 +python-tornado (4.4.1-2ubuntu1) yakkety; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/patches/pymysql-replacement.patch, debian/control: Use pymysql as drop in + replacement for MySQLdb. + + -- Gianfranco Costamagna Fri, 05 Aug 2016 15:54:41 +0200 + python-tornado (4.4.1-2) unstable; urgency=medium * Prevent internet access during build (Closes: #833351) @@ -35,6 +86,14 @@ -- Ondřej Nový Fri, 05 Aug 2016 15:20:50 +0200 +python-tornado (4.4.1-1ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/pymysql-replacement.patch, debian/control: Use pymysql as drop in + replacement for MySQLdb. + + -- Gianfranco Costamagna Thu, 04 Aug 2016 16:23:57 +0200 + python-tornado (4.4.1-1) unstable; urgency=medium * New upstream release (Closes: #830859) @@ -60,6 +119,35 @@ -- Ondřej Nový Mon, 01 Aug 2016 16:48:24 +0200 +python-tornado (4.3.0-2ubuntu4) yakkety; urgency=medium + + * Restore the ubuntu2 situation, the upstream patch is not fixing + the issue. + + -- Gianfranco Costamagna Mon, 13 Jun 2016 10:37:56 +0200 + +python-tornado (4.3.0-2ubuntu3) yakkety; urgency=medium + + * debian/patches/7ec71d46a83eade88f6d588f8f568f9759676c89.patch: + try to fix the armhf build failure with the official patch. + + -- Gianfranco Costamagna Mon, 13 Jun 2016 10:29:20 +0200 + +python-tornado (4.3.0-2ubuntu2) yakkety; urgency=medium + + * d/p/debian/patches/disable-failing-test.patch: + disable failing test on armhf + + -- Gianfranco Costamagna Mon, 30 May 2016 22:27:26 +0200 + +python-tornado (4.3.0-2ubuntu1) yakkety; urgency=medium + + * Merge from Debian unstable (LP: #1582280). Remaining changes: + - debian/patches/pymysql-replacement.patch, debian/control: Use pymysql as drop in + replacement for MySQLdb. + + -- Gianfranco Costamagna Tue, 24 May 2016 15:11:09 +0200 + python-tornado (4.3.0-2) unstable; urgency=medium [ Ondřej Nový ] @@ -76,6 +164,16 @@ -- Ondřej Nový Tue, 24 May 2016 11:25:26 +0200 +python-tornado (4.3.0-1ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable (LP: #1582280). Remaining changes: + - debian/patches/pymysql-replacement.patch: Use pymysql as drop in + replacement for MySQLdb. + * In Debian now: + - debian/control: Drop python-mysqldb in favor of python-pymysql. + + -- Gianfranco Costamagna Mon, 16 May 2016 17:23:03 +0200 + python-tornado (4.3.0-1) unstable; urgency=medium * New upstream release. @@ -105,6 +203,25 @@ -- Mattia Rizzolo Thu, 28 Apr 2016 08:45:36 +0000 +python-tornado (4.2.1-1ubuntu3) xenial; urgency=medium + + * No-change rebuild to drop python3.4 support. + + -- Matthias Klose Mon, 18 Jan 2016 20:57:20 +0000 + +python-tornado (4.2.1-1ubuntu2) wily; urgency=medium + + * debian/patches/pymysql-replacement.patch: Use pymysql as drop in + replacement for MySQLdb. + + -- Corey Bryant Tue, 25 Aug 2015 10:29:28 -0400 + +python-tornado (4.2.1-1ubuntu1) wily; urgency=medium + + * debian/control: Drop python-mysqldb in favor of python-pymysql. + + -- Corey Bryant Mon, 24 Aug 2015 12:48:35 -0400 + python-tornado (4.2.1-1) unstable; urgency=medium * Team upload. @@ -311,3 +428,4 @@ * Initial release. (Closes: #551520) -- Carl Chenet Sat, 20 Mar 2010 17:38:45 +0100 + diff -Nru python-tornado-4.5.1/debian/control python-tornado-4.5.1/debian/control --- python-tornado-4.5.1/debian/control 2017-06-20 12:24:11.000000000 -0500 +++ python-tornado-4.5.1/debian/control 2017-06-21 01:01:34.000000000 -0500 @@ -3,7 +3,8 @@ X-Python-Version: >= 2.7 X-Python3-Version: >= 3.3 Priority: optional -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Carl Chenet , Yaroslav Halchenko , Julian Taylor , @@ -42,7 +43,7 @@ ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, -Suggests: python-mysqldb, +Suggests: python-pymysql, python-pycurl, python-tornado-doc, python-twisted, diff -Nru python-tornado-4.5.1/debian/patches/pymysql-replacement.patch python-tornado-4.5.1/debian/patches/pymysql-replacement.patch --- python-tornado-4.5.1/debian/patches/pymysql-replacement.patch 1969-12-31 18:00:00.000000000 -0600 +++ python-tornado-4.5.1/debian/patches/pymysql-replacement.patch 2017-06-21 01:02:52.000000000 -0500 @@ -0,0 +1,16 @@ +Description: Use pymysql as a drop-in replacement for MySQLdb. +Author: Corey Bryant +Forwarded: not-needed + +--- a/demos/blog/blog.py ++++ b/demos/blog/blog.py +@@ -14,6 +14,9 @@ + # License for the specific language governing permissions and limitations + # under the License. + ++import pymysql ++pymysql.install_as_MySQLdb() ++ + import bcrypt + import concurrent.futures + import MySQLdb diff -Nru python-tornado-4.5.1/debian/patches/series python-tornado-4.5.1/debian/patches/series --- python-tornado-4.5.1/debian/patches/series 2017-05-12 09:13:44.000000000 -0500 +++ python-tornado-4.5.1/debian/patches/series 2017-06-21 01:03:28.000000000 -0500 @@ -5,3 +5,5 @@ without-certifi.patch fix-ftbfs-on-hurd.patch 0007-Use-local-objects.inv-for-intersphinx-mapping.patch +skip-flaky-tests-ubuntu.patch +pymysql-replacement.patch diff -Nru python-tornado-4.5.1/debian/patches/skip-flaky-tests-ubuntu.patch python-tornado-4.5.1/debian/patches/skip-flaky-tests-ubuntu.patch --- python-tornado-4.5.1/debian/patches/skip-flaky-tests-ubuntu.patch 1969-12-31 18:00:00.000000000 -0600 +++ python-tornado-4.5.1/debian/patches/skip-flaky-tests-ubuntu.patch 2017-06-21 01:04:13.000000000 -0500 @@ -0,0 +1,23 @@ +Description: Skip flaky tests on ubuntu buildds for now. +Author: Bhavani Shankar + +--- a/tornado/test/gen_test.py ++++ b/tornado/test/gen_test.py +@@ -1391,6 +1391,7 @@ + + @skipBefore35 + @gen_test ++ @unittest.skip('Skip test for now on ubuntu buildds') + def test_iterator_async_await(self): + # Recreate the previous test with py35 syntax. It's a little clunky + # because of the way the previous test handles an exception on +--- a/tornado/test/queues_test.py ++++ b/tornado/test/queues_test.py +@@ -158,6 +158,7 @@ + + @skipBefore35 + @gen_test ++ @unittest.skip('skip test for now on ubuntu buildds') + def test_async_for(self): + q = queues.Queue() + for i in range(5):