[Python-modules-commits] r21199 - in packages/pytest/trunk/debian (changelog control rules)

[laarmen-guest at users.alioth.debian.org]

    Date: Friday, April 13, 2012 @ 17:47:14
  Author: laarmen-guest
Revision: 21199

Use PYTHONPATH to get rid of the circular B-D

Modified:
  packages/pytest/trunk/debian/changelog
  packages/pytest/trunk/debian/control
  packages/pytest/trunk/debian/rules

Modified: packages/pytest/trunk/debian/changelog
===================================================================
--- packages/pytest/trunk/debian/changelog	2012-04-13 15:46:36 UTC (rev 21198)
+++ packages/pytest/trunk/debian/changelog	2012-04-13 17:47:14 UTC (rev 21199)
@@ -4,7 +4,6 @@
   * Use the wrapper for py.test and py3-test to simplify d/rules
   * Enable test suite
     + Uncomment the override_dh_auto_test target
-    + Add python-pytest and python3-pytest in Build-Depends
   * Build-Conflicts on old versions of python-pytest-xdist (<< 1.5) 
 
  -- Simon Chopin <chopin.simon at gmail.com>  Fri, 13 Apr 2012 15:45:43 +0200

Modified: packages/pytest/trunk/debian/control
===================================================================
--- packages/pytest/trunk/debian/control	2012-04-13 15:46:36 UTC (rev 21198)
+++ packages/pytest/trunk/debian/control	2012-04-13 17:47:14 UTC (rev 21199)
@@ -7,12 +7,10 @@
  debhelper (>= 8),
  python-all (>= 2.6.6-3~),
  python-py,
- python-pytest,
  python-setuptools,
  python-sphinx (>= 1.0.7+dfsg),
  python3-all (>= 3.1.2-6~),
  python3-py,
- python3-pytest,
  python3-setuptools
 Build-Conflicts: python-pytest-xdist (<< 1.5)
 X-Python-Version: >= 2.4

Modified: packages/pytest/trunk/debian/rules
===================================================================
--- packages/pytest/trunk/debian/rules	2012-04-13 15:46:36 UTC (rev 21198)
+++ packages/pytest/trunk/debian/rules	2012-04-13 17:47:14 UTC (rev 21199)
@@ -68,7 +68,7 @@
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	set -ex; \
 	for py in $(PYVERS) $(PY3VERS); do \
-		python$$py -m pytest testing ; \
+		PYTHONPATH=$(CURDIR) python$$py -m pytest testing ; \
 	done
 endif