[Python-modules-commits] r25447 - in packages/flask/trunk/debian (11 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Thu Aug 8 21:26:48 UTC 2013
Date: Thursday, August 8, 2013 @ 21:26:46
Author: piotr
Revision: 25447
* Add python3-flask binary package
* Switch to pybuild buildsystem
* Add fix_test_appcontext_signals and fix_test_json_key_sorting patches
and enable tests at build time (patches taked from upstream repo)
Added:
packages/flask/trunk/debian/patches/
packages/flask/trunk/debian/patches/fix_test_appcontext_signals.patch
packages/flask/trunk/debian/patches/fix_test_json_key_sorting.patch
packages/flask/trunk/debian/patches/series
packages/flask/trunk/debian/python3-flask.pydist
Modified:
packages/flask/trunk/debian/changelog
packages/flask/trunk/debian/control
packages/flask/trunk/debian/python-flask-doc.doc-base
packages/flask/trunk/debian/python-flask-doc.links
packages/flask/trunk/debian/rules
Deleted:
packages/flask/trunk/debian/python-flask.install
Modified: packages/flask/trunk/debian/changelog
===================================================================
--- packages/flask/trunk/debian/changelog 2013-08-08 20:28:59 UTC (rev 25446)
+++ packages/flask/trunk/debian/changelog 2013-08-08 21:26:46 UTC (rev 25447)
@@ -1,3 +1,13 @@
+flask (0.10.1-2) unstable; urgency=low
+
+ * Add python3-flask binary package
+ * Add python-blinker to Recommends (used in flask.signals)
+ * Switch to pybuild buildsystem
+ * Add fix_test_appcontext_signals and fix_test_json_key_sorting patches
+ and enable tests at build time (patches taked from upstream repo)
+
+ -- Piotr Ożarowski <piotr at debian.org> Thu, 08 Aug 2013 22:19:13 +0200
+
flask (0.10.1-1) unstable; urgency=low
* New upstream release
Modified: packages/flask/trunk/debian/control
===================================================================
--- packages/flask/trunk/debian/control 2013-08-08 20:28:59 UTC (rev 25446)
+++ packages/flask/trunk/debian/control 2013-08-08 21:26:46 UTC (rev 25447)
@@ -3,18 +3,28 @@
Priority: optional
Maintainer: Piotr Ożarowski <piotr at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-6), python-setuptools (>= 0.6b3),
- python-jinja2, python-werkzeug (>= 0.8), python-sphinx (>= 1.0.7+dfsg), python-itsdangerous
+Build-Depends: debhelper (>= 9), dh-python,
+ python-all, python3-all,
+ python-setuptools, python3-setuptools,
+# for docs:
+ python-sphinx (>= 1.0.7+dfsg),
+ python-werkzeug (>= 0.8), python-jinja2, python-itsdangerous,
+# for tests:
+ python3-werkzeug, python3-jinja2, python3-itsdangerous,
+ python-simplejson, python3-simplejson,
+ python-blinker
Standards-Version: 3.9.4
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/flask/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/flask/trunk/
Homepage: http://flask.pocoo.org/
X-Python-Version: >= 2.5
+X-Python3-Version: >= 3.3
Package: python-flask
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
-Recommends: python-pkg-resources, python-simplejson | python (>= 2.6)
+Recommends: python-pkg-resources, python-simplejson | python (>= 2.6),
+ python-blinker
Suggests: python-flask-doc
Description: micro web framework based on Werkzeug, Jinja2 and good intentions
Flask is a micro web framework for Python based on Werkzeug, Jinja 2 and good
@@ -30,6 +40,25 @@
if __name__ == '__main__':
app.run()
+Package: python3-flask
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Recommends: python3-pkg-resources, python3-simplejson | python3
+Suggests: python-flask-doc
+Description: micro web framework based on Werkzeug, Jinja2 and good intentions
+ Flask is a micro web framework for Python based on Werkzeug, Jinja 2 and good
+ intentions. A minimal Flask application looks like that:
+ .
+ from flask import Flask
+ app = Flask(__name__)
+ .
+ @app.route("/")
+ def hello():
+ return "Hello World!"
+ .
+ if __name__ == '__main__':
+ app.run()
+
Package: python-flask-doc
Section: doc
Architecture: all
Added: packages/flask/trunk/debian/patches/fix_test_appcontext_signals.patch
===================================================================
--- packages/flask/trunk/debian/patches/fix_test_appcontext_signals.patch (rev 0)
+++ packages/flask/trunk/debian/patches/fix_test_appcontext_signals.patch 2013-08-08 21:26:46 UTC (rev 25447)
@@ -0,0 +1,13 @@
+Index: flask-0.10.1/flask/testsuite/signals.py
+===================================================================
+--- flask-0.10.1.orig/flask/testsuite/signals.py
++++ flask-0.10.1/flask/testsuite/signals.py
+@@ -102,7 +102,7 @@ class SignalsTestCase(FlaskTestCase):
+ def record_push(sender, **kwargs):
+ recorded.append('push')
+ def record_pop(sender, **kwargs):
+- recorded.append('push')
++ recorded.append('pop')
+
+ @app.route('/')
+ def index():
Added: packages/flask/trunk/debian/patches/fix_test_json_key_sorting.patch
===================================================================
--- packages/flask/trunk/debian/patches/fix_test_json_key_sorting.patch (rev 0)
+++ packages/flask/trunk/debian/patches/fix_test_json_key_sorting.patch 2013-08-08 21:26:46 UTC (rev 25447)
@@ -0,0 +1,53 @@
+Index: flask-0.10.1/flask/testsuite/helpers.py
+===================================================================
+--- flask-0.10.1.orig/flask/testsuite/helpers.py
++++ flask-0.10.1/flask/testsuite/helpers.py
+@@ -173,7 +173,33 @@ class JSONTestCase(FlaskTestCase):
+ c = app.test_client()
+ rv = c.get('/')
+ lines = [x.strip() for x in rv.data.strip().decode('utf-8').splitlines()]
+- self.assert_equal(lines, [
++ sorted_by_str = [
++ '{',
++ '"values": {',
++ '"0": "foo",',
++ '"1": "foo",',
++ '"10": "foo",',
++ '"11": "foo",',
++ '"12": "foo",',
++ '"13": "foo",',
++ '"14": "foo",',
++ '"15": "foo",',
++ '"16": "foo",',
++ '"17": "foo",',
++ '"18": "foo",',
++ '"19": "foo",',
++ '"2": "foo",',
++ '"3": "foo",',
++ '"4": "foo",',
++ '"5": "foo",',
++ '"6": "foo",',
++ '"7": "foo",',
++ '"8": "foo",',
++ '"9": "foo"',
++ '}',
++ '}'
++ ]
++ sorted_by_int = [
+ '{',
+ '"values": {',
+ '"0": "foo",',
+@@ -198,8 +224,12 @@ class JSONTestCase(FlaskTestCase):
+ '"19": "foo"',
+ '}',
+ '}'
+- ])
++ ]
+
++ try:
++ self.assert_equal(lines, sorted_by_int)
++ except AssertionError:
++ self.assert_equal(lines, sorted_by_str)
+
+ class SendfileTestCase(FlaskTestCase):
+
Added: packages/flask/trunk/debian/patches/series
===================================================================
--- packages/flask/trunk/debian/patches/series (rev 0)
+++ packages/flask/trunk/debian/patches/series 2013-08-08 21:26:46 UTC (rev 25447)
@@ -0,0 +1,2 @@
+fix_test_appcontext_signals.patch
+fix_test_json_key_sorting.patch
Modified: packages/flask/trunk/debian/python-flask-doc.doc-base
===================================================================
--- packages/flask/trunk/debian/python-flask-doc.doc-base 2013-08-08 20:28:59 UTC (rev 25446)
+++ packages/flask/trunk/debian/python-flask-doc.doc-base 2013-08-08 21:26:46 UTC (rev 25447)
@@ -1,6 +1,6 @@
Document: flask
Title: Flask Documentation
-Author: Mike Bayer
+Author: Armin Ronacher
Abstract: This document describes Flask - Python micro web framework
Section: Programming/Python
Modified: packages/flask/trunk/debian/python-flask-doc.links
===================================================================
--- packages/flask/trunk/debian/python-flask-doc.links 2013-08-08 20:28:59 UTC (rev 25446)
+++ packages/flask/trunk/debian/python-flask-doc.links 2013-08-08 21:26:46 UTC (rev 25447)
@@ -1 +1,4 @@
-/usr/share/doc/python-flask/html/_sources/ /usr/share/doc/python-flask/rst
+/usr/share/doc/python-flask-doc/html /usr/share/doc/python-flask/html
+/usr/share/doc/python-flask-doc/html/_sources/ /usr/share/doc/python-flask/rst
+/usr/share/doc/python-flask-doc/html /usr/share/doc/python3-flask/html
+/usr/share/doc/python-flask-doc/html/_sources/ /usr/share/doc/python3-flask/rst
Deleted: packages/flask/trunk/debian/python-flask.install
===================================================================
--- packages/flask/trunk/debian/python-flask.install 2013-08-08 20:28:59 UTC (rev 25446)
+++ packages/flask/trunk/debian/python-flask.install 2013-08-08 21:26:46 UTC (rev 25447)
@@ -1 +0,0 @@
-/usr/lib/python2.*
Added: packages/flask/trunk/debian/python3-flask.pydist
===================================================================
--- packages/flask/trunk/debian/python3-flask.pydist (rev 0)
+++ packages/flask/trunk/debian/python3-flask.pydist 2013-08-08 21:26:46 UTC (rev 25447)
@@ -0,0 +1 @@
+Flask python3-flask; PEP386
Modified: packages/flask/trunk/debian/rules
===================================================================
--- packages/flask/trunk/debian/rules 2013-08-08 20:28:59 UTC (rev 25446)
+++ packages/flask/trunk/debian/rules 2013-08-08 21:26:46 UTC (rev 25447)
@@ -1,21 +1,23 @@
#!/usr/bin/make -f
-export PYTHONPATH=$(CURDIR)
+export PYBUILD_DESTDIR_python2=debian/python-flask/
+export PYBUILD_DESTDIR_python3=debian/python3-flask/
%:
- dh $@ --buildsystem python_distutils --with python2,sphinxdoc
+ dh $@ --with python2,python3,sphinxdoc --buildsystem pybuild
-build:
- dh build
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- make test
-endif
+override_dh_auto_test:
+ http_proxy='' dh_auto_test
+override_dh_python3:
+ dh_python3 -p python3-flask
+ rm -rf debian/python3-flask/usr/lib/python3/dist-packages/flask/testsuite/
+
override_dh_installdocs:
dh_installdocs
- PYTHONPATH=. sphinx-build -N -q -E -b html docs/ debian/python-flask-doc/usr/share/doc/python-flask/html/
+ PYTHONPATH=. sphinx-build -N -q -E -b html docs/ debian/python-flask-doc/usr/share/doc/python-flask-doc/html/
-clean:
- dh clean
+override_dh_auto_clean:
+ dh_auto_clean
rm -rf Flask.egg-info/ build
find . \( -name '*.py[co]' -or -name '\._*' -or -name '\.DS_Store' \) -delete
More information about the Python-modules-commits
mailing list