[Python-modules-commits] r25250 - in packages/python-webob/trunk/debian (10 files)

barry at users.alioth.debian.org barry at users.alioth.debian.org
Wed Jul 24 21:40:57 UTC 2013 

    Date: Wednesday, July 24, 2013 @ 21:40:25
  Author: barry
Revision: 25250

* Team upload.
* Add Python 3 support, contributed by Yolanda Robla.  (Closes: #717655)
* debian/patches/fix_test_header2.patch: Test should pass independently
  of the order of result.
* debian/control:
  - Add Barry Warsaw to Uploaders.
  - Add python3-webob and python-webob-doc binary packages.
  - wrap-and-sort
  - Add X-Python3-Version.
* debian/watch: Use the PyPI download URL.
* debian/rules: Modernize as per library style guide.

Added:
  packages/python-webob/trunk/debian/patches/
  packages/python-webob/trunk/debian/patches/fix_test_headers2.patch
  packages/python-webob/trunk/debian/patches/series
  packages/python-webob/trunk/debian/python-webob-doc.lintian-overrides
  packages/python-webob/trunk/debian/python-webob.install
  packages/python-webob/trunk/debian/python3-webob.install
Modified:
  packages/python-webob/trunk/debian/changelog
  packages/python-webob/trunk/debian/control
  packages/python-webob/trunk/debian/rules
  packages/python-webob/trunk/debian/watch

Modified: packages/python-webob/trunk/debian/changelog
===================================================================
--- packages/python-webob/trunk/debian/changelog	2013-07-24 14:03:35 UTC (rev 25249)
+++ packages/python-webob/trunk/debian/changelog	2013-07-24 21:40:25 UTC (rev 25250)
@@ -1,3 +1,19 @@
+python-webob (1.2.3-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Add Python 3 support, contributed by Yolanda Robla.  (Closes: #717655)
+  * debian/patches/fix_test_header2.patch: Test should pass independently
+    of the order of result.
+  * debian/control:
+    - Add Barry Warsaw to Uploaders.
+    - Add python3-webob and python-webob-doc binary packages.
+    - wrap-and-sort
+    - Add X-Python3-Version.
+  * debian/watch: Use the PyPI download URL.
+  * debian/rules: Modernize as per library style guide.
+
+ -- Barry Warsaw <barry at debian.org>  Tue, 23 Jul 2013 19:16:17 -0400
+
 python-webob (1.2.3-2) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/python-webob/trunk/debian/control
===================================================================
--- packages/python-webob/trunk/debian/control	2013-07-24 14:03:35 UTC (rev 25249)
+++ packages/python-webob/trunk/debian/control	2013-07-24 21:40:25 UTC (rev 25250)
@@ -2,25 +2,62 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Christoph Haas <haas at debian.org>, Piotr Ożarowski <piotr at debian.org>,
- Soren Hansen <soren at ubuntu.com>
+Uploaders: Christoph Haas <haas at debian.org>,
+           Piotr Ożarowski <piotr at debian.org>,
+           Soren Hansen <soren at ubuntu.com>,
+           Barry Warsaw <barry at debian.org>
 Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: python-all (>= 2.6.6-3),
- python-setuptools (>= 0.6b3-1~), python-sphinx (>= 1.0.7+dfsg-1~),
- python-webtest, python-nose
+                     python-nose,
+                     python-setuptools (>= 0.6b3-1~),
+                     python-sphinx (>= 1.0.7+dfsg-1~),
+                     python-webtest,
+                     python3-all,
+                     python3-nose,
+                     python3-setuptools
 Standards-Version: 3.9.4
 Homepage: http://webob.org/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-webob/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-webob/trunk/
 X-Python-Version: >= 2.5
+X-Python3-Version: >= 3.2
 
 Package: python-webob
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python
+Depends: python, ${misc:Depends}, ${python:Depends}
+Suggests: python-webob-doc
+Description: Python module providing WSGI request and response objects (Python 2)
+ WebOb provides wrappers around the WSGI request environment, and an object to
+ help create WSGI responses.
+ .
+ The objects map much of the specified behavior of HTTP, including header
+ parsing and accessors for other standard parts of the environment.
+ .
+ This is the Python 2 version of the package.
+
+Package: python3-webob
+Architecture: all
+Depends: python3, ${misc:Depends}, ${python3:Depends}
+Suggests: python-webob-doc
+Description: Python module providing WSGI request and response objects (Python 3)
+ WebOb provides wrappers around the WSGI request environment, and an object to
+ help create WSGI responses.
+ .
+ The objects map much of the specified behavior of HTTP, including header
+ parsing and accessors for other standard parts of the environment.
+ .
+ This is the Python 3 version of the package.
+
+Package: python-webob-doc
+Architecture: all
+Section: doc
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
 Suggests: libjs-jquery
-Description: Python module providing WSGI request and response objects
+Description: Python module providing WSGI request and response objects (documentation)
  WebOb provides wrappers around the WSGI request environment, and an object to
  help create WSGI responses.
  .
  The objects map much of the specified behavior of HTTP, including header
  parsing and accessors for other standard parts of the environment.
+ .
+ This is the common documentation.

Added: packages/python-webob/trunk/debian/patches/fix_test_headers2.patch
===================================================================
--- packages/python-webob/trunk/debian/patches/fix_test_headers2.patch	                        (rev 0)
+++ packages/python-webob/trunk/debian/patches/fix_test_headers2.patch	2013-07-24 21:40:25 UTC (rev 25250)
@@ -0,0 +1,16 @@
+Description: Test should pass independently of the order of result.
+Author: Yolanda Robla <yolanda.robla at canonical.com>
+Forwarded: no
+
+@@ -0,0 +1,12 @@
+--- a/tests/test_request.py	2013-07-15 09:25:02.000000000 +0000
++++ b/tests/test_request.py	2013-07-15 09:34:34.962943891 +0000
+@@ -2662,7 +2662,7 @@
+             self.assertTrue(i in r.headers and
+                 'HTTP_'+i.upper().replace('-', '_') in r.environ)
+         r.headers = {'Server':'Apache'}
+-        self.assertEqual(list(r.environ.keys()), ['a',  'HTTP_SERVER'])
++        self.assertEqual(set(list(r.environ.keys())), set(['a',  'HTTP_SERVER']))
+ 
+     def test_host_url(self):
+         # Request has a read only property host_url that combines several

Added: packages/python-webob/trunk/debian/patches/series
===================================================================
--- packages/python-webob/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-webob/trunk/debian/patches/series	2013-07-24 21:40:25 UTC (rev 25250)
@@ -0,0 +1 @@
+fix_test_headers2.patch

Added: packages/python-webob/trunk/debian/python-webob-doc.lintian-overrides
===================================================================
--- packages/python-webob/trunk/debian/python-webob-doc.lintian-overrides	                        (rev 0)
+++ packages/python-webob/trunk/debian/python-webob-doc.lintian-overrides	2013-07-24 21:40:25 UTC (rev 25250)
@@ -0,0 +1 @@
+python-webob-doc binary: extra-license-file /usr/share/doc/python-webob-doc/docs/_sources/license.txt

Added: packages/python-webob/trunk/debian/python-webob.install
===================================================================
--- packages/python-webob/trunk/debian/python-webob.install	                        (rev 0)
+++ packages/python-webob/trunk/debian/python-webob.install	2013-07-24 21:40:25 UTC (rev 25250)
@@ -0,0 +1 @@
+usr/lib/python2*

Added: packages/python-webob/trunk/debian/python3-webob.install
===================================================================
--- packages/python-webob/trunk/debian/python3-webob.install	                        (rev 0)
+++ packages/python-webob/trunk/debian/python3-webob.install	2013-07-24 21:40:25 UTC (rev 25250)
@@ -0,0 +1 @@
+usr/lib/python3

Modified: packages/python-webob/trunk/debian/rules
===================================================================
--- packages/python-webob/trunk/debian/rules	2013-07-24 14:03:35 UTC (rev 25249)
+++ packages/python-webob/trunk/debian/rules	2013-07-24 21:40:25 UTC (rev 25250)
@@ -3,56 +3,41 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-package=python-webob
+PYTHON2=$(shell pyversions -vr)
+PYTHON3=$(shell py3versions -vr)
 
-clean:
-	rm -rf build
-	find . -name *\.py[co] -delete
-	dh_clean build-docs build-* WebOb.egg-info/*
+# Prevent setuptools/distribute from accessing the internet.
+export http_proxy = http://127.0.9.1:9
 
+%:
+	dh $@ --with python2,python3,sphinxdoc
 
-build: build-arch build-indep
-build-arch:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+test-python%:
+	# The tests require connections to localhost.
+	http_proxy= python$* setup.py test -vv
 
-build-indep:
-	dh_testdir
-	dh_installdirs
-	[ -d docs/_static ] || mkdir docs/_static # Sphinx needs it
-	PYTHONPATH=. sphinx-build -N -q -E -b html docs/ debian/$(package)/usr/share/doc/$(package)/docs/
-	echo "$(package): extra-license-file usr/share/doc/$(package)/docs/_sources/license.txt" \
-		>> debian/$(package)/usr/share/lintian/overrides/$(package)
-	dh_link usr/share/doc/$(package)/docs /usr/share/doc/python-paste/docs/webob
-	touch $@
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	python setup.py install \
-		--no-compile \
-		--single-version-externally-managed \
-		--root $(CURDIR)/debian/$(package) \
-		--install-layout=deb
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	python setup.py test --quiet
+override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
 endif
 
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs docs/news.txt
-	dh_installdocs
-	dh_sphinxdoc
-	dh_compress -X.py -X.js -X.inv
-	dh_fixperms
-	dh_python2
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+build-python%:
+	python$* setup.py build
 
-binary-arch:
+override_dh_auto_build: $(PYTHON3:%=build-python%)
+	dh_auto_build
 
-binary: binary-indep binary-arch
-.PHONY: build build-arch clean binary-indep binary-arch binary install
+install-python%:
+	python$* setup.py install --root=$(CURDIR)/debian/tmp \
+		 --install-layout=deb
 
+override_dh_auto_install: $(PYTHON3:%=install-python%)
+	dh_auto_install
+
+override_dh_installchangelogs:
+	dh_installchangelogs -k docs/news.txt
+
+override_dh_installdocs:
+	[ -d docs/_static ] || mkdir docs/_static # Sphinx needs it
+	PYTHONPATH=. sphinx-build -N -q -E -b html docs/ \
+		     debian/python-webob-doc/usr/share/doc/python-webob-doc/
+#	dh_link usr/share/doc/tmp/docs /usr/share/doc/python-paste/docs/webob

Modified: packages/python-webob/trunk/debian/watch
===================================================================
--- packages/python-webob/trunk/debian/watch	2013-07-24 14:03:35 UTC (rev 25249)
+++ packages/python-webob/trunk/debian/watch	2013-07-24 21:40:25 UTC (rev 25250)
@@ -1,2 +1,2 @@
 version=3
-https://github.com/Pylons/webob/tags .*/(\d[\d\.]+)\.tar\.gz
+http://pypi.python.org/packages/source/W/WebOb/Webob-(.*)\.tar.gz

More information about the Python-modules-commits mailing list