Skip to content

Commit

Permalink
Merge pull request postmanlabs#447 from javabrett/442-remove-flask-co…
Browse files Browse the repository at this point in the history
…mmon

Removed Flask-Common. Fixed postmanlabs#442.
  • Loading branch information
sigmavirus24 authored May 6, 2018
2 parents 7d2999d + d773d7a commit e437e2c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 170 deletions.
1 change: 0 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ decorator = "*"
brotlipy = "*"
gevent = "*"
Flask = "*"
Flask-Common = "*"
meinheld = "*"
werkzeug = ">=0.14.1"

Expand Down
177 changes: 13 additions & 164 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions httpbin/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import argparse

from flask import Flask, Response, request, render_template, redirect, jsonify as flask_jsonify, make_response, url_for, abort
from flask_common import Common
from six.moves import range as xrange
from werkzeug.datastructures import WWWAuthenticate, MultiDict
from werkzeug.http import http_date
Expand Down Expand Up @@ -57,9 +56,6 @@ def jsonify(*args, **kwargs):
app = Flask(__name__, template_folder=tmpl_dir)
app.debug = bool(os.environ.get('DEBUG'))

# Setup Flask-Common.
common = Common(app)

# Send app errors to Sentry.
if 'SENTRY_DSN' in os.environ:
sentry = Sentry(app, dsn=os.environ['SENTRY_DSN'])
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
include_package_data = True, # include files listed in MANIFEST.in
install_requires=[
'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlipy',
'raven[flask]', 'Flask-Common', 'werkzeug>=0.14.1'
'raven[flask]', 'werkzeug>=0.14.1'
],
)

0 comments on commit e437e2c

Please sign in to comment.