Upgrade deps. (#517)

This commit is contained in:
kevgliss 2016-11-21 14:29:20 -08:00 committed by GitHub
parent dd6d332166
commit b3aa057d58
7 changed files with 27 additions and 21 deletions

View File

@ -504,6 +504,7 @@ class AuthorityVisualizations(AuthenticatedResource):
authority = service.get(authority_id) authority = service.get(authority_id)
return dict(name=authority.name, children=[{"name": c.name} for c in authority.certificates]) return dict(name=authority.name, children=[{"name": c.name} for c in authority.certificates])
api.add_resource(AuthoritiesList, '/authorities', endpoint='authorities') api.add_resource(AuthoritiesList, '/authorities', endpoint='authorities')
api.add_resource(Authorities, '/authorities/<int:authority_id>', endpoint='authority') api.add_resource(Authorities, '/authorities/<int:authority_id>', endpoint='authority')
api.add_resource(AuthorityVisualizations, '/authorities/<int:authority_id>/visualize', endpoint='authority_visualizations') api.add_resource(AuthorityVisualizations, '/authorities/<int:authority_id>/visualize', endpoint='authority_visualizations')

View File

@ -61,4 +61,5 @@ class LemurDefaults(AuthenticatedResource):
issuerPlugin=current_app.config.get('LEMUR_DEFAULT_ISSUER_PLUGIN') issuerPlugin=current_app.config.get('LEMUR_DEFAULT_ISSUER_PLUGIN')
) )
api.add_resource(LemurDefaults, '/defaults', endpoint='default') api.add_resource(LemurDefaults, '/defaults', endpoint='default')

View File

@ -39,5 +39,6 @@ class EndpointOutputSchema(LemurOutputSchema):
issues = fields.List(fields.Dict()) issues = fields.List(fields.Dict())
endpoint_output_schema = EndpointOutputSchema() endpoint_output_schema = EndpointOutputSchema()
endpoints_output_schema = EndpointOutputSchema(many=True) endpoints_output_schema = EndpointOutputSchema(many=True)

View File

@ -825,5 +825,6 @@ def main():
manager.add_command("reissue_certificate", ReissueCertificate()) manager.add_command("reissue_certificate", ReissueCertificate())
manager.run() manager.run()
if __name__ == "__main__": if __name__ == "__main__":
main() main()

View File

@ -9,4 +9,5 @@ env = Environment(loader=loader)
def human_time(time): def human_time(time):
return arrow.get(time).format('dddd, MMMM D, YYYY') return arrow.get(time).format('dddd, MMMM D, YYYY')
env.filters['time'] = human_time env.filters['time'] = human_time

View File

@ -32,6 +32,7 @@ class SourceOutputSchema(LemurOutputSchema):
data['plugin']['pluginOptions'] = data['options'] data['plugin']['pluginOptions'] = data['options']
return data return data
source_input_schema = SourceInputSchema() source_input_schema = SourceInputSchema()
sources_output_schema = SourceOutputSchema(many=True) sources_output_schema = SourceOutputSchema(many=True)
source_output_schema = SourceOutputSchema() source_output_schema = SourceOutputSchema()

View File

@ -35,45 +35,45 @@ with open(os.path.join(ROOT, "lemur", "__about__.py")) as f:
install_requires = [ install_requires = [
'Flask==0.10.1', 'Flask==0.10.1',
'Flask-RESTful==0.3.3', 'Flask-RESTful==0.3.5',
'Flask-SQLAlchemy==2.1', 'Flask-SQLAlchemy==2.1',
'Flask-Script==2.0.5', 'Flask-Script==2.0.5',
'Flask-Migrate==1.7.0', 'Flask-Migrate==2.0.1',
'Flask-Bcrypt==0.7.1', 'Flask-Bcrypt==0.7.1',
'Flask-Principal==0.4.0', 'Flask-Principal==0.4.0',
'Flask-Mail==0.9.1', 'Flask-Mail==0.9.1',
'SQLAlchemy-Utils==0.31.4', 'SQLAlchemy-Utils==0.32.9',
'BeautifulSoup4==4.4.1', 'requests==2.12.1',
'requests==2.11.1', 'psycopg2==2.6.2',
'psycopg2==2.6.1', 'arrow==0.8.0',
'arrow==0.7.0', 'six==1.10.0',
'gunicorn==19.4.1', 'gunicorn==19.6.0',
'marshmallow-sqlalchemy==0.8.0', 'marshmallow-sqlalchemy==0.12.0',
'marshmallow==2.4.0', 'marshmallow==2.4.0',
'pycrypto==2.6.1', 'pycrypto==2.6.1',
'cryptography==1.5', 'cryptography==1.5',
'pyopenssl==0.15.1', 'pyopenssl==16.2.0',
'pyjwt==1.4.0', 'pyjwt==1.4.2',
'xmltodict==0.9.2', 'xmltodict==0.10.2',
'lockfile==0.12.2', 'lockfile==0.12.2',
'inflection==0.3.1', 'inflection==0.3.1',
'future==0.15.2', 'future==0.16.0',
'boto==2.38.0', # we might make this optional 'boto==2.43.0', # we might make this optional
'boto3==1.3.0', 'boto3==1.4.0',
'acme==0.1.0', 'acme==0.9.3',
'retrying==1.3.3', 'retrying==1.3.3',
'tabulate==0.7.5', 'tabulate==0.7.7',
'pem==16.1.0' 'pem==16.1.0'
] ]
tests_require = [ tests_require = [
'pyflakes', 'pyflakes',
'moto==0.4.19', 'moto==0.4.30',
'nose==1.3.7', 'nose==1.3.7',
'pytest==2.8.5', 'pytest==3.0.4',
'factory-boy==2.7.0', 'factory-boy==2.7.0',
'pytest-flask==0.10.0', 'pytest-flask==0.10.0',
'freezegun==0.3.7' 'freezegun==0.3.8'
] ]
docs_require = [ docs_require = [
@ -83,7 +83,7 @@ docs_require = [
] ]
dev_requires = [ dev_requires = [
'flake8>=2.0,<3.0', 'flake8>=3.2,<4.0',
'pre-commit', 'pre-commit',
'invoke', 'invoke',
'twine' 'twine'