[Python-modules-commits] r34137 - in packages/python-netaddr/trunk/debian (4 files)

Thu Sep 3 22:03:47 UTC 2015

Date: Thursday, September 3, 2015 @ 22:03:46
  Author: barry
Revision: 34137

* d/control:
  - Build-Depend on python3-all to pick up Python 3.5.
  - Build-Depend on locales so that utf-8 locale can be created for the
    test suite.
* d/rules:
  - Invoke py.test directly instead of through the runtests.py script,
    since the latter embeds an old and Python 3.5 incompatible version
    of py.test.
  - Ensure UTF-8 locale.
* wrap-and-sort.

Modified:
  packages/python-netaddr/trunk/debian/changelog
  packages/python-netaddr/trunk/debian/control
  packages/python-netaddr/trunk/debian/copyright
  packages/python-netaddr/trunk/debian/rules

Modified: packages/python-netaddr/trunk/debian/changelog
===================================================================

--- packages/python-netaddr/trunk/debian/changelog	2015-09-03 21:15:37 UTC (rev 34136)
+++ packages/python-netaddr/trunk/debian/changelog	2015-09-03 22:03:46 UTC (rev 34137)
@@ -2,7 +2,17 @@
 
   * Team upload.
   * New upstream release.
+  * d/control:
+    - Build-Depend on python3-all to pick up Python 3.5.
+    - Build-Depend on locales so that utf-8 locale can be created for the
+      test suite.
+  * d/rules:
+    - Invoke py.test directly instead of through the runtests.py script,
+      since the latter embeds an old and Python 3.5 incompatible version
+      of py.test.
+    - Ensure UTF-8 locale.
   * d/watch: Use pypi.debian.net redirector.
+  * wrap-and-sort.
 
  -- Barry Warsaw <barry at debian.org>  Thu, 03 Sep 2015 17:05:17 -0400
 

Modified: packages/python-netaddr/trunk/debian/control
===================================================================
--- packages/python-netaddr/trunk/debian/control	2015-09-03 21:15:37 UTC (rev 34136)
+++ packages/python-netaddr/trunk/debian/control	2015-09-03 22:03:46 UTC (rev 34137)
@@ -5,18 +5,22 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 9),
-	       python (>= 2.6.5), python3 (>= 3.2),
-	       python-setuptools (>= 0.6b3), python3-setuptools,
+               ieee-data,
+               locales,
+               python (>= 2.6.5),
+               python-pytest,
+               python-setuptools (>= 0.6b3),
                python-sphinx (>= 1.0.7+dfsg),
-               python-pytest, python3-pytest,
-               ieee-data
+               python3-all (>= 3.2),
+               python3-pytest,
+               python3-setuptools
 Homepage: https://github.com/drkjam/netaddr/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-netaddr/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-netaddr/trunk/
 
 Package: python-netaddr
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, ieee-data
+Depends: ieee-data, ${misc:Depends}, ${python:Depends}
 Suggests: ipython, python-netaddr-docs
 Description: manipulation of various common network address notations (Python 2)
  netaddr is a Python library for the manipulation of various common
@@ -38,7 +42,7 @@
 
 Package: python3-netaddr
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, ieee-data
+Depends: ieee-data, ${misc:Depends}, ${python3:Depends}
 Suggests: ipython3, python-netaddr-docs
 Description: manipulation of various common network address notations (Python 3)
  netaddr is a Python library for the manipulation of various common
@@ -61,7 +65,7 @@
 Package: python-netaddr-docs
 Architecture: all
 Section: doc
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Replaces: python-netaddr (<< 0.7.7-1)
 Breaks: python-netaddr (<< 0.7.7-1)
 Description: manipulation of various common network address notations (documentation)

Modified: packages/python-netaddr/trunk/debian/copyright
===================================================================
--- packages/python-netaddr/trunk/debian/copyright	2015-09-03 21:15:37 UTC (rev 34136)
+++ packages/python-netaddr/trunk/debian/copyright	2015-09-03 22:03:46 UTC (rev 34137)
@@ -5,21 +5,21 @@
 License: BSD
  Released under the BSD license, copied verbatim below:
 
- Redistribution and use in source and binary forms, with or without 
+ Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
 
- * Redistributions of source code must retain the above copyright notice, 
+ * Redistributions of source code must retain the above copyright notice,
  this list of conditions and the following disclaimer.
 
- * Redistributions in binary form must reproduce the above copyright 
- notice, this list of conditions and the following disclaimer in the 
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
  documentation and/or other materials provided with the distribution.
 
  * Neither the name of the <ORGANIZATION> nor the names of its contributors
- may be used to endorse or promote products derived from this software 
+ may be used to endorse or promote products derived from this software
  without specific prior written permission.
 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

Modified: packages/python-netaddr/trunk/debian/rules
===================================================================
--- packages/python-netaddr/trunk/debian/rules	2015-09-03 21:15:37 UTC (rev 34136)
+++ packages/python-netaddr/trunk/debian/rules	2015-09-03 22:03:46 UTC (rev 34137)
@@ -30,4 +30,11 @@
 
 # Tests
 override_dh_auto_test:
-	dh_auto_test -- --system=custom --test-args='{interpreter} setup.py test'
+	mkdir -p $(CURDIR)/tmp-locales
+	localedef -i /usr/share/i18n/locales/en_US -c -f UTF-8 \
+		-A /usr/share/locale/locale.alias \
+		$(CURDIR)/tmp-locales/en_US.UTF-8
+	LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 \
+		dh_auto_test -- \
+		--system=custom \
+		--test-args='{interpreter} -c "import py; py.test.cmdline.main()"'


