commit: 9452eec1b92c35c95b2d1f9b2d8b836ed3842032 Author: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> AuthorDate: Thu Jul 21 09:14:48 2016 +0000 Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> CommitDate: Thu Jul 21 09:14:48 2016 +0000 URL: https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=9452eec1
dev-python/flask-babel: version bump .../flask-admin-1.4.0-fix-peewee-2.8-compat.patch | 49 ---------------------- ...in-1.4.0-r1.ebuild => flask-admin-1.4.2.ebuild} | 0 dev-python/flask-babel/Manifest | 3 +- .../files/flask-babel-0.9-tests-fix.patch | 41 ------------------ ...-babel-0.9.ebuild => flask-babel-0.11.1.ebuild} | 9 ++-- 5 files changed, 5 insertions(+), 97 deletions(-) diff --git a/dev-python/flask-admin/files/flask-admin-1.4.0-fix-peewee-2.8-compat.patch b/dev-python/flask-admin/files/flask-admin-1.4.0-fix-peewee-2.8-compat.patch deleted file mode 100644 index 7c6cbd0..0000000 --- a/dev-python/flask-admin/files/flask-admin-1.4.0-fix-peewee-2.8-compat.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f913fa09137e981d308d0d4b0049591acb1c740e Mon Sep 17 00:00:00 2001 -From: German Rosales <[email protected]> -Date: Tue, 2 Feb 2016 17:17:50 -0500 -Subject: [PATCH] fixes #1185 according to coleifer/peewee@50c9c1d with retro - compatibility for peewee's model meta fields hack - ---- - flask_admin/contrib/peewee/form.py | 4 ++-- - flask_admin/contrib/peewee/tools.py | 8 ++++++++ - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/flask_admin/contrib/peewee/form.py b/flask_admin/contrib/peewee/form.py -index 1a68cb0..10edbf9 100644 ---- a/flask_admin/contrib/peewee/form.py -+++ b/flask_admin/contrib/peewee/form.py -@@ -10,7 +10,7 @@ - from flask_admin.model.form import InlineFormAdmin, InlineModelConverterBase - from flask_admin.model.fields import InlineModelFormField, InlineFieldList, AjaxSelectField - --from .tools import get_primary_key -+from .tools import get_primary_key, get_meta_fields - from .ajax import create_ajax_loader - - -@@ -210,7 +210,7 @@ def contribute(self, converter, model, form_class, inline_model): - - info = self.get_info(inline_model) - -- for field in info.model._meta.get_fields(): -+ for field in get_meta_fields(info.model): - field_type = type(field) - - if field_type == ForeignKeyField: -diff --git a/flask_admin/contrib/peewee/tools.py b/flask_admin/contrib/peewee/tools.py -index 32baa9d..8459756 100644 ---- a/flask_admin/contrib/peewee/tools.py -+++ b/flask_admin/contrib/peewee/tools.py -@@ -11,3 +11,11 @@ def parse_like_term(term): - stmt = '%%%s%%' % term - - return stmt -+ -+ -+def get_meta_fields(model): -+ try: -+ fields = model._meta.sorted_fields -+ except AttributeError: -+ fields = model._meta.get_fields() -+ return fields diff --git a/dev-python/flask-admin/flask-admin-1.4.0-r1.ebuild b/dev-python/flask-admin/flask-admin-1.4.2.ebuild similarity index 100% rename from dev-python/flask-admin/flask-admin-1.4.0-r1.ebuild rename to dev-python/flask-admin/flask-admin-1.4.2.ebuild diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest index 5f0e269..004fa78 100644 --- a/dev-python/flask-babel/Manifest +++ b/dev-python/flask-babel/Manifest @@ -1,2 +1 @@ -DIST Flask-Babel-0.8.tar.gz 44520 SHA256 a255d77910ddfbebc6318c618d9a23cda5d018c86c7e0dea64dc860a16cb3daa SHA512 76e34df0748ec0ee2c0964ab07e85dd708c38601e55626fcc40b5a6064e5f2065c1969c4f888827225daf0ce2bf0a41670ba020f7d52b93915f4120cc478798d WHIRLPOOL 35f914bc4e765e03ccf699bbba696980b1ea48e07491d9e401c9ac76ce701575e8d0d69a63c144ad45fd2df76c7d3948b15cadfdbbc7ffd528ee5eca73e0bd31 -DIST Flask-Babel-0.9.tar.gz 38881 SHA256 4afd150f360434b00684ba7848358f7961072fd0658a6e81aaa578522699fb4c SHA512 c667c8a532332bb3dd0d694932d17f7f9b2b51f68151767624116853b2e71f2a6b4c47164d17a6f368b67a5cabce97495b18147655fb36aee5034c058d3b9a89 WHIRLPOOL 28309a4a27bfd0fbe30be52613ee9eef5110e3cc38e863c6de200cced579476870e01b92edaeb08fd29e0deabcaa13d14742d188960742d61cf8ba5384476cd1 +DIST Flask-Babel-0.11.1.tar.gz 40494 SHA256 d29b36c399e42e98bc9401c8c1c159f2befcb8c12a2a2a87ec49ad7623036899 SHA512 a70ab4c10d2e495121f8e050e2d6ed136a85b1030c90e540a7746c6e759a63f12940fe44b4551f221445839e972e298053e7778d3fcf1e4ecb7cd9a79699b19a WHIRLPOOL 57ac267da8fb9a0e4034f54b26a73d7b241a0c25705ee3f958b9f8784e5e39e8826279401e0a9423fdd0b02021eb921cdb0241237660a2c51255d122c2a5b9b0 diff --git a/dev-python/flask-babel/files/flask-babel-0.9-tests-fix.patch b/dev-python/flask-babel/files/flask-babel-0.9-tests-fix.patch deleted file mode 100644 index 5b11f1a..0000000 --- a/dev-python/flask-babel/files/flask-babel-0.9-tests-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d56d2c9a42c291a3592f3d7977b4dcca9ac755b3 Mon Sep 17 00:00:00 2001 -From: Jeffrey Kyllo <[email protected]> -Date: Mon, 25 Jan 2016 14:00:04 +0000 -Subject: [PATCH] Updated DateFormattingTestCase with new datetime formats from - babel. - ---- - tests/tests.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/tests.py b/tests/tests.py -index 63c2ecf..2df68ee 100644 ---- a/tests/tests.py -+++ b/tests/tests.py -@@ -35,7 +35,7 @@ def test_basics(self): - with app.test_request_context(): - app.config['BABEL_DEFAULT_LOCALE'] = 'de_DE' - assert babel.format_datetime(d, 'long') == \ -- '12. April 2010 15:46:00 MESZ' -+ '12. April 2010 um 15:46:00 MESZ' - - def test_init_app(self): - b = babel.Babel() -@@ -57,7 +57,7 @@ def test_init_app(self): - with app.test_request_context(): - app.config['BABEL_DEFAULT_LOCALE'] = 'de_DE' - assert babel.format_datetime(d, 'long') == \ -- '12. April 2010 15:46:00 MESZ' -+ '12. April 2010 um 15:46:00 MESZ' - - def test_custom_formats(self): - app = flask.Flask(__name__) -@@ -95,7 +95,7 @@ def select_timezone(): - the_timezone = 'Europe/Vienna' - - with app.test_request_context(): -- assert babel.format_datetime(d) == '12.04.2010 15:46:00' -+ assert babel.format_datetime(d) == '12.04.2010, 15:46:00' - - def test_refreshing(self): - app = flask.Flask(__name__) diff --git a/dev-python/flask-babel/flask-babel-0.9.ebuild b/dev-python/flask-babel/flask-babel-0.11.1.ebuild similarity index 83% rename from dev-python/flask-babel/flask-babel-0.9.ebuild rename to dev-python/flask-babel/flask-babel-0.11.1.ebuild index eea2489..eb692ca 100644 --- a/dev-python/flask-babel/flask-babel-0.9.ebuild +++ b/dev-python/flask-babel/flask-babel-0.11.1.ebuild @@ -12,13 +12,13 @@ MY_PN="Flask-Babel" MY_P="${MY_PN}-${PV}" DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz" -HOMEPAGE="http://packages.python.org/Flask-Babel/"; +HOMEPAGE="https://pythonhosted.org/Flask-Babel/"; SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="test" RDEPEND="dev-python/flask[${PYTHON_USEDEP}] dev-python/Babel[${PYTHON_USEDEP}] @@ -26,9 +26,8 @@ RDEPEND="dev-python/flask[${PYTHON_USEDEP}] >=dev-python/speaklater-1.2[${PYTHON_USEDEP}] >=dev-python/jinja-2.5[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -PATCHES=( "${FILESDIR}/${P}-tests-fix.patch" ) + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/nose[${PYTHON_USEDEP}] )" S="${WORKDIR}/${MY_P}"
