Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

app/jobs/forms.py

@@ -22,7 +22,8 @@ class AddNLPJobForm(FlaskForm):
     submit = SubmitField()
     title = StringField('Title', validators=[DataRequired(), Length(1, 32)])
     version = SelectField('Version',
-                          choices=[('2.1.0', 'Latest (2.1.0)'),
+                          choices=[('2.2.0', 'Latest (2.2.0)'),
+                                   ('2.2.0', '2.2.0'),
                                    ('2.1.0', '2.1.0')],
                           validators=[DataRequired()])
 

config.py

@@ -15,6 +15,7 @@ class Config:
     MAIL_DEFAULT_SENDER = os.environ.get('MAIL_DEFAULT_SENDER')
 
     ''' ### Flask-SQLAlchemy ### '''
+    SQLALCHEMY_ENGINE_OPTIONS = {'pool_size': 30, 'pool_timeout': 30}
     SQLALCHEMY_TRACK_MODIFICATIONS = False
 
     ''' ### Opaque ### '''
@@ -31,8 +32,6 @@ class DevelopmentConfig(Config):
     DEBUG = True
 
     ''' ### Flask-SQLAlchemy ### '''
-    SQLALCHEMY_ENGINE_OPTIONS = {'pool_size': 30,
-                                 'pool_timeout': 30}
     SQLALCHEMY_DATABASE_URI = 'postgresql://{}:{}@db/{}'.format(
         os.environ.get('POSTGRES_USER'),
         os.environ.get('POSTGRES_PASSWORD'),