[Python-modules-commits] [dnspython] 02/02: change version to 1.13.0-3 (UNRELEASED) Add patch in tests/test_resolver.py to check if the Internet is reachable and to skip tests that require it if it is not

Scott Kitterman kitterman at moszumanska.debian.org
Sat May 28 07:11:40 UTC 2016


This is an automated email from the git hooks/post-receive script.

kitterman pushed a commit to branch master
in repository dnspython.

commit 25db6a56556a86f64394bf5144cf38102b7477d8
Merge: 8e71fe4 0f139ac
Author: Scott Kitterman <scott at kitterman.com>
Date:   Sat May 28 02:57:35 2016 -0400

    change version to 1.13.0-3 (UNRELEASED)
    Add patch in tests/test_resolver.py to check if the Internet is reachable
    and to skip tests that require it if it is not

 debian/.git-dpm                                    |  4 +-
 debian/changelog                                   |  7 +++
 ...sts-in-tests-test_resolver.py-that-requir.patch | 59 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/test_resolver.py                             | 12 +++++
 5 files changed, 81 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index d0fbdd6,0000000..21aecf2
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 8d7a975dc0c58a57c155726305be922a7b5cb134
- 8d7a975dc0c58a57c155726305be922a7b5cb134
++0f139acf0ac1568cede0d7058354a085710c7740
++0f139acf0ac1568cede0d7058354a085710c7740
 +8d7a975dc0c58a57c155726305be922a7b5cb134
 +8d7a975dc0c58a57c155726305be922a7b5cb134
 +dnspython_1.13.0.orig.tar.gz
 +b8b1190fdfdd19aeda0e1af1db5ac69a8a796903
 +136105
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index a5bdc16,0000000..f22c38c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,158 -1,0 +1,165 @@@
++dnspython (1.13.0-3) UNRELEASED; urgency=medium
++
++  * Add patch in tests/test_resolver.py to check if the Internet is reachable
++    and to skip tests that require it if it is not
++
++ -- Scott Kitterman <scott at kitterman.com>  Sat, 28 May 2016 02:57:35 -0400
++
 +dnspython (1.13.0-2) unstable; urgency=medium
 +
 +  * Revert disabling of zone tests
 +  * Add netbase to build-depends to provide /etc/protocols so zone tests will
 +    work
 +
 + -- Scott Kitterman <scott at kitterman.com>  Wed, 25 May 2016 11:11:52 -0400
 +
 +dnspython (1.13.0-1) unstable; urgency=medium
 +
 +  [ Ondřej Nový ]
 +  * Fixed VCS URL (https)
 +
 +  [ Scott Kitterman ]
 +  * New upstream release (Closes: #823456)
 +    - Bump minimum python3 version to 3.3
 +    - Add python/python3-setuptools to build-depends
 +    - Delete obsolete debian/docs file
 +  * Build python3-dnspython for dnspython source instead of from dedicated
 +    dnspython3 source
 +    - Add Matthew Grant to dnspython uploaders
 +    - Migrate python3 related dnspython3 entries for debian/control
 +    - Update debian/rules to use dh_python3 and pybuild
 +    - Set PYBUILD_NAME=dnspython in debian/rules
 +    - Use binary specific examples files for multi-binary package
 +  * Bump standards version to 3.9.8 without further change
 +  * Delete obsolete debian/source/options file
 +  * Temporarily disable non-working zone tests.
 +
 + -- Scott Kitterman <scott at kitterman.com>  Wed, 25 May 2016 02:13:01 -0400
 +
 +dnspython (1.12.0-1) unstable; urgency=medium
 +
 +  * New upstream release
 +  * Add explicit build-dep on dh-python to make use of the newer version
 +
 + -- Scott Kitterman <scott at kitterman.com>  Sun, 14 Sep 2014 22:46:43 -0400
 +
 +dnspython (1.11.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Bump standards version to 3.9.5 without further change
 +
 + -- Scott Kitterman <scott at kitterman.com>  Wed, 06 Nov 2013 01:57:34 -0500
 +
 +dnspython (1.11.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Agreed maintainer switch to DPMT
 +    - Add Vcs-* fields to debian/control
 +  * Bump minimum debhelper version to 8.1 and compat to 8 for build-arch/indep
 +    support
 +  * Bump standards version to 3.9.4 without further change
 +
 + -- Scott Kitterman <scott at kitterman.com>  Wed, 17 Jul 2013 02:49:46 -0400
 +
 +dnspython (1.10.0-1) unstable; urgency=low
 +
 +  * Add myself to uploaders
 +  * New upstream release.
 +    - Remove TODO from debian/docs since it no longer exists.
 +  * Switch to dh_python2. (Closes: #671406, #599911)
 +    - Bump minimum python-all build-depends version to 2.6.6-3~.
 +    - Drop build-depends on python-support.
 +    - Build --with python2.
 +  * Bump standards version to 3.9.3 without further change.
 +  * Add Homepage: field to debian/control.
 +
 + -- Scott Kitterman <scott at kitterman.com>  Mon, 04 Jun 2012 15:38:45 -0400
 +
 +dnspython (1.9.4-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Robert S. Edmonds <edmonds at debian.org>  Sun, 06 Nov 2011 15:04:19 -0500
 +
 +dnspython (1.8.0-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Robert S. Edmonds <edmonds at debian.org>  Sun, 20 Jun 2010 16:19:46 -0400
 +
 +dnspython (1.7.1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Robert S. Edmonds <edmonds at debian.org>  Sun, 23 Aug 2009 14:17:25 -0400
 +
 +dnspython (1.6.0-1.1) unstable; urgency=low
 +
 +  * NMU. Rebuild to move files to /usr/share/pyshared. Closes: #490457.
 +
 + -- Matthias Klose <doko at debian.org>  Fri, 18 Jul 2008 15:57:01 +0000
 +
 +dnspython (1.6.0-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - This is primarily a bug fix release. The only new functionality is the
 +    function dns.inet.is_multicast().
 +  * Fix broken watch file.
 +
 + -- Robert S. Edmonds <edmonds at debian.org>  Wed, 28 Nov 2007 18:32:24 -0500
 +
 +dnspython (1.5.0-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * New maintainer; closes: #437695.
 +  * Drop "dummy package" statement from package description; closes: #420776.
 +  * Package is compliant with Debian Python policy; closes: #373315.
 +  * Add watch file.
 +  * Add build dependency on python-central.
 +  * Drop build dependencies on cdbs and python-support.
 +  * Ship the upstream README file since it contains useful information.
 +
 + -- Robert S. Edmonds <edmonds at debian.org>  Tue, 14 Aug 2007 06:35:13 -0400
 +
 +dnspython (1.3.5-3.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Drop old custom python-distutils.mk things, use cdbs.
 +  * Migrate to the new python policy (Closes: #373315).
 +
 + -- Pierre Habouzit <madcoder at debian.org>  Thu, 29 Jun 2006 14:13:10 +0200
 +
 +dnspython (1.3.5-3) unstable; urgency=low
 +
 +  * applied patch from Dan Pascu to avoid doing a backoff wait, even if
 +    a query was successful. Patch was forwarded upstream and was already applied
 +    to upstreams subversion repository.
 +
 + -- Patrick Dreker <patrick at dreker.org>  Sat, 18 Mar 2006 16:24:59 +0100
 +
 +dnspython (1.3.5-2) unstable; urgency=low
 +
 +  * change "Architecture: any" to "Architecture: all" as package
 +    only contains python code (Closes: #357052).
 +  * remove Python 2.2 from debian/rules, packages for 2.2 were not
 +    built anyways.
 +
 + -- Patrick Dreker <patrick at dreker.org>  Wed, 15 Mar 2006 19:48:03 +0100
 +
 +dnspython (1.3.5-1) unstable; urgency=low
 +
 +  [ Patrick Dreker ]
 +  * New upstream release.
 +
 +  [ Florian Ragwitz ]
 +  * Patrick is the official Maintainer now.
 +  * Updated the Uploaders field with my new maintainer address.
 +
 + -- Florian Ragwitz <rafl at debian.org>  Tue, 14 Mar 2006 21:36:34 +0100
 +
 +dnspython (1.3.4-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #335260).
 +
 + -- Florian Ragwitz <rafl at debianforum.de>  Sat, 22 Oct 2005 20:53:19 +0200
 +
diff --cc debian/patches/0001-Only-run-tests-in-tests-test_resolver.py-that-requir.patch
index 0000000,0000000..99261a2
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Only-run-tests-in-tests-test_resolver.py-that-requir.patch
@@@ -1,0 -1,0 +1,59 @@@
++From 0f139acf0ac1568cede0d7058354a085710c7740 Mon Sep 17 00:00:00 2001
++From: Scott Kitterman <scott at kitterman.com>
++Date: Sat, 28 May 2016 02:56:55 -0400
++Subject: Only run tests in tests/test_resolver.py that require an Internet
++ connection when it is available
++
++---
++ tests/test_resolver.py | 12 ++++++++++++
++ 1 file changed, 12 insertions(+)
++
++diff --git a/tests/test_resolver.py b/tests/test_resolver.py
++index 29c3959..eb4f23e 100644
++--- a/tests/test_resolver.py
+++++ b/tests/test_resolver.py
++@@ -16,6 +16,7 @@
++ from io import StringIO
++ import select
++ import sys
+++import socket
++ import time
++ try:
++     import unittest2 as unittest
++@@ -30,6 +31,14 @@ import dns.rdatatype
++ import dns.resolver
++ from dns._compat import xrange
++ 
+++# Some tests require the internet to be available to run, so let's
+++# skip those if it's not there.
+++_network_available = True
+++try:
+++    socket.gethostbyname('dnspython.org')
+++except socket.gaierror:
+++    _network_available = False
+++
++ resolv_conf = u"""
++     /t/t
++ # comment 1
++@@ -86,18 +95,21 @@ class BaseResolverTests(object):
++         self.failUnless(cache.get((name, dns.rdatatype.A, dns.rdataclass.IN))
++                         is None)
++ 
+++    @unittest.skipIf(not _network_available,"Internet not reachable")
++     def testZoneForName1(self):
++         name = dns.name.from_text('www.dnspython.org.')
++         ezname = dns.name.from_text('dnspython.org.')
++         zname = dns.resolver.zone_for_name(name)
++         self.failUnless(zname == ezname)
++ 
+++    @unittest.skipIf(not _network_available,"Internet not reachable")
++     def testZoneForName2(self):
++         name = dns.name.from_text('a.b.www.dnspython.org.')
++         ezname = dns.name.from_text('dnspython.org.')
++         zname = dns.resolver.zone_for_name(name)
++         self.failUnless(zname == ezname)
++ 
+++    @unittest.skipIf(not _network_available,"Internet not reachable")
++     def testZoneForName3(self):
++         name = dns.name.from_text('dnspython.org.')
++         ezname = dns.name.from_text('dnspython.org.')
diff --cc debian/patches/series
index 0000000,0000000..48372d4
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Only-run-tests-in-tests-test_resolver.py-that-requir.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/dnspython.git



More information about the Python-modules-commits mailing list