diff --git a/app/__init__.py b/app/__init__.py index acfe8e13e..970920c83 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -5,14 +5,13 @@ from flask_wtf.csrf import CSRFProtect import dmapiclient -from dmutils import init_app, flask_featureflags +from dmutils import init_app from dmutils.user import User from config import configs data_api_client = dmapiclient.DataAPIClient() login_manager = LoginManager() -feature_flags = flask_featureflags.FeatureFlag() csrf = CSRFProtect() @@ -29,7 +28,6 @@ def create_app(config_name): application, configs[config_name], data_api_client=data_api_client, - feature_flags=feature_flags, login_manager=login_manager, ) diff --git a/config.py b/config.py index 036463408..3ef401b1a 100644 --- a/config.py +++ b/config.py @@ -71,9 +71,6 @@ class Config(object): 'asset_fingerprinter': AssetFingerprinter(asset_root=ASSET_PATH) } - # Feature Flags - RAISE_ERROR_ON_MISSING_FEATURES = True - # Logging DM_LOG_LEVEL = 'DEBUG' DM_PLAIN_TEXT_LOGS = False diff --git a/requirements-app.txt b/requirements-app.txt index 18b93f7e1..0967780cc 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 Flask-Login==0.2.11 Flask-WTF==0.14.2 -git+https://github.com/alphagov/digitalmarketplace-utils.git@42.6.0#egg=digitalmarketplace-utils==42.6.0 +git+https://github.com/alphagov/digitalmarketplace-utils.git@ris-flask-0-12#egg=digitalmarketplace-utils==43.0.0 git+https://github.com/alphagov/digitalmarketplace-content-loader.git@4.10.1#egg=digitalmarketplace-content-loader==4.10.1 git+https://github.com/alphagov/digitalmarketplace-apiclient.git@19.0.0#egg=digitalmarketplace-apiclient==19.0.0 -git+https://github.com/alphagov/Flask-FeatureFlags.git@1.0#egg=Flask-FeatureFlags==1.0 diff --git a/requirements.txt b/requirements.txt index ba30e0ee4..982f1c688 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,14 +2,13 @@ # 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 Flask-Login==0.2.11 Flask-WTF==0.14.2 -git+https://github.com/alphagov/digitalmarketplace-utils.git@42.6.0#egg=digitalmarketplace-utils==42.6.0 +git+https://github.com/alphagov/digitalmarketplace-utils.git@ris-flask-0-12#egg=digitalmarketplace-utils==43.0.0 git+https://github.com/alphagov/digitalmarketplace-content-loader.git@4.10.1#egg=digitalmarketplace-content-loader==4.10.1 git+https://github.com/alphagov/digitalmarketplace-apiclient.git@19.0.0#egg=digitalmarketplace-apiclient==19.0.0 -git+https://github.com/alphagov/Flask-FeatureFlags.git@1.0#egg=Flask-FeatureFlags==1.0 ## The following requirements were added by pip freeze: asn1crypto==0.24.0 @@ -18,6 +17,7 @@ botocore==1.8.50 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