[Python-modules-commits] r21197 - in packages/pytest/trunk/debian (5 files)
laarmen-guest at users.alioth.debian.org
laarmen-guest at users.alioth.debian.org
Fri Apr 13 14:54:03 UTC 2012
Date: Friday, April 13, 2012 @ 14:54:02
Author: laarmen-guest
Revision: 21197
* Fix the wrapper script
* Use the wrapper for py.test and py.test-3
* Enable the test suite
* wrap-and-sort
Modified:
packages/pytest/trunk/debian/changelog
packages/pytest/trunk/debian/control
packages/pytest/trunk/debian/copyright
packages/pytest/trunk/debian/py.test.sh
packages/pytest/trunk/debian/rules
Modified: packages/pytest/trunk/debian/changelog
===================================================================
--- packages/pytest/trunk/debian/changelog 2012-04-13 14:25:45 UTC (rev 21196)
+++ packages/pytest/trunk/debian/changelog 2012-04-13 14:54:02 UTC (rev 21197)
@@ -1,3 +1,13 @@
+pytest (2.2.3-2) UNRELEASED; urgency=low
+
+ * Fix the shell wrapper (Closes: #668519)
+ * 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
+
+ -- Simon Chopin <chopin.simon at gmail.com> Fri, 13 Apr 2012 15:45:43 +0200
+
pytest (2.2.3-1) unstable; urgency=low
* Initial release (Closes: #664071)
Modified: packages/pytest/trunk/debian/control
===================================================================
--- packages/pytest/trunk/debian/control 2012-04-13 14:25:45 UTC (rev 21196)
+++ packages/pytest/trunk/debian/control 2012-04-13 14:54:02 UTC (rev 21197)
@@ -3,13 +3,17 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Simon Chopin <chopin.simon at gmail.com>
-Build-Depends: debhelper (>= 8),
- python-all (>= 2.6.6-3~),
- python-py,
- python-setuptools,
- python-sphinx (>= 1.0.7+dfsg),
- python3-all (>= 3.1.2-6~),
- python3-setuptools
+Build-Depends:
+ 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
X-Python-Version: >= 2.4
X-Python3-Version: >= 3.0
Standards-Version: 3.9.3
@@ -19,10 +23,11 @@
Package: python-pytest
Architecture: all
-Depends: python-pkg-resources,
- python-py (>= 1.4),
- ${misc:Depends},
- ${python:Depends}
+Depends:
+ python-pkg-resources,
+ python-py (>= 1.4),
+ ${misc:Depends},
+ ${python:Depends}
Breaks: python-py (<< 1.4)
Replaces: python-py (<< 1.4)
Description: Simple, powerful testing in Python
@@ -32,10 +37,11 @@
Package: python3-pytest
Architecture: all
-Depends: python3-pkg-resources,
- python3-py (>= 1.4),
- ${misc:Depends},
- ${python3:Depends}
+Depends:
+ python3-pkg-resources,
+ python3-py (>= 1.4),
+ ${misc:Depends},
+ ${python3:Depends}
Description: Simple, powerful testing in Python3
This testing tool has for objective to allow the developers to limit the
boilerplate code around the tests, promoting the use of built-in
Modified: packages/pytest/trunk/debian/copyright
===================================================================
--- packages/pytest/trunk/debian/copyright 2012-04-13 14:25:45 UTC (rev 21196)
+++ packages/pytest/trunk/debian/copyright 2012-04-13 14:54:02 UTC (rev 21197)
@@ -107,4 +107,3 @@
8. By copying, installing or otherwise using Python, Licensee
agrees to be bound by the terms and conditions of this License
Agreement.
-
Modified: packages/pytest/trunk/debian/py.test.sh
===================================================================
--- packages/pytest/trunk/debian/py.test.sh 2012-04-13 14:25:45 UTC (rev 21196)
+++ packages/pytest/trunk/debian/py.test.sh 2012-04-13 14:54:02 UTC (rev 21197)
@@ -1,6 +1,10 @@
#!/bin/sh
-PYVERSION=`cut $0 -d '-' -f 2`
+PYVERSION="${0##*py.test-}"
+case $PYVERSION in
+ "[0-9].[0-9]"|"[0-9]") ;;
+ *) PYVERSION='';; #If ill-formed version, use the default.
+esac
UPSTREAMVERSION=#PYTEST#
if [ -f /usr/bin/python$PYVERSION ] ; then
Modified: packages/pytest/trunk/debian/rules
===================================================================
--- packages/pytest/trunk/debian/rules 2012-04-13 14:25:45 UTC (rev 21196)
+++ packages/pytest/trunk/debian/rules 2012-04-13 14:54:02 UTC (rev 21197)
@@ -7,9 +7,6 @@
PYVERS := $(shell pyversions -vr)
PY3VERS := $(shell py3versions -vr)
-PYDEFAULT := $(shell pyversions -vd)
-PY3DEFAULT := $(shell py3versions -vd)
-
UPSTREAM = $(shell dpkg-parsechangelog | grep Version | sed 's/Version: \(.*\)-.*/\1/' )
%:
@@ -34,40 +31,26 @@
override_dh_install:
# Only install for the default versions.
- python$(PYDEFAULT) setup.py install --skip-build --no-compile \
- --root debian/python-pytest \
- --install-layout=deb
- rm debian/python-pytest/usr/bin/py.test-$(PYDEFAULT)
- install -m 755 debian/py.test.sh debian/python-pytest/usr/bin/py.test-$(PYDEFAULT)
- sed -i 's/#PYTEST#/$(UPSTREAM)/' debian/python-pytest/usr/bin/py.test-$(PYDEFAULT)
+ python setup.py install --skip-build --no-compile \
+ --root debian/python-pytest \
+ --install-layout=deb
+ rm debian/python-pytest/usr/bin/*
+ install -m 755 debian/py.test.sh debian/python-pytest/usr/bin/py.test
+ sed -i 's/#PYTEST#/$(UPSTREAM)/' debian/python-pytest/usr/bin/py.test
set -e; \
for py in $(PYVERS) ; do \
- if [ "$$py" != "$(PYDEFAULT)" ] ; then \
- dh_link -ppython-pytest usr/bin/py.test-$(PYDEFAULT) usr/bin/py.test-$$py; \
- fi; \
+ dh_link -ppython-pytest usr/bin/py.test usr/bin/py.test-$$py; \
dh_link -ppython-pytest /usr/share/man/man1/py.test.1.gz /usr/share/man/man1/py.test-$$py.1.gz ;\
done
+ python3 setup.py install --skip-build --no-compile \
+ --root debian/python3-pytest \
+ --install-layout=deb
+ rm debian/python3-pytest/usr/bin/*
+ install -m 755 debian/py.test.sh debian/python3-pytest/usr/bin/py.test-3
+ sed -i 's/#PYTEST#/$(UPSTREAM)/' debian/python3-pytest/usr/bin/py.test-3
set -e; \
for py in $(PY3VERS) ; do \
- if [ "$$py" != "$(PY3DEFAULT)" ] ; then \
- python$$py setup.py install --skip-build --no-compile \
- --root debian/python3-pytest \
- --install-layout=deb \
- --install-scripts=debian/tmp; \
- else \
- python$$py setup.py install --skip-build --no-compile \
- --root debian/python3-pytest \
- --install-layout=deb; \
- fi; \
- done
- mv debian/python3-pytest/usr/bin/py.test debian/python3-pytest/usr/bin/py.test-3
- install -m 755 debian/py.test.sh debian/python3-pytest/usr/bin/py.test-$(PY3DEFAULT)
- sed -i 's/#PYTEST#/$(UPSTREAM)/' debian/python3-pytest/usr/bin/py.test-$(PY3DEFAULT)
- set -e; \
- for py in $(PY3VERS) ; do \
- if [ "$$py" != "$(PY3DEFAULT)" ] ; then \
- dh_link -ppython3-pytest usr/bin/py.test-$(PY3DEFAULT) usr/bin/py.test-$$py; \
- fi; \
+ dh_link -ppython3-pytest usr/bin/py.test-3 usr/bin/py.test-$$py; \
dh_link -ppython3-pytest /usr/share/man/man1/py.test-3.1.gz /usr/share/man/man1/py.test-$$py.1.gz ;\
done
dh_install
@@ -81,11 +64,11 @@
rm debian/py.test.1 debian/py.test-3.1 -f
dh_clean
-#override_dh_auto_test:
-#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-# set -ex; \
-# for py in $(PYVERS) $(PY3VERS); do \
-# python$$py -m pytest testing ; \
-# done
-#endif
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ set -ex; \
+ for py in $(PYVERS) $(PY3VERS); do \
+ python$$py -m pytest testing ; \
+ done
+endif
More information about the Python-modules-commits
mailing list