Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

digitalmarketplace-utils dependency: bump to 43.0.0, remove featureflags references #161

Merged
merged 1 commit into from
Aug 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand All @@ -25,7 +24,6 @@ def create_app(config_name):
init_app(
application,
configs[config_name],
feature_flags=feature_flags
)

if application.config['VCAP_SERVICES']:
Expand Down
3 changes: 0 additions & 3 deletions config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
5 changes: 2 additions & 3 deletions requirements-app.txt
Original file line number Diff line number Diff line change
@@ -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/[email protected]#egg=python-json-logger==v0.1.3
git+https://github.com/alphagov/[email protected]#egg=digitalmarketplace-utils==41.2.1
git+https://github.com/alphagov/[email protected]#egg=Flask-FeatureFlags==1.0
git+https://github.com/alphagov/[email protected]#egg=digitalmarketplace-utils==43.0.0

# Elasticsearch 5.0
elasticsearch==5.4.0
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]#egg=python-json-logger==v0.1.3
git+https://github.com/alphagov/[email protected]#egg=digitalmarketplace-utils==41.2.1
git+https://github.com/alphagov/[email protected]#egg=Flask-FeatureFlags==1.0
git+https://github.com/alphagov/[email protected]#egg=digitalmarketplace-utils==43.0.0

# Elasticsearch 5.0
elasticsearch==5.4.0
Expand All @@ -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
Expand Down