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

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

    Date: Saturday, June 2, 2012 @ 02:25:20
  Author: eriol-guest
Revision: 22019

Run tests at build time

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

Modified: packages/circuits/trunk/debian/changelog
===================================================================
--- packages/circuits/trunk/debian/changelog	2012-06-02 01:41:10 UTC (rev 22018)
+++ packages/circuits/trunk/debian/changelog	2012-06-02 02:25:20 UTC (rev 22019)
@@ -19,6 +19,8 @@
     - Added python-sphinx to Build-Depends to build documentation
     - Removed python-pygame from Build-Depends
     - Added libjs-jquery to python-circuits-doc Depends
+    - Added python-pytest and python3-pytest to Build-Depends to run tests
+      at build time
   * debian/patches/01_use_issuetraker_instead_of_bitbucket.patch
     - Use python-sphinxcontrib.issuetracker instead of sphinxcontrib-bitbucket
       because the latter is not packaged for Debian and it does't add more
@@ -26,6 +28,8 @@
   * debian/patches/02_remove_templatebuiltins_js.patch
     - Remove templatebuiltins.js because it contains names of Django builtin
       tags and filters not used in circuits documentation
+  * debian/patches/03_force-localhost-as-host-name.patch
+    - Force localhost as hostname
   * debian/python-circuits-doc.doc-base
     - Renamed from python-circuits.doc-base
   * debian/python-circuits-doc.links
@@ -37,6 +41,7 @@
     - Removed because it contains only generic information about quilt
   * debian/rules
     - Switched to dh sequencer
+    - Run tests at build time
   * debian/source/format
     - Switched to dpkg-source 3.0 (quilt) format
   * debian/watch

Modified: packages/circuits/trunk/debian/control
===================================================================
--- packages/circuits/trunk/debian/control	2012-06-02 01:41:10 UTC (rev 22018)
+++ packages/circuits/trunk/debian/control	2012-06-02 02:25:20 UTC (rev 22019)
@@ -6,12 +6,16 @@
 Build-Depends:
  debhelper (>= 7.4.2),
  python-all (>= 2.6.6-3~),
- python-py,
+ python-coverage,
+ python-greenlet,
  python-pyinotify,
+ python-pytest,
  python-setuptools,
  python-sphinx (>= 1.0.7+dfsg),
  python-sphinxcontrib.issuetracker,
- python3-all (>= 3.1.2-7~)
+ python3-all (>= 3.1.2-7~),
+ python3-pytest,
+ python3-setuptools,
 Standards-Version: 3.9.2
 Homepage: http://bitbucket.org/prologic/circuits/
 XS-Python-Version: >= 2.5

Modified: packages/circuits/trunk/debian/rules
===================================================================
--- packages/circuits/trunk/debian/rules	2012-06-02 01:41:10 UTC (rev 22018)
+++ packages/circuits/trunk/debian/rules	2012-06-02 02:25:20 UTC (rev 22019)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export http_proxy = http://127.0.0.1:9/
+
 PY2VERS := $(shell pyversions -r)
 PY3VERS := $(shell py3versions -r)
 
@@ -39,12 +41,10 @@
 	# Remove scripts for Python3: provide them only for the default version.
 	rm -rf debian/python3-circuits/usr/bin/
 
-# Disabled tests because they need pytest >= 2.0.0 which is not in Debian yet.
-# override_dh_auto_test:
-# ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
-# 	set -e; \
-# 	for python in $(PY2VERS) $(PY3VERS); do \
-# 		$$python setup.py test; \
-# 	done
-# endif
-
+override_dh_auto_test:
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+	set -e; \
+	for python in $(PY2VERS) $(PY3VERS); do \
+		$$python setup.py test; \
+	done
+endif