[Python-modules-commits] r19459 - in packages/cssutils/trunk/debian (7 files)
cjsmo-guest at users.alioth.debian.org
cjsmo-guest at users.alioth.debian.org
Mon Nov 28 22:23:18 UTC 2011
Date: Monday, November 28, 2011 @ 22:23:17
Author: cjsmo-guest
Revision: 19459
run unittests
Modified:
packages/cssutils/trunk/debian/changelog
packages/cssutils/trunk/debian/control
packages/cssutils/trunk/debian/python-cssutils.postinst
packages/cssutils/trunk/debian/python3-cssutils.postinst
packages/cssutils/trunk/debian/rules
Deleted:
packages/cssutils/trunk/debian/python-cssutils.lintian-overrides
packages/cssutils/trunk/debian/python3-cssutils.lintian-overrides
Modified: packages/cssutils/trunk/debian/changelog
===================================================================
--- packages/cssutils/trunk/debian/changelog 2011-11-28 15:46:34 UTC (rev 19458)
+++ packages/cssutils/trunk/debian/changelog 2011-11-28 22:23:17 UTC (rev 19459)
@@ -18,8 +18,8 @@
- B-D on python3, and python3-setuptools.
- No longer Depend on python-encutils.
- No longer Recommend python-cssutils-doc package.
- - Added Replaces and Breaks so python-cssutils-0.9.8~a1 is completely
- removed from the system.
+ - Added Replaces and Provides so python-cssutils-0.9.8~a1 is upgraded
+ properly.
* debian/rules
- Removed dh_install override, no longer needed.
- Added rules to build python2 and python3 packages
@@ -27,6 +27,7 @@
update alternative can be used.
- Added dh_installman override and make copies of manpages to be used in
python2 and python3 packages.
+ - Added nosetests to run unittests at build time.
* Removed python-cssutils-doc.links, python-cssutils-doc.doc-base,
python-cssutils-doc.docs, python-cssutils-doc.examples,
python-cssutils.install, python-encutils.install, no longer needed.
@@ -41,7 +42,7 @@
* Added 01_setup_fix.patch to create py2 and py3 executables.
* Added lintian-overrides.
- -- Charlie Smotherman <cjsmo at cableone.net> Mon, 21 Nov 2011 19:27:22 -0500
+ -- Charlie Smotherman <cjsmo at cableone.net> Mon, 28 Nov 2011 14:39:22 -0500
cssutils (0.9.8~a1-1) unstable; urgency=low
Modified: packages/cssutils/trunk/debian/control
===================================================================
--- packages/cssutils/trunk/debian/control 2011-11-28 15:46:34 UTC (rev 19458)
+++ packages/cssutils/trunk/debian/control 2011-11-28 22:23:17 UTC (rev 19459)
@@ -8,6 +8,8 @@
Build-Depends: debhelper (>= 7.0.50~),
python-all (>= 2.6.6-3~),
python-setuptools,
+ python-nose,
+ python-mock,
python3-all,
python3-setuptools
Standards-Version: 3.9.2
@@ -22,8 +24,8 @@
Depends: ${misc:Depends},
${python:Depends},
python-pkg-resources
-Replaces: python-cssutils (<< 0.9.8~a3), python-encutils, python-cssutils-doc
-Breaks: python-cssutils (<< 0.9.8~a3)
+Replaces: python-encutils, python-cssutils-doc
+Provides: python-encutils
Description: CSS Cascading Style Sheets parser and builder
Package to parse and build CSS Cascading Style Sheets. DOM only, not any
rendering facilities! Base upon and partly implements the following
@@ -43,7 +45,6 @@
Depends: ${misc:Depends},
${python3:Depends},
python3-pkg-resources
-Replaces: python-cssutils (<< 0.9.8~a3), python-encutils, python-cssutils-doc
Description: Python3 CSS Cascading Style Sheets parser and builder
Python3 package to parse and build CSS Cascading Style Sheets. DOM only, not
any rendering facilities! Base upon and partly implements the following
Deleted: packages/cssutils/trunk/debian/python-cssutils.lintian-overrides
===================================================================
--- packages/cssutils/trunk/debian/python-cssutils.lintian-overrides 2011-11-28 15:46:34 UTC (rev 19458)
+++ packages/cssutils/trunk/debian/python-cssutils.lintian-overrides 2011-11-28 22:23:17 UTC (rev 19459)
@@ -1,5 +0,0 @@
-python-cssutils binary: package-relation-with-self replaces: python-cssutils (<< 0.9.8~a3)
-python-cssutils binary: package-relation-with-self breaks: python-cssutils (<< 0.9.8~a3)
-python-cssutils binary: binary-without-manpage usr/bin/csscapture_py2
-python-cssutils binary: binary-without-manpage usr/bin/csscombine_py2
-python-cssutils binary: binary-without-manpage usr/bin/cssparse_py2
Modified: packages/cssutils/trunk/debian/python-cssutils.postinst
===================================================================
--- packages/cssutils/trunk/debian/python-cssutils.postinst 2011-11-28 15:46:34 UTC (rev 19458)
+++ packages/cssutils/trunk/debian/python-cssutils.postinst 2011-11-28 22:23:17 UTC (rev 19459)
@@ -4,36 +4,30 @@
case "$1" in
configure)
- if [ -f /usr/bin/cssparse ] && [ ! -h /usr/bin/cssparse ]; then
- if [ -e /usr/bin/csspase_py2 ]; then
- rm /usr/bin/cssparse
- fi
- fi
- if [ -f /usr/bin/csscombine ] && [ ! -h /usr/bin/csscombine ]; then
- if [ -e /usr/bin/csscombine_py2 ]; then
- rm /usr/bin/csscombine
- fi
- fi
- if [ -f /usr/bin/csscapture ] && [ ! -h /usr/bin/csscapture ]; then
- if [ -e /usr/bin/csscapture_py2 ]; then
- rm /usr/bin/csscapture
- fi
- fi
+ if [ -f /usr/bin/cssparse ] && [ ! -h /usr/bin/cssparse ]; then
+ rm /usr/bin/cssparse
+ fi
+ if [ -f /usr/bin/csscombine ] && [ ! -h /usr/bin/csscombine ]; then
+ rm /usr/bin/csscombine
+ fi
+ if [ -f /usr/bin/csscapture ] && [ ! -h /usr/bin/csscapture ]; then
+ rm /usr/bin/csscapture
+ fi
update-alternatives --install /usr/bin/cssparse cssparse \
/usr/bin/cssparse_py2 20 \
--slave /usr/share/man/man1/cssparse.1.gz \
cssparse.1.gz \
- /usr/share/man/man1/cssparse.py2.1.gz
+ /usr/share/man/man1/cssparse_py2.1.gz
update-alternatives --install /usr/bin/csscombine csscombine \
- /usr/bin/csscombine_py2 21 \
+ /usr/bin/csscombine_py2 20 \
--slave /usr/share/man/man1/csscombine.1.gz \
csscombine.1.gz \
- /usr/share/man/man1/csscombine.py2.1.gz
+ /usr/share/man/man1/csscombine_py2.1.gz
update-alternatives --install /usr/bin/csscapture csscapture \
- /usr/bin/csscapture_py2 22 \
+ /usr/bin/csscapture_py2 20 \
--slave /usr/share/man/man1/csscapture.1.gz \
csscapture.1.gz \
- /usr/share/man/man1/csscapture.py2.1.gz
+ /usr/share/man/man1/csscapture_py2.1.gz
;;
abort-upgrade|abort-remove|abort-deconfigure)
Deleted: packages/cssutils/trunk/debian/python3-cssutils.lintian-overrides
===================================================================
--- packages/cssutils/trunk/debian/python3-cssutils.lintian-overrides 2011-11-28 15:46:34 UTC (rev 19458)
+++ packages/cssutils/trunk/debian/python3-cssutils.lintian-overrides 2011-11-28 22:23:17 UTC (rev 19459)
@@ -1,3 +0,0 @@
-python3-cssutils: binary-without-manpage usr/bin/csscapture_py3
-python3-cssutils: binary-without-manpage usr/bin/csscombine_py3
-python3-cssutils: binary-without-manpage usr/bin/cssparse_py3
Modified: packages/cssutils/trunk/debian/python3-cssutils.postinst
===================================================================
--- packages/cssutils/trunk/debian/python3-cssutils.postinst 2011-11-28 15:46:34 UTC (rev 19458)
+++ packages/cssutils/trunk/debian/python3-cssutils.postinst 2011-11-28 22:23:17 UTC (rev 19459)
@@ -4,36 +4,30 @@
case "$1" in
configure)
- if [ -f /usr/bin/cssparse ] && [ ! -h /usr/bin/cssparse ]; then
- if [ -e /usr/bin/csspase_py3 ]; then
- rm /usr/bin/cssparse
- fi
- fi
- if [ -f /usr/bin/csscombine ] && [ ! -h /usr/bin/csscombine ]; then
- if [ -e /usr/bin/csscombine_py3 ]; then
- rm /usr/bin/csscombine
- fi
- fi
- if [ -f /usr/bin/csscapture ] && [ ! -h /usr/bin/csscapture ]; then
- if [ -e /usr/bin/csscapture_py3 ]; then
- rm /usr/bin/csscapture
- fi
- fi
+ if [ -f /usr/bin/cssparse ] && [ ! -h /usr/bin/cssparse ]; then
+ rm /usr/bin/cssparse
+ fi
+ if [ -f /usr/bin/csscombine ] && [ ! -h /usr/bin/csscombine ]; then
+ rm /usr/bin/csscombine
+ fi
+ if [ -f /usr/bin/csscapture ] && [ ! -h /usr/bin/csscapture ]; then
+ rm /usr/bin/csscapture
+ fi
update-alternatives --install /usr/bin/cssparse cssparse \
/usr/bin/cssparse_py3 10 \
--slave /usr/share/man/man1/cssparse.1.gz \
cssparse.1.gz \
- /usr/share/man/man1/cssparse.py3.1.gz
+ /usr/share/man/man1/cssparse_py3.1.gz
update-alternatives --install /usr/bin/csscombine csscombine \
/usr/bin/csscombine_py3 10 \
--slave /usr/share/man/man1/csscombine.1.gz \
csscombine.1.gz \
- /usr/share/man/man1/csscombine.py3.1.gz
+ /usr/share/man/man1/csscombine_py3.1.gz
update-alternatives --install /usr/bin/csscapture csscapture \
/usr/bin/csscapture_py3 10 \
--slave /usr/share/man/man1/csscapture.1.gz \
csscapture.1.gz \
- /usr/share/man/man1/csscapture.py3.1.gz
+ /usr/share/man/man1/csscapture_py3.1.gz
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: packages/cssutils/trunk/debian/rules
===================================================================
--- packages/cssutils/trunk/debian/rules 2011-11-28 15:46:34 UTC (rev 19458)
+++ packages/cssutils/trunk/debian/rules 2011-11-28 22:23:17 UTC (rev 19459)
@@ -3,6 +3,7 @@
#get our python versions
PYVERS := $(shell pyversions -r)
PY3VERS := $(shell py3versions -r)
+T_DIR := $(CURDIR)/debian/python-cssutils/usr/lib
%:
dh $@ --with python2,python3
@@ -32,22 +33,43 @@
rm $(CURDIR)/debian/python3-cssutils/usr/bin/cssparse_py2
rm $(CURDIR)/debian/python3-cssutils/usr/bin/csscombine_py2
rm $(CURDIR)/debian/python3-cssutils/usr/bin/csscapture_py2
+ #do tests for py2 package. Unable to run tests for py3 package, py3-nose
+ #package is not available (yet). Not running test_script_csscombine and
+ #test_cssutils.py.
+ set -e; \
+ for py in $(PYVERS); do \
+ mv $(CURDIR)/debian/python-cssutils/usr/lib/$$py/dist-packages/tests \
+ $(CURDIR)/debian/python-cssutils/usr/lib/$$py/dist-packages/cssutils_tests; \
+ nosetests --verbosity=2 -w $(T_DIR)/$$py/dist-packages/cssutils_tests \
+ basetest.py test_codec.py test_parse.py test_csscharsetrule.py \
+ test_csscomment.py test_cssfontfacerule.py test_cssimportrule.py \
+ test_cssnamespacerule.py test_csspagerule.py test_cssproperties.py \
+ test_cssrule.py test_cssrulelist.py test_cssstyledeclaration.py \
+ test_cssstylerule.py test_cssstylesheet.py test_cssunknownrule.py \
+ test_cssutilsimport.py test_cssvalue.py test_cssvariablesdeclaration.py \
+ test_cssvariablesrule.py test_domimplementation.py test_errorhandler.py \
+ test_helper.py test_cssmediarule.py test_medialist.py test_mediaquery.py \
+ test_prodparser.py test_profiles.py test_properties.py test_property.py \
+ test_selector.py test_selectorlist.py test_serialize.py test_settings.py \
+ test_stylesheet.py test_tokenize2.py test_util.py test_value.py \
+ test_x.py test_encutils/__init__.py; \
+ done
override_dh_installman:
- cp debian/man/cssparse.manpage1 debian/man/cssparse.py2.1
- dh_installman -p python-cssutils debian/man/cssparse.py2.1
- cp debian/man/csscombine.manpage1 debian/man/csscombine.py2.1
- dh_installman -p python-cssutils debian/man/csscombine.py2.1
- cp debian/man/csscapture.manpage1 debian/man/csscapture.py2.1
- dh_installman -p python-cssutils debian/man/csscapture.py2.1
- cp debian/man/cssparse.manpage1 debian/man/cssparse.py3.1
- dh_installman -p python3-cssutils debian/man/cssparse.py3.1
- cp debian/man/csscombine.manpage1 debian/man/csscombine.py3.1
- dh_installman -p python3-cssutils debian/man/csscombine.py3.1
- cp debian/man/csscapture.manpage1 debian/man/csscapture.py3.1
- dh_installman -p python3-cssutils debian/man/csscapture.py3.1
+ cp debian/man/cssparse.manpage1 debian/man/cssparse_py2.1
+ dh_installman -p python-cssutils debian/man/cssparse_py2.1
+ cp debian/man/csscombine.manpage1 debian/man/csscombine_py2.1
+ dh_installman -p python-cssutils debian/man/csscombine_py2.1
+ cp debian/man/csscapture.manpage1 debian/man/csscapture_py2.1
+ dh_installman -p python-cssutils debian/man/csscapture_py2.1
+ cp debian/man/cssparse.manpage1 debian/man/cssparse_py3.1
+ dh_installman -p python3-cssutils debian/man/cssparse_py3.1
+ cp debian/man/csscombine.manpage1 debian/man/csscombine_py3.1
+ dh_installman -p python3-cssutils debian/man/csscombine_py3.1
+ cp debian/man/csscapture.manpage1 debian/man/csscapture_py3.1
+ dh_installman -p python3-cssutils debian/man/csscapture_py3.1
override_dh_auto_clean:
rm -rf build *.egg-info
- rm -f debian/man/cssparse.py2.1 debian/man/csscombine.py2.1 debian/man/csscapture.py2.1
- rm -f debian/man/cssparse.py3.1 debian/man/csscombine.py3.1 debian/man/csscapture.py3.1
+ rm -f debian/man/cssparse_py2.1 debian/man/csscombine_py2.1 debian/man/csscapture_py2.1
+ rm -f debian/man/cssparse_py3.1 debian/man/csscombine_py3.1 debian/man/csscapture_py3.1
More information about the Python-modules-commits
mailing list