[Python-modules-commits] r24931 - in packages/python-gdata/trunk/debian (6 files)

mitya57-guest at users.alioth.debian.org mitya57-guest at users.alioth.debian.org
Mon Jun 24 11:41:00 UTC 2013 

    Date: Monday, June 24, 2013 @ 11:40:59
  Author: mitya57-guest
Revision: 24931

* Upload to unstable.
* New upstream release.
* Avoid moving upstream files when building docs.
* Increase tests verbosity.
* Disable HTTP traffic during build.

Added:
  packages/python-gdata/trunk/debian/patches/testsuite_improvements.patch
    (from rev 24929, packages/python-gdata/trunk/debian/patches/tests_dont_return_zero_on_failures.patch)
Modified:
  packages/python-gdata/trunk/debian/changelog
  packages/python-gdata/trunk/debian/patches/series
  packages/python-gdata/trunk/debian/rules
Deleted:
  packages/python-gdata/trunk/debian/patches/tests_dont_return_zero_on_failures.patch
  packages/python-gdata/trunk/debian/python-gdata-doc.docs

Modified: packages/python-gdata/trunk/debian/changelog
===================================================================
--- packages/python-gdata/trunk/debian/changelog	2013-06-24 11:34:59 UTC (rev 24930)
+++ packages/python-gdata/trunk/debian/changelog	2013-06-24 11:40:59 UTC (rev 24931)
@@ -1,9 +1,18 @@
-python-gdata (2.0.17+dfsg-3) UNRELEASED; urgency=low
+python-gdata (2.0.18+dfsg-1) unstable; urgency=low
 
+  * Upload to unstable.
+
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:02:38 +0200
+  [ Dmitry Shachnev ]
+  * New upstream release.
+  * Avoid moving upstream files when building docs.
+  * Increase tests verbosity.
+  * Disable HTTP traffic during build.
 
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Mon, 24 Jun 2013 14:59:16 +0400
+
 python-gdata (2.0.17+dfsg-2) experimental; urgency=low
 
   * Merge unstable upload 2.0.17+dfsg-1 into experimental.

Modified: packages/python-gdata/trunk/debian/patches/series
===================================================================
--- packages/python-gdata/trunk/debian/patches/series	2013-06-24 11:34:59 UTC (rev 24930)
+++ packages/python-gdata/trunk/debian/patches/series	2013-06-24 11:40:59 UTC (rev 24931)
@@ -1,4 +1,4 @@
 remove_shebangs.patch
 fix_shebangs.patch
-tests_dont_return_zero_on_failures.patch
+testsuite_improvements.patch
 disable_network_test.patch

Deleted: packages/python-gdata/trunk/debian/patches/tests_dont_return_zero_on_failures.patch
===================================================================
--- packages/python-gdata/trunk/debian/patches/tests_dont_return_zero_on_failures.patch	2013-06-24 11:34:59 UTC (rev 24930)
+++ packages/python-gdata/trunk/debian/patches/tests_dont_return_zero_on_failures.patch	2013-06-24 11:40:59 UTC (rev 24931)
@@ -1,18 +0,0 @@
-Author: Dmitry Shachnev <mitya57 at gmail.com>
-Description: Make tests return non-zero value on failures
-Forwarded: not-needed
-Last-Update: 2012-11-23
-
-=== modified file 'tests/module_test_runner.py'
---- a/tests/module_test_runner.py	2008-07-22 20:52:11 +0000
-+++ b/tests/module_test_runner.py	2012-11-23 06:25:39 +0000
-@@ -53,5 +53,6 @@
-           pass
-       # We have set all of the applicable settings for the module, now
-       # run the tests.
--      print '\nRunning all tests in module', module.__name__
--      runner.run(unittest.defaultTestLoader.loadTestsFromModule(module))    
-+      result = runner.run(unittest.defaultTestLoader.loadTestsFromModule(module))
-+      if not result.wasSuccessful():
-+        raise Exception('Tests failed!')
-

Copied: packages/python-gdata/trunk/debian/patches/testsuite_improvements.patch (from rev 24929, packages/python-gdata/trunk/debian/patches/tests_dont_return_zero_on_failures.patch)
===================================================================
--- packages/python-gdata/trunk/debian/patches/testsuite_improvements.patch	                        (rev 0)
+++ packages/python-gdata/trunk/debian/patches/testsuite_improvements.patch	2013-06-24 11:40:59 UTC (rev 24931)
@@ -0,0 +1,25 @@
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Description: make tests return non-zero value on failures, and increase verbosity
+Forwarded: not-needed
+Last-Update: 2013-05-24
+
+--- a/tests/module_test_runner.py
++++ b/tests/module_test_runner.py
+@@ -41,7 +41,7 @@
+     It also sets any module variables which match the settings keys to the
+     corresponding values in the settings member.
+     """
+-    runner = unittest.TextTestRunner()
++    runner = unittest.TextTestRunner(verbosity=2)
+     for module in self.modules:
+       # Set any module variables according to the contents in the settings
+       for setting, value in self.settings.iteritems():
+@@ -53,5 +53,6 @@
+           pass
+       # We have set all of the applicable settings for the module, now
+       # run the tests.
+-      print '\nRunning all tests in module', module.__name__
+-      runner.run(unittest.defaultTestLoader.loadTestsFromModule(module))    
++      result = runner.run(unittest.defaultTestLoader.loadTestsFromModule(module))
++      if not result.wasSuccessful():
++        raise Exception('Tests failed!')

Deleted: packages/python-gdata/trunk/debian/python-gdata-doc.docs
===================================================================
--- packages/python-gdata/trunk/debian/python-gdata-doc.docs	2013-06-24 11:34:59 UTC (rev 24930)
+++ packages/python-gdata/trunk/debian/python-gdata-doc.docs	2013-06-24 11:40:59 UTC (rev 24931)
@@ -1 +0,0 @@
-pydocs/

Modified: packages/python-gdata/trunk/debian/rules
===================================================================
--- packages/python-gdata/trunk/debian/rules	2013-06-24 11:34:59 UTC (rev 24930)
+++ packages/python-gdata/trunk/debian/rules	2013-06-24 11:40:59 UTC (rev 24931)
@@ -4,15 +4,20 @@
 DEB_DIRECTORY = $(dir $(firstword $(MAKEFILE_LIST)))
 DEB_VERSION = $(word 2,$(shell cd $(DEB_DIRECTORY)/.. && dpkg-parsechangelog | grep ^Version:))
 UPSTREAM_DFSG_VERSION = $(firstword $(subst -, ,$(DEB_VERSION)))
+DOCS_DIRECTORY = debian/python-gdata-doc/usr/share/doc/python-gdata-doc/pydocs/
 
+# Send HTTP traffic to “discard” service
+export http_proxy = http://127.0.1.1:9/
+export https_proxy = ${http_proxy}
+
 %:
 	dh $@ --with python2
 
 override_dh_auto_build:
 	dh_auto_build
-	mv pydocs pydocs.old
-	mkdir pydocs
-	cd pydocs; sh ../pydocs.old/generate_docs
+	mkdir -p $(DOCS_DIRECTORY)
+	cp pydocs/generate_docs $(DOCS_DIRECTORY)
+	cd $(DOCS_DIRECTORY); sh ./generate_docs; rm ./generate_docs
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
@@ -29,8 +34,6 @@
 
 override_dh_installdocs:
 	dh_installdocs -X.Crypto
-	rm -rf pydocs
-	mv pydocs.old pydocs
 
 override_dh_compress:
 	dh_compress -X.py -X.c

More information about the Python-modules-commits mailing list