diff -Nru pytest-tornado-0.4.5/debian/changelog pytest-tornado-0.5.0/debian/changelog --- pytest-tornado-0.4.5/debian/changelog 2018-02-19 16:20:37.000000000 +0000 +++ pytest-tornado-0.5.0/debian/changelog 2018-04-26 09:57:14.000000000 +0000 @@ -1,3 +1,35 @@ +pytest-tornado (0.5.0-1) unstable; urgency=medium + + * New upstream release 0.5.0 + * Drop old d/p/0001. + * Add d/p/0001 to replace a deprecated generator-based test by a + parametrized one. + * d/control: + - Bump Standards-Version to 4.1.4. No change required. + + -- Pierre-Elliott Bécue Thu, 26 Apr 2018 11:57:14 +0200 + +pytest-tornado (0.4.5-3) unstable; urgency=medium + + [ Ondřej Nový ] + * d/control: Remove Testsuite field, not needed anymore + + [ Pierre-Elliott Bécue ] + * d/control: + + Adopted the package. Closes: #868847 + + wrap-and-sort-ed + + Bump debhelper version dependency to 11~ + + Bump Standards-Version to 4.1.3 + + Drop X-Python(|3)-Version tags as they're unneeded + * d/compat: bump compat level to 11 + * d/watch: use uscan special tags and bump bersion to 4 + * d/patches/: add patch 0001 to take into account the evolutions in tornado + 5.0. Closes: #893293 + * d/copyright: + + Add myself to debian/* + + -- Pierre-Elliott Bécue Mon, 26 Mar 2018 10:12:33 +0200 + pytest-tornado (0.4.5-2) unstable; urgency=medium * Orphan package: diff -Nru pytest-tornado-0.4.5/debian/compat pytest-tornado-0.5.0/debian/compat --- pytest-tornado-0.4.5/debian/compat 2018-02-19 16:18:27.000000000 +0000 +++ pytest-tornado-0.5.0/debian/compat 2018-04-26 09:57:14.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru pytest-tornado-0.4.5/debian/control pytest-tornado-0.5.0/debian/control --- pytest-tornado-0.4.5/debian/control 2018-02-19 16:19:11.000000000 +0000 +++ pytest-tornado-0.5.0/debian/control 2018-04-26 09:57:14.000000000 +0000 @@ -1,32 +1,27 @@ Source: pytest-tornado +Maintainer: Debian Python Modules Team +Uploaders: Pierre-Elliott Bécue Section: python Priority: optional -Maintainer: Debian QA Group -Build-Depends: - debhelper (>= 9), - dh-python, - python-all, - python-setuptools, - python-pytest, - python-tornado, - python3-all, - python3-setuptools, - python3-pytest, - python3-tornado, - pandoc -Standards-Version: 3.9.7 +Build-Depends: debhelper (>= 11~), + dh-python, + pandoc, + python-all, + python-pytest, + python-setuptools, + python-tornado, + python3-all, + python3-pytest, + python3-setuptools, + python3-tornado +Standards-Version: 4.1.4 Homepage: https://github.com/eugeniy/pytest-tornado Vcs-Git: https://salsa.debian.org/python-team/modules/pytest-tornado.git Vcs-Browser: https://salsa.debian.org/python-team/modules/pytest-tornado -X-Python-Version: >= 2.6 -X-Python3-Version: >= 3.3 -Testsuite: autopkgtest Package: python-pytest-tornado Architecture: all -Depends: - ${misc:Depends}, - ${python:Depends} +Depends: ${misc:Depends}, ${python:Depends} Description: py.test plugin to test Tornado applications pytest-tornado is a plugin for the Pytest testing framework which provides fixtures and markers to simplify testing of Tornado applications @@ -36,9 +31,7 @@ Package: python3-pytest-tornado Architecture: all -Depends: - ${misc:Depends}, - ${python3:Depends} +Depends: ${misc:Depends}, ${python3:Depends} Description: py.test plugin to test Tornado applications (Python 3) pytest-tornado is a plugin for the Pytest testing framework which provides fixtures and markers to simplify testing of Tornado applications diff -Nru pytest-tornado-0.4.5/debian/copyright pytest-tornado-0.5.0/debian/copyright --- pytest-tornado-0.4.5/debian/copyright 2018-02-19 16:18:27.000000000 +0000 +++ pytest-tornado-0.5.0/debian/copyright 2018-04-26 09:57:14.000000000 +0000 @@ -9,6 +9,7 @@ Files: debian/* Copyright: 2015-2017 Daniel Stender + 2018 Pierre-Elliott Bécue License: Apache-2.0 License: Apache-2.0 diff -Nru pytest-tornado-0.4.5/debian/patches/0001-Replace-a-generator-based-test-by-a-parametrized-one.patch pytest-tornado-0.5.0/debian/patches/0001-Replace-a-generator-based-test-by-a-parametrized-one.patch --- pytest-tornado-0.4.5/debian/patches/0001-Replace-a-generator-based-test-by-a-parametrized-one.patch 1970-01-01 00:00:00.000000000 +0000 +++ pytest-tornado-0.5.0/debian/patches/0001-Replace-a-generator-based-test-by-a-parametrized-one.patch 2018-04-26 09:57:14.000000000 +0000 @@ -0,0 +1,28 @@ +From: =?utf-8?q?Pierre-Elliott_B=C3=A9cue?= +Date: Mon, 26 Mar 2018 11:12:33 +0200 +Subject: Replace a generator-based test by a parametrized one + +--- + pytest_tornado/test/test_async.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pytest_tornado/test/test_async.py b/pytest_tornado/test/test_async.py +index 53a8e60..94242d2 100644 +--- a/pytest_tornado/test/test_async.py ++++ b/pytest_tornado/test/test_async.py +@@ -76,12 +76,12 @@ def test_sync_tests_no_gen_test_marker(request): + assert 'gen_test' not in request.keywords + + +-def test_generators_with_disabled_gen_test_marker(): ++@pytest.mark.parametrize("i", range(3)) ++def test_generators_with_disabled_gen_test_marker(i): + def _dummy(a, b): + assert a*3 == b + +- for i in range(3): +- yield _dummy, i, i*3 ++ _dummy(i, i*3) + + + class TestClass: diff -Nru pytest-tornado-0.4.5/debian/patches/series pytest-tornado-0.5.0/debian/patches/series --- pytest-tornado-0.4.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ pytest-tornado-0.5.0/debian/patches/series 2018-04-26 09:57:14.000000000 +0000 @@ -0,0 +1 @@ +0001-Replace-a-generator-based-test-by-a-parametrized-one.patch diff -Nru pytest-tornado-0.4.5/debian/watch pytest-tornado-0.5.0/debian/watch --- pytest-tornado-0.4.5/debian/watch 2018-02-19 16:18:27.000000000 +0000 +++ pytest-tornado-0.5.0/debian/watch 2018-04-26 09:57:14.000000000 +0000 @@ -1,3 +1,3 @@ -version=3 +version=4 opts="filenamemangle=s/(?:.*\/)?v(\d[\d\.]+)\.tar\.gz/pytest-tornado-$1.tar.gz/" \ -https://github.com/eugeniy/pytest-tornado/releases (?:.*/)?v(\d[\d\.]+)\.tar\.gz +https://github.com/eugeniy/@PACKAGE@/releases (?:.*/)?v(\d[\d\.]+)\.tar\.gz diff -Nru pytest-tornado-0.4.5/pytest_tornado/plugin.py pytest-tornado-0.5.0/pytest_tornado/plugin.py --- pytest-tornado-0.4.5/pytest_tornado/plugin.py 2016-02-22 19:55:54.000000000 +0000 +++ pytest-tornado-0.5.0/pytest_tornado/plugin.py 2018-04-21 19:13:14.000000000 +0000 @@ -133,9 +133,7 @@ def _close(): io_loop.clear_current() - if (not tornado.ioloop.IOLoop.initialized() or - io_loop is not tornado.ioloop.IOLoop.instance()): - io_loop.close(all_fds=True) + io_loop.close(all_fds=True) request.addfinalizer(_close) return io_loop @@ -171,7 +169,7 @@ FixtureLookupError: tornado application fixture not found """ http_app = request.getfuncargvalue(request.config.option.app_fixture) - server = tornado.httpserver.HTTPServer(http_app, io_loop=io_loop) + server = tornado.httpserver.HTTPServer(http_app) server.add_socket(_unused_port[0]) def _stop(): @@ -189,12 +187,10 @@ def http_client(request, http_server): """Get an asynchronous HTTP client. """ - client = tornado.httpclient.AsyncHTTPClient(io_loop=http_server.io_loop) + client = tornado.httpclient.AsyncHTTPClient() def _close(): - if (not tornado.ioloop.IOLoop.initialized() or - client.io_loop is not tornado.ioloop.IOLoop.instance()): - client.close() + client.close() request.addfinalizer(_close) return client diff -Nru pytest-tornado-0.4.5/pytest_tornado/test/test_server.py pytest-tornado-0.5.0/pytest_tornado/test/test_server.py --- pytest-tornado-0.4.5/pytest_tornado/test/test_server.py 2016-02-22 19:55:54.000000000 +0000 +++ pytest-tornado-0.5.0/pytest_tornado/test/test_server.py 2018-04-21 19:13:14.000000000 +0000 @@ -25,15 +25,15 @@ functools.partial(http_client.fetch, url)) -def test_http_server(http_server): +def test_http_server(http_server, io_loop): status = {'done': False} def _done(): status['done'] = True - http_server.io_loop.stop() + io_loop.stop() - http_server.io_loop.add_callback(_done) - http_server.io_loop.start() + io_loop.add_callback(_done) + io_loop.start() assert status['done'] diff -Nru pytest-tornado-0.4.5/setup.py pytest-tornado-0.5.0/setup.py --- pytest-tornado-0.4.5/setup.py 2016-02-22 19:55:54.000000000 +0000 +++ pytest-tornado-0.5.0/setup.py 2018-04-21 19:13:14.000000000 +0000 @@ -11,7 +11,7 @@ setup( name='pytest-tornado', - version='0.4.5', + version='0.5.0', description=('A py.test plugin providing fixtures and markers ' 'to simplify testing of asynchronous tornado applications.'), long_description=long_description, @@ -34,7 +34,7 @@ keywords=('pytest py.test tornado async asynchronous ' 'testing unit tests plugin'), packages=find_packages(), - install_requires=['pytest', 'tornado'], + install_requires=['pytest', 'tornado>=4'], entry_points={ 'pytest11': ['tornado = pytest_tornado.plugin'], }, diff -Nru pytest-tornado-0.4.5/.travis.yml pytest-tornado-0.5.0/.travis.yml --- pytest-tornado-0.4.5/.travis.yml 2016-02-22 19:55:54.000000000 +0000 +++ pytest-tornado-0.5.0/.travis.yml 2018-04-21 19:13:14.000000000 +0000 @@ -3,13 +3,13 @@ - 2.7 - 3.4 - 3.5 + - 3.6 env: + - TORNADO_VERSION=5.0 PYTEST_VERSION=3.4.2 - TORNADO_VERSION=4.3 PYTEST_VERSION=2.8.6 - TORNADO_VERSION=4.1 PYTEST_VERSION=2.8.6 - TORNADO_VERSION=4.1 PYTEST_VERSION=2.7.0 - TORNADO_VERSION=4.1 PYTEST_VERSION=2.6.4 - - TORNADO_VERSION=3.2.2 PYTEST_VERSION=2.6.4 - - TORNADO_VERSION=3.2.2 PYTEST_VERSION=2.5.2 install: - pip install -q tornado==$TORNADO_VERSION pytest==$PYTEST_VERSION - python setup.py install @@ -17,16 +17,20 @@ matrix: exclude: - python: 3.5 - env: TORNADO_VERSION=3.2.2 PYTEST_VERSION=2.6.4 - - python: 3.5 - env: TORNADO_VERSION=3.2.2 PYTEST_VERSION=2.5.2 - - python: 3.5 env: TORNADO_VERSION=4.1 PYTEST_VERSION=2.6.4 - python: 3.5 - env: TORNADO_VERSION=4.1 PYTEST_VERSION=2.5.2 - - python: 3.5 + env: TORNADO_VERSION=4.1 PYTEST_VERSION=2.7.0 + - python: 3.6 + env: TORNADO_VERSION=4.1 PYTEST_VERSION=2.6.4 + - python: 3.6 env: TORNADO_VERSION=4.1 PYTEST_VERSION=2.7.0 script: - - py.test --strict --cov=pytest_tornado/plugin.py --cov-report=term-missing -after_success: - - coveralls + - py.test --strict +deploy: + provider: pypi + distributions: "sdist bdist_wheel" + user: eugeniy + password: + secure: gmpsfekSDT9LuF3XkJK64myhQ6Xg8WyqI/0m5Gnnb+hSrCFGD8/dgtRdLEULuDkFPvL/FsoE2L6XcdKuqaKkqSM3kk4Min8hqGapcfe/OSOkCDaYSUBCXmV2dlbtMTAzHfo3zpueToUelZvblw9y3wXVFWkmr1mf47Q9kUPIgnU= + on: + tags: true