diff --git a/lemur/authorities/views.py b/lemur/authorities/views.py index 1407c37b..ab03dd66 100644 --- a/lemur/authorities/views.py +++ b/lemur/authorities/views.py @@ -504,6 +504,7 @@ class AuthorityVisualizations(AuthenticatedResource): authority = service.get(authority_id) return dict(name=authority.name, children=[{"name": c.name} for c in authority.certificates]) + api.add_resource(AuthoritiesList, '/authorities', endpoint='authorities') api.add_resource(Authorities, '/authorities/', endpoint='authority') api.add_resource(AuthorityVisualizations, '/authorities//visualize', endpoint='authority_visualizations') diff --git a/lemur/defaults/views.py b/lemur/defaults/views.py index 46987ab7..8452eb7a 100644 --- a/lemur/defaults/views.py +++ b/lemur/defaults/views.py @@ -61,4 +61,5 @@ class LemurDefaults(AuthenticatedResource): issuerPlugin=current_app.config.get('LEMUR_DEFAULT_ISSUER_PLUGIN') ) + api.add_resource(LemurDefaults, '/defaults', endpoint='default') diff --git a/lemur/endpoints/schemas.py b/lemur/endpoints/schemas.py index 63f37804..57f73642 100644 --- a/lemur/endpoints/schemas.py +++ b/lemur/endpoints/schemas.py @@ -39,5 +39,6 @@ class EndpointOutputSchema(LemurOutputSchema): issues = fields.List(fields.Dict()) + endpoint_output_schema = EndpointOutputSchema() endpoints_output_schema = EndpointOutputSchema(many=True) diff --git a/lemur/manage.py b/lemur/manage.py index 9c0cdd80..f838e5bb 100755 --- a/lemur/manage.py +++ b/lemur/manage.py @@ -825,5 +825,6 @@ def main(): manager.add_command("reissue_certificate", ReissueCertificate()) manager.run() + if __name__ == "__main__": main() diff --git a/lemur/plugins/lemur_email/templates/config.py b/lemur/plugins/lemur_email/templates/config.py index e10caa55..882e5b4d 100644 --- a/lemur/plugins/lemur_email/templates/config.py +++ b/lemur/plugins/lemur_email/templates/config.py @@ -9,4 +9,5 @@ env = Environment(loader=loader) def human_time(time): return arrow.get(time).format('dddd, MMMM D, YYYY') + env.filters['time'] = human_time diff --git a/lemur/sources/schemas.py b/lemur/sources/schemas.py index 34dbf119..992a6b86 100644 --- a/lemur/sources/schemas.py +++ b/lemur/sources/schemas.py @@ -32,6 +32,7 @@ class SourceOutputSchema(LemurOutputSchema): data['plugin']['pluginOptions'] = data['options'] return data + source_input_schema = SourceInputSchema() sources_output_schema = SourceOutputSchema(many=True) source_output_schema = SourceOutputSchema() diff --git a/setup.py b/setup.py index 1e1ba70d..bcd6b6c9 100644 --- a/setup.py +++ b/setup.py @@ -35,45 +35,45 @@ with open(os.path.join(ROOT, "lemur", "__about__.py")) as f: install_requires = [ 'Flask==0.10.1', - 'Flask-RESTful==0.3.3', + 'Flask-RESTful==0.3.5', 'Flask-SQLAlchemy==2.1', 'Flask-Script==2.0.5', - 'Flask-Migrate==1.7.0', + 'Flask-Migrate==2.0.1', 'Flask-Bcrypt==0.7.1', 'Flask-Principal==0.4.0', 'Flask-Mail==0.9.1', - 'SQLAlchemy-Utils==0.31.4', - 'BeautifulSoup4==4.4.1', - 'requests==2.11.1', - 'psycopg2==2.6.1', - 'arrow==0.7.0', - 'gunicorn==19.4.1', - 'marshmallow-sqlalchemy==0.8.0', + 'SQLAlchemy-Utils==0.32.9', + 'requests==2.12.1', + 'psycopg2==2.6.2', + 'arrow==0.8.0', + 'six==1.10.0', + 'gunicorn==19.6.0', + 'marshmallow-sqlalchemy==0.12.0', 'marshmallow==2.4.0', 'pycrypto==2.6.1', 'cryptography==1.5', - 'pyopenssl==0.15.1', - 'pyjwt==1.4.0', - 'xmltodict==0.9.2', + 'pyopenssl==16.2.0', + 'pyjwt==1.4.2', + 'xmltodict==0.10.2', 'lockfile==0.12.2', 'inflection==0.3.1', - 'future==0.15.2', - 'boto==2.38.0', # we might make this optional - 'boto3==1.3.0', - 'acme==0.1.0', + 'future==0.16.0', + 'boto==2.43.0', # we might make this optional + 'boto3==1.4.0', + 'acme==0.9.3', 'retrying==1.3.3', - 'tabulate==0.7.5', + 'tabulate==0.7.7', 'pem==16.1.0' ] tests_require = [ 'pyflakes', - 'moto==0.4.19', + 'moto==0.4.30', 'nose==1.3.7', - 'pytest==2.8.5', + 'pytest==3.0.4', 'factory-boy==2.7.0', 'pytest-flask==0.10.0', - 'freezegun==0.3.7' + 'freezegun==0.3.8' ] docs_require = [ @@ -83,7 +83,7 @@ docs_require = [ ] dev_requires = [ - 'flake8>=2.0,<3.0', + 'flake8>=3.2,<4.0', 'pre-commit', 'invoke', 'twine'