Fri Jun 4 05:18:01 2021 UTC ()
py-flask-admin: fix building for Python < 3.7


(adam)
diff -r1.26 -r1.27 pkgsrc/www/py-flask-admin/Makefile
diff -r1.23 -r1.24 pkgsrc/www/py-flask-admin/distinfo
diff -r0 -r1.1 pkgsrc/www/py-flask-admin/patches/patch-flask__admin_tests_sqla_test__basic.py
cvs diff -r1.26 -r1.27 pkgsrc/www/py-flask-admin/Makefile (expand / switch to unified diff)

--- pkgsrc/www/py-flask-admin/Makefile 2021/05/02 11:23:32 1.26
+++ pkgsrc/www/py-flask-admin/Makefile 2021/06/04 05:18:01 1.27
@@ -1,23 +1,26 @@ @@ -1,23 +1,26 @@
1# $NetBSD: Makefile,v 1.26 2021/05/02 11:23:32 kleink Exp $ 1# $NetBSD: Makefile,v 1.27 2021/06/04 05:18:01 adam Exp $
2 2
3DISTNAME= Flask-Admin-1.5.8 3DISTNAME= Flask-Admin-1.5.8
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5CATEGORIES= www python 5CATEGORIES= www python
6MASTER_SITES= ${MASTER_SITE_PYPI:=F/Flask-Admin/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=F/Flask-Admin/}
7 7
8MAINTAINER= kleink@NetBSD.org 8MAINTAINER= kleink@NetBSD.org
9HOMEPAGE= https://github.com/flask-admin/flask-admin 9HOMEPAGE= https://github.com/flask-admin/flask-admin
10COMMENT= Simple and extensible administrative interface framework for Flask 10COMMENT= Simple and extensible administrative interface framework for Flask
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13DEPENDS+= ${PYPKGPREFIX}-flask>=0.7:../../www/py-flask 13DEPENDS+= ${PYPKGPREFIX}-flask>=0.7:../../www/py-flask
14DEPENDS+= ${PYPKGPREFIX}-wtforms-[0-9]*:../../www/py-wtforms 14DEPENDS+= ${PYPKGPREFIX}-wtforms-[0-9]*:../../www/py-wtforms
15 15
16USE_LANGUAGES= # none 16USE_LANGUAGES= # none
17 17
18post-extract: 18post-extract:
19 ${FIND} ${WRKSRC}/flask_admin/static -type f -exec ${CHMOD} a-x {} + 19 ${FIND} ${WRKSRC}/flask_admin/static -type f -exec ${CHMOD} a-x {} +
20 ${FIND} ${WRKSRC}/flask_admin/templates -type f -exec ${CHMOD} a-x {} + 20 ${FIND} ${WRKSRC}/flask_admin/templates -type f -exec ${CHMOD} a-x {} +
21 21
 22pre-configure:
 23 ${RM} ${WRKSRC}/flask_admin/tests/sqla/test_basic.py.orig
 24
22.include "../../lang/python/egg.mk" 25.include "../../lang/python/egg.mk"
23.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.23 -r1.24 pkgsrc/www/py-flask-admin/distinfo (expand / switch to unified diff)

--- pkgsrc/www/py-flask-admin/distinfo 2021/05/02 11:23:32 1.23
+++ pkgsrc/www/py-flask-admin/distinfo 2021/06/04 05:18:01 1.24
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.23 2021/05/02 11:23:32 kleink Exp $ 1$NetBSD: distinfo,v 1.24 2021/06/04 05:18:01 adam Exp $
2 2
3SHA1 (Flask-Admin-1.5.8.tar.gz) = 39b82ede983033385e7f53ca9ab0c60ce4b247c1 3SHA1 (Flask-Admin-1.5.8.tar.gz) = 39b82ede983033385e7f53ca9ab0c60ce4b247c1
4RMD160 (Flask-Admin-1.5.8.tar.gz) = ad446585a3c5eddae75c0880c4927b84527b44c3 4RMD160 (Flask-Admin-1.5.8.tar.gz) = ad446585a3c5eddae75c0880c4927b84527b44c3
5SHA512 (Flask-Admin-1.5.8.tar.gz) = 53e14ba6992b358280e69580fa9911539fb34069d08f43f658ef54387c6e2b700d3fb6d8e90a9ee3f8f3592eb936b76234b7afd93baa28d683683472e1d01283 5SHA512 (Flask-Admin-1.5.8.tar.gz) = 53e14ba6992b358280e69580fa9911539fb34069d08f43f658ef54387c6e2b700d3fb6d8e90a9ee3f8f3592eb936b76234b7afd93baa28d683683472e1d01283
6Size (Flask-Admin-1.5.8.tar.gz) = 6642201 bytes 6Size (Flask-Admin-1.5.8.tar.gz) = 6642201 bytes
 7SHA1 (patch-flask__admin_tests_sqla_test__basic.py) = 5b384dfd3d934561104dcf9dc03b76811ce28365
File Added: pkgsrc/www/py-flask-admin/patches/Attic/patch-flask__admin_tests_sqla_test__basic.py
$NetBSD: patch-flask__admin_tests_sqla_test__basic.py,v 1.1 2021/06/04 05:18:01 adam Exp $

Fix building for Python < 3.7.

--- flask_admin/tests/sqla/test_basic.py.orig	2021-06-04 05:13:49.000000000 +0000
+++ flask_admin/tests/sqla/test_basic.py
@@ -1666,7 +1666,7 @@ def test_hybrid_property_nested():
 
         @hybrid_property
         def fullname(self):
-            return f'{self.firstname} {self.lastname}'
+            return self.firstname + ' ' + self.lastname
 
     class Model2(db.Model):
         id = db.Column(db.Integer, primary_key=True)