diff --git a/.travis.yml b/.travis.yml index 951eaf45d959fda6227ab0bec757e540a78c32ae..ac4ff935160b17f877eaa7941e6895159aa4252d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ python: env: - FLASK=0.11 - FLASK=0.10.1 - - FLASK=0.9 install: - pip install Flask==$FLASK - pip install -r dev_requirements.txt diff --git a/README.md b/README.md index 722f405bc900d242c8346b5ed2b01c7bc56d71f3..9909b431e9c246a9bd998f406a0c3ae24bd1c06e 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ First, install Flask-SimpleLDAP: $ pip install flask-simpleldap Flask-SimpleLDAP depends, and will install for you, recent versions of Flask -(0.9 or later) and [pyldap](https://github.com/pyldap/pyldap). Flask-SimpleLDAP is compatible +(0.10.1 or later) and [pyldap](https://github.com/pyldap/pyldap). Flask-SimpleLDAP is compatible with and tested on Python 2.7, 3.4 and 3.5. Next, add a ``LDAP`` instance to your code and at least the three diff --git a/docs/index.rst b/docs/index.rst index ada76e8a3d96ff96f3dbeab415ee0306855b6ddf..9e130a986ab056de79a8e922a6739c9909ee7030 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -19,7 +19,7 @@ First, install Flask-SimpleLDAP: $ pip install flask-simpleldap Flask-SimpleLDAP depends, and will install for you, recent versions of Flask -(0.9 or later) and pyldap. Flask-SimpleLDAP is compatible +(0.10.1 or later) and pyldap. Flask-SimpleLDAP is compatible with and tested on Python 2.7, 3.4 and 3.5. Next, add a :class:`~flask_simpleldap.LDAP` to your code and at least the three diff --git a/flask_simpleldap/__init__.py b/flask_simpleldap/__init__.py index 843097c54fcfccf6273d90ddc91d99c901b6982c..76584c49fdbb5abe14a849779dc9195b6a9c9139 100644 --- a/flask_simpleldap/__init__.py +++ b/flask_simpleldap/__init__.py @@ -8,11 +8,6 @@ from flask import abort, current_app, g, make_response, redirect, url_for, \ __all__ = ['LDAP'] -try: - from flask import _app_ctx_stack as stack -except ImportError: - from flask import _request_ctx_stack as stack - class LDAPException(RuntimeError): message = None diff --git a/setup.py b/setup.py index b36df43e2e8934dfc0f9ff7ae8983328fba4ab3f..fd8959febfb1b33819fca59f8dc3340e930c268b 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ setup( include_package_data=True, platforms='any', install_requires=[ - 'Flask>=0.10', + 'Flask>=0.10.1', 'pyldap' ], classifiers=[