diff --git a/app/__init__.py b/app/__init__.py index 939de85b..2948dcd0 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,9 +3,8 @@ import json from config import config as configs from flask.ext.elasticsearch import FlaskElasticsearch -from dmutils import init_app, flask_featureflags +from dmutils import init_app -feature_flags = flask_featureflags.FeatureFlag() elasticsearch_client = FlaskElasticsearch() @@ -25,7 +24,6 @@ def create_app(config_name): init_app( application, configs[config_name], - feature_flags=feature_flags ) if application.config['VCAP_SERVICES']: diff --git a/config.py b/config.py index 2b456b3f..3037d8c9 100644 --- a/config.py +++ b/config.py @@ -25,9 +25,6 @@ class Config: DM_PLAIN_TEXT_LOGS = False DM_LOG_PATH = None - # Feature Flags - RAISE_ERROR_ON_MISSING_FEATURES = True - VCAP_SERVICES = None DM_ELASTICSEARCH_SERVICE_NAME = "search_api_elasticsearch" diff --git a/requirements-app.txt b/requirements-app.txt index a05a3e95..1306c38b 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -1,11 +1,10 @@ # Run `make freeze-requirements` to update requirements.txt # with package version changes made in requirements-app.txt -Flask==0.10.1 +Flask==0.12.4 git+https://github.com/madzak/python-json-logger.git@v0.1.3#egg=python-json-logger==v0.1.3 -git+https://github.com/alphagov/digitalmarketplace-utils.git@41.2.1#egg=digitalmarketplace-utils==41.2.1 -git+https://github.com/alphagov/Flask-FeatureFlags.git@1.0#egg=Flask-FeatureFlags==1.0 +git+https://github.com/alphagov/digitalmarketplace-utils.git@43.0.0#egg=digitalmarketplace-utils==43.0.0 # Elasticsearch 5.0 elasticsearch==5.4.0 diff --git a/requirements.txt b/requirements.txt index 1f38a83a..2b50c62b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,11 +2,10 @@ # Run `make freeze-requirements` to update requirements.txt # with package version changes made in requirements-app.txt -Flask==0.10.1 +Flask==0.12.4 git+https://github.com/madzak/python-json-logger.git@v0.1.3#egg=python-json-logger==v0.1.3 -git+https://github.com/alphagov/digitalmarketplace-utils.git@41.2.1#egg=digitalmarketplace-utils==41.2.1 -git+https://github.com/alphagov/Flask-FeatureFlags.git@1.0#egg=Flask-FeatureFlags==1.0 +git+https://github.com/alphagov/digitalmarketplace-utils.git@43.0.0#egg=digitalmarketplace-utils==43.0.0 # Elasticsearch 5.0 elasticsearch==5.4.0 @@ -16,9 +15,10 @@ Flask-Elasticsearch==0.2.5 asn1crypto==0.24.0 boto3==1.4.8 botocore==1.8.50 -certifi==2018.4.16 +certifi==2018.8.13 cffi==1.11.5 chardet==3.0.4 +click==6.7 contextlib2==0.4.0 cryptography==2.3 docopt==0.4.0