Merge branch 'release/0.5.1'

* release/0.5.1:
  Bump version
  Use new FlaskForm API
This commit is contained in:
Jan Dittberner 2017-09-10 12:17:15 +02:00
commit 73871181d4
2 changed files with 26 additions and 4 deletions

View file

@ -1,7 +1,29 @@
# -*- python -*-
# -*- coding: utf-8 -*-
#
# Debian Member Portfolio Service views
#
# Copyright © 2015-2017 Jan Dittberner <jan@dittberner.info>
#
# This file is part of the Debian Member Portfolio Service.
#
# Debian Member Portfolio Service is free software: you can redistribute it
# and/or modify it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the License,
# or (at your option) any later version.
#
# Debian Member Portfolio Service is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
# General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
from __future__ import unicode_literals from __future__ import unicode_literals
from flask_babel import gettext as _ from flask_babel import gettext as _
from flask_wtf import Form from flask_wtf import FlaskForm
from wtforms import IntegerField, StringField, RadioField from wtforms import IntegerField, StringField, RadioField
from wtforms.validators import ( from wtforms.validators import (
AnyOf, DataRequired, Email, Length, Optional, Regexp AnyOf, DataRequired, Email, Length, Optional, Regexp
@ -18,7 +40,7 @@ class PlainText(Regexp):
super(PlainText, self).__init__(r'^[a-zA-Z\-0-9]*$') super(PlainText, self).__init__(r'^[a-zA-Z\-0-9]*$')
class DeveloperData(Form): class DeveloperData(FlaskForm):
email = StringField('email', validators=[DataRequired(), Email()]) email = StringField('email', validators=[DataRequired(), Email()])
name = StringField('name', validators=[DataRequired()]) name = StringField('name', validators=[DataRequired()])
gpgfp = StringField('gpgfp', validators=[ gpgfp = StringField('gpgfp', validators=[
@ -38,5 +60,5 @@ class DeveloperData(Form):
Optional()]) Optional()])
class DeveloperDataRequest(Form): class DeveloperDataRequest(FlaskForm):
email = StringField('email', validators=[DataRequired(), Email()]) email = StringField('email', validators=[DataRequired(), Email()])

View file

@ -29,7 +29,7 @@ except ImportError:
setup( setup(
name='debianmemberportfolio', name='debianmemberportfolio',
version='0.5.0', version='0.5.1',
description='service to create Debian Member Portfolio URLs', description='service to create Debian Member Portfolio URLs',
long_description="""This is a service implementation that returns a set of long_description="""This is a service implementation that returns a set of
personalized URLs as outlined in https://wiki.debian.org/DDPortfolio. It personalized URLs as outlined in https://wiki.debian.org/DDPortfolio. It