* [gentoo-commits] dev/dev-zero:master commit in: dev-python/flask/, dev-python/flask/files/
@ 2016-07-20 14:50 Tiziano Müller
0 siblings, 0 replies; 2+ messages in thread
From: Tiziano Müller @ 2016-07-20 14:50 UTC (permalink / raw
To: gentoo-commits
commit: 4b078591dda6ec8a0258b974020f693ee4e053c8
Author: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 14:50:00 2016 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 14:50:00 2016 +0000
URL: https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=4b078591
dev-python/flask: add version bump to 0.11
dev-python/flask/Manifest | 1 +
.../flask/files/flask-0.10.1-is_package.patch | 13 +++++
.../flask/files/flask-0.10.1-sort_json.patch | 54 ++++++++++++++++++++
.../flask/files/flask-0.10.1-test_appcontext.patch | 14 ++++++
dev-python/flask/flask-0.11.ebuild | 58 ++++++++++++++++++++++
dev-python/flask/metadata.xml | 12 +++++
6 files changed, 152 insertions(+)
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
new file mode 100644
index 0000000..8d0fd48
--- /dev/null
+++ b/dev-python/flask/Manifest
@@ -0,0 +1 @@
+DIST Flask-0.11.tar.gz 563928 SHA256 29a7405a7f0de178232fe48cd9b2a2403083bf03bd34eabe12168863d4cdb493 SHA512 77ee9998c96ba5e4eb007b81e04a051a6f8fc3ac837496a8c9e6637fdbff3e6fbba4912919b1cb2c5ed72951cc9fb8eb28d699e3f15de14ecbb51c362111eafc WHIRLPOOL ee65af738a841a05c7d2ad2e9b021e3b0a0e046db706c747802d675d76246701b62d1911fae321aa460f7aafd17274b21177fd2cc5c647383ac6b6eba37cd36d
diff --git a/dev-python/flask/files/flask-0.10.1-is_package.patch b/dev-python/flask/files/flask-0.10.1-is_package.patch
new file mode 100644
index 0000000..611d931
--- /dev/null
+++ b/dev-python/flask/files/flask-0.10.1-is_package.patch
@@ -0,0 +1,13 @@
+https://github.com/mitsuhiko/flask/issues/487
+diff -ur Flask-0.10.1.orig/flask/helpers.py Flask-0.10.1/flask/helpers.py
+--- flask/helpers.py 2013-06-14 06:35:43.000000000 +0800
++++ flask/helpers.py 2013-08-16 16:18:36.194006290 +0800
+@@ -679,7 +679,7 @@
+ filename = sys.modules[import_name].__file__
+ package_path = os.path.abspath(os.path.dirname(filename))
+ # package_path ends with __init__.py for a package
+- if loader.is_package(root_mod_name):
++ if package_path.endswith('__init__.py'):
+ package_path = os.path.dirname(package_path)
+
+ site_parent, site_folder = os.path.split(package_path)
diff --git a/dev-python/flask/files/flask-0.10.1-sort_json.patch b/dev-python/flask/files/flask-0.10.1-sort_json.patch
new file mode 100644
index 0000000..e78cd0d
--- /dev/null
+++ b/dev-python/flask/files/flask-0.10.1-sort_json.patch
@@ -0,0 +1,54 @@
+https://github.com/mitsuhiko/flask/commit/a2bc61b5ab19e899735f8945f68123b4cea570d5
+diff --git a/flask/testsuite/helpers.py b/flask/testsuite/helpers.py
+index 636f67f..7de70c0 100644
+--- a/flask/testsuite/helpers.py
++++ b/flask/testsuite/helpers.py
+@@ -173,7 +173,33 @@ def index():
+ 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 @@ def index():
+ '"19": "foo"',
+ '}',
+ '}'
+- ])
++ ]
+
++ try:
++ self.assert_equal(lines, sorted_by_int)
++ except AssertionError:
++ self.assert_equal(lines, sorted_by_str)
+
+ class SendfileTestCase(FlaskTestCase):
+
diff --git a/dev-python/flask/files/flask-0.10.1-test_appcontext.patch b/dev-python/flask/files/flask-0.10.1-test_appcontext.patch
new file mode 100644
index 0000000..11dee7a
--- /dev/null
+++ b/dev-python/flask/files/flask-0.10.1-test_appcontext.patch
@@ -0,0 +1,14 @@
+https://github.com/mitsuhiko/flask/commit/f88cc2d2f9d14d97e33ddd2bbaa4b1885db06e1c.
+diff --git a/flask/testsuite/signals.py b/flask/testsuite/signals.py
+index e061932..45ca45d 100644
+--- a/flask/testsuite/signals.py
++++ b/flask/testsuite/signals.py
+@@ -102,7 +102,7 @@ def test_appcontext_signals(self):
+ def record_push(sender, **kwargs):
+ recorded.append('push')
+ def record_pop(sender, **kwargs):
+- recorded.append('push')
++ recorded.append('pop')
+
+ @app.route('/')
+ def index():
diff --git a/dev-python/flask/flask-0.11.ebuild b/dev-python/flask/flask-0.11.ebuild
new file mode 100644
index 0000000..03c530e
--- /dev/null
+++ b/dev-python/flask/flask-0.11.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/pallets/flask/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND=">=dev-python/blinker-1[${PYTHON_USEDEP}]
+ >=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.4[${PYTHON_USEDEP}]
+ >=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}]
+ >=dev-python/click-2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/greenlet[${PYTHON_USEDEP}]
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+ # Prevent un-needed d'loading
+ sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ use examples && dodoc -r examples
+ use doc && HTML_DOCS=( docs/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/metadata.xml b/dev-python/flask/metadata.xml
new file mode 100644
index 0000000..0d86093
--- /dev/null
+++ b/dev-python/flask/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">Flask</remote-id>
+ <remote-id type="github">mitsuhiko/flask</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: dev-python/flask/, dev-python/flask/files/
@ 2016-07-21 7:16 Tiziano Müller
0 siblings, 0 replies; 2+ messages in thread
From: Tiziano Müller @ 2016-07-21 7:16 UTC (permalink / raw
To: gentoo-commits
commit: b12d605fe4c27549a9c2498df74f3714d43bfd06
Author: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 06:56:20 2016 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 06:56:20 2016 +0000
URL: https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=b12d605f
dev-python/flask: changes merged to ebuild in tree
dev-python/flask/Manifest | 1 -
.../flask/files/flask-0.10.1-is_package.patch | 13 -----
.../flask/files/flask-0.10.1-sort_json.patch | 54 --------------------
.../flask/files/flask-0.10.1-test_appcontext.patch | 14 ------
dev-python/flask/flask-0.11.ebuild | 58 ----------------------
dev-python/flask/metadata.xml | 12 -----
6 files changed, 152 deletions(-)
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
deleted file mode 100644
index 8d0fd48..0000000
--- a/dev-python/flask/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Flask-0.11.tar.gz 563928 SHA256 29a7405a7f0de178232fe48cd9b2a2403083bf03bd34eabe12168863d4cdb493 SHA512 77ee9998c96ba5e4eb007b81e04a051a6f8fc3ac837496a8c9e6637fdbff3e6fbba4912919b1cb2c5ed72951cc9fb8eb28d699e3f15de14ecbb51c362111eafc WHIRLPOOL ee65af738a841a05c7d2ad2e9b021e3b0a0e046db706c747802d675d76246701b62d1911fae321aa460f7aafd17274b21177fd2cc5c647383ac6b6eba37cd36d
diff --git a/dev-python/flask/files/flask-0.10.1-is_package.patch b/dev-python/flask/files/flask-0.10.1-is_package.patch
deleted file mode 100644
index 611d931..0000000
--- a/dev-python/flask/files/flask-0.10.1-is_package.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/mitsuhiko/flask/issues/487
-diff -ur Flask-0.10.1.orig/flask/helpers.py Flask-0.10.1/flask/helpers.py
---- flask/helpers.py 2013-06-14 06:35:43.000000000 +0800
-+++ flask/helpers.py 2013-08-16 16:18:36.194006290 +0800
-@@ -679,7 +679,7 @@
- filename = sys.modules[import_name].__file__
- package_path = os.path.abspath(os.path.dirname(filename))
- # package_path ends with __init__.py for a package
-- if loader.is_package(root_mod_name):
-+ if package_path.endswith('__init__.py'):
- package_path = os.path.dirname(package_path)
-
- site_parent, site_folder = os.path.split(package_path)
diff --git a/dev-python/flask/files/flask-0.10.1-sort_json.patch b/dev-python/flask/files/flask-0.10.1-sort_json.patch
deleted file mode 100644
index e78cd0d..0000000
--- a/dev-python/flask/files/flask-0.10.1-sort_json.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://github.com/mitsuhiko/flask/commit/a2bc61b5ab19e899735f8945f68123b4cea570d5
-diff --git a/flask/testsuite/helpers.py b/flask/testsuite/helpers.py
-index 636f67f..7de70c0 100644
---- a/flask/testsuite/helpers.py
-+++ b/flask/testsuite/helpers.py
-@@ -173,7 +173,33 @@ def index():
- 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 @@ def index():
- '"19": "foo"',
- '}',
- '}'
-- ])
-+ ]
-
-+ try:
-+ self.assert_equal(lines, sorted_by_int)
-+ except AssertionError:
-+ self.assert_equal(lines, sorted_by_str)
-
- class SendfileTestCase(FlaskTestCase):
-
diff --git a/dev-python/flask/files/flask-0.10.1-test_appcontext.patch b/dev-python/flask/files/flask-0.10.1-test_appcontext.patch
deleted file mode 100644
index 11dee7a..0000000
--- a/dev-python/flask/files/flask-0.10.1-test_appcontext.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/mitsuhiko/flask/commit/f88cc2d2f9d14d97e33ddd2bbaa4b1885db06e1c.
-diff --git a/flask/testsuite/signals.py b/flask/testsuite/signals.py
-index e061932..45ca45d 100644
---- a/flask/testsuite/signals.py
-+++ b/flask/testsuite/signals.py
-@@ -102,7 +102,7 @@ def test_appcontext_signals(self):
- def record_push(sender, **kwargs):
- recorded.append('push')
- def record_pop(sender, **kwargs):
-- recorded.append('push')
-+ recorded.append('pop')
-
- @app.route('/')
- def index():
diff --git a/dev-python/flask/flask-0.11.ebuild b/dev-python/flask/flask-0.11.ebuild
deleted file mode 100644
index 03c530e..0000000
--- a/dev-python/flask/flask-0.11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy{,3} )
-
-inherit distutils-r1
-
-MY_PN="Flask"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-HOMEPAGE="https://github.com/pallets/flask/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND=">=dev-python/blinker-1[${PYTHON_USEDEP}]
- >=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.4[${PYTHON_USEDEP}]
- >=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}]
- >=dev-python/click-2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/greenlet[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
- # Prevent un-needed d'loading
- sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- py.test -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- use examples && dodoc -r examples
- use doc && HTML_DOCS=( docs/_build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/flask/metadata.xml b/dev-python/flask/metadata.xml
deleted file mode 100644
index 0d86093..0000000
--- a/dev-python/flask/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>python@gentoo.org</email>
- <name>Python</name>
- </maintainer>
- <upstream>
- <remote-id type="pypi">Flask</remote-id>
- <remote-id type="github">mitsuhiko/flask</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-21 7:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-20 14:50 [gentoo-commits] dev/dev-zero:master commit in: dev-python/flask/, dev-python/flask/files/ Tiziano Müller
-- strict thread matches above, loose matches on Subject: below --
2016-07-21 7:16 Tiziano Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox