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

[bernat at users.alioth.debian.org]

    Date: Wednesday, July 13, 2011 @ 18:00:23
  Author: bernat
Revision: 17839

Tests have moved. Update debian/runtests.py accordingly.
Patch from Ubuntu. Closes: #633653.

Modified:
  packages/python-netaddr/trunk/debian/changelog
  packages/python-netaddr/trunk/debian/rules
  packages/python-netaddr/trunk/debian/runtests.py

Modified: packages/python-netaddr/trunk/debian/changelog
===================================================================
--- packages/python-netaddr/trunk/debian/changelog	2011-07-13 17:53:43 UTC (rev 17838)
+++ packages/python-netaddr/trunk/debian/changelog	2011-07-13 18:00:23 UTC (rev 17839)
@@ -1,3 +1,10 @@
+python-netaddr (0.7.5-4) UNRELEASED; urgency=low
+
+  * Tests have moved. Update debian/runtests.py accordingly.
+    Patch from Ubuntu. Closes: #633653.
+
+ -- Vincent Bernat <bernat at debian.org>  Wed, 13 Jul 2011 20:00:09 +0200
+
 python-netaddr (0.7.5-3) unstable; urgency=low
 
   * Fix debian/watch. Closes: #614358.

Modified: packages/python-netaddr/trunk/debian/rules
===================================================================
--- packages/python-netaddr/trunk/debian/rules	2011-07-13 17:53:43 UTC (rev 17838)
+++ packages/python-netaddr/trunk/debian/rules	2011-07-13 18:00:23 UTC (rev 17839)
@@ -12,5 +12,5 @@
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 install/python-netaddr::
 	$(call cdbs_python_binary,python$(cdbs_python_compile_version)) \
-		debian/runtests.py debian/python-netaddr
+		debian/runtests.py .
 endif

Modified: packages/python-netaddr/trunk/debian/runtests.py
===================================================================
--- packages/python-netaddr/trunk/debian/runtests.py	2011-07-13 17:53:43 UTC (rev 17838)
+++ packages/python-netaddr/trunk/debian/runtests.py	2011-07-13 18:00:23 UTC (rev 17839)
@@ -1,18 +1,6 @@
 import sys
-from os.path import join, isdir
-from distutils.sysconfig import get_python_lib
-from site import addsitedir
 
-root = sys.argv.pop(1)
-site_packages = get_python_lib()
+sys.path.insert(0, sys.argv.pop(1))
 
-_path = sys.path[:]
-sys.path[:] = []
-path = join(root, site_packages[1:])
-if not isdir(path):
-    path = join(root, site_packages.replace('/dist', '/site')[1:])
-addsitedir(path)
-sys.path.extend(_path)
-
 import netaddr.tests
 netaddr.tests.run()