mirror of https://github.com/pallets/flask.git
bump dependency versions
This commit is contained in:
parent
8c2c802f19
commit
af32ea0b94
|
@ -8,9 +8,9 @@ Version 1.0
|
|||
unreleased
|
||||
|
||||
- **Python 2.6 and 3.3 are no longer supported.** (`pallets/meta#24`_)
|
||||
- Minimum Werkzeug version bumped to 0.14, but please use the latest
|
||||
version.
|
||||
- Minimum Click version bumped to 4, but please use the latest version.
|
||||
- Bump minimum dependency versions to the latest stable versions:
|
||||
Werkzeug >= 0.14, Jinja >= 2.10, itsdangerous >= 0.24, Click >= 5.1.
|
||||
(`#2586`_)
|
||||
- Make ``app.run()`` into a noop if a Flask application is run from the
|
||||
development server on the command line. This avoids some behavior that
|
||||
was confusing to debug for newcomers.
|
||||
|
@ -159,6 +159,7 @@ unreleased
|
|||
.. _#2450: https://github.com/pallets/flask/pull/2450
|
||||
.. _#2526: https://github.com/pallets/flask/issues/2526
|
||||
.. _#2529: https://github.com/pallets/flask/pull/2529
|
||||
.. _#2586: https://github.com/pallets/flask/issues/2586
|
||||
.. _#2581: https://github.com/pallets/flask/pull/2581
|
||||
.. _#2606: https://github.com/pallets/flask/pull/2606
|
||||
.. _#2607: https://github.com/pallets/flask/pull/2607
|
||||
|
|
|
@ -608,9 +608,6 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
|
|||
'headers' % filename, stacklevel=2)
|
||||
|
||||
if conditional:
|
||||
if callable(getattr(Range, 'to_content_range_header', None)):
|
||||
# Werkzeug supports Range Requests
|
||||
# Remove this test when support for Werkzeug <0.12 is dropped
|
||||
try:
|
||||
rv = rv.make_conditional(request, accept_ranges=True,
|
||||
complete_length=fsize)
|
||||
|
@ -618,8 +615,6 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
|
|||
if file is not None:
|
||||
file.close()
|
||||
raise
|
||||
else:
|
||||
rv = rv.make_conditional(request)
|
||||
# make sure we don't send x-sendfile for servers that
|
||||
# ignore the 304 status code for x-sendfile.
|
||||
if rv.status_code == 304:
|
||||
|
|
29
setup.py
29
setup.py
|
@ -68,28 +68,26 @@ setup(
|
|||
include_package_data=True,
|
||||
zip_safe=False,
|
||||
platforms='any',
|
||||
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
|
||||
install_requires=[
|
||||
'Werkzeug>=0.9',
|
||||
'Jinja2>=2.4',
|
||||
'itsdangerous>=0.21',
|
||||
'click>=4.0',
|
||||
'Werkzeug>=0.14',
|
||||
'Jinja2>=2.10',
|
||||
'itsdangerous>=0.24',
|
||||
'click>=5.1',
|
||||
],
|
||||
extras_require={
|
||||
'dotenv': ['python-dotenv'],
|
||||
'dev': [
|
||||
'blinker',
|
||||
'python-dotenv',
|
||||
'greenlet',
|
||||
'pytest>=3',
|
||||
'coverage',
|
||||
'tox',
|
||||
'sphinx',
|
||||
'sphinxcontrib-log-cabinet'
|
||||
],
|
||||
},
|
||||
classifiers=[
|
||||
'Development Status :: 4 - Beta',
|
||||
'Development Status :: 5 - Production/Stable',
|
||||
'Environment :: Web Environment',
|
||||
'Framework :: Flask',
|
||||
'Intended Audience :: Developers',
|
||||
'License :: OSI Approved :: BSD License',
|
||||
'Operating System :: OS Independent',
|
||||
|
@ -101,10 +99,13 @@ setup(
|
|||
'Programming Language :: Python :: 3.5',
|
||||
'Programming Language :: Python :: 3.6',
|
||||
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
|
||||
'Topic :: Software Development :: Libraries :: Python Modules'
|
||||
'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
|
||||
'Topic :: Software Development :: Libraries :: Application Frameworks',
|
||||
'Topic :: Software Development :: Libraries :: Python Modules',
|
||||
],
|
||||
entry_points='''
|
||||
[console_scripts]
|
||||
flask=flask.cli:main
|
||||
'''
|
||||
entry_points={
|
||||
'console_scripts': [
|
||||
'flask = flask.cli:main',
|
||||
],
|
||||
},
|
||||
)
|
||||
|
|
6
tox.ini
6
tox.ini
|
@ -17,9 +17,9 @@ deps =
|
|||
python-dotenv
|
||||
|
||||
lowest: Werkzeug==0.14
|
||||
lowest: Jinja2==2.4
|
||||
lowest: itsdangerous==0.21
|
||||
lowest: Click==4.0
|
||||
lowest: Jinja2==2.10
|
||||
lowest: itsdangerous==0.24
|
||||
lowest: Click==5.1
|
||||
|
||||
devel: https://github.com/pallets/werkzeug/archive/master.tar.gz
|
||||
devel: https://github.com/pallets/markupsafe/archive/master.tar.gz
|
||||
|
|
Loading…
Reference in New Issue