From 67025c249da3c0eb6095a997939f91fe6d38e161 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Thu, 3 May 2018 19:57:37 +0000 Subject: [PATCH] refactor flask_cors as optional --- debian/control | 2 +- pygeoapi/flask_app.py | 4 ++-- requirements-dev.txt | 1 + requirements.txt | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index b9dcc0e..f77cccd 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,6 @@ Package: python-pygeoapi Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources, python-click, python-flask, python-yaml Suggests: python-elasticsearch, python-geojson, python-shapely -Homepage: https://github.com/geopython/pygeoapi.git +Homepage: https://github.com/geopython/pygeoapi Description: pygeoapi provides an API to geospatial data diff --git a/pygeoapi/flask_app.py b/pygeoapi/flask_app.py index afca308..f013708 100644 --- a/pygeoapi/flask_app.py +++ b/pygeoapi/flask_app.py @@ -34,7 +34,6 @@ import click import yaml from flask import Flask, make_response, request -from flask_cors import CORS from pygeoapi.api import API @@ -130,7 +129,8 @@ def serve(ctx, debug=False): if not api_.config['server']['pretty_print']: APP.config['JSONIFY_PRETTYPRINT_REGULAR'] = False - if api_.config['server']['cors']: + if 'cors' in api_.config['server'] and api_.config['server']['cors']: + from flask_cors import CORS CORS(APP) # setup_logger(CONFIG['logging']) diff --git a/requirements-dev.txt b/requirements-dev.txt index bd40253..1dbb0b5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,4 @@ +flask_cors coverage==4.5.1 docutils==0.14 flake8==3.5.0 diff --git a/requirements.txt b/requirements.txt index 4e98b04..c464210 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ click elasticsearch Flask -Flask_Cors PyYAML Shapely