From c24673228bc05f193d6c28802f96568c1b145fe6 Mon Sep 17 00:00:00 2001
From: admiralobvious <aferlandqc@gmail.com>
Date: Mon, 10 Apr 2017 20:34:20 -0400
Subject: [PATCH] update version + add ci support for py3.6
---
.travis.yml | 4 +++-
LICENSE | 2 +-
README.md | 2 +-
dev_requirements.txt | 4 ++--
docs/conf.py | 7 ++++---
docs/index.rst | 6 +++++-
flask_simpleldap/__init__.py | 2 +-
requirements.txt | 4 ++--
setup.py | 3 ++-
9 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ac4ff93..5a19c62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,10 @@ python:
- "2.7"
- "3.4"
- "3.5"
+ - "3.6"
env:
- - FLASK=0.11
+ - FLASK=0.12.1
+ - FLASK=0.11.1
- FLASK=0.10.1
install:
- pip install Flask==$FLASK
diff --git a/LICENSE b/LICENSE
index 215eb87..de96633 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2016 Alexandre Ferland
+Copyright (c) 2017 Alexandre Ferland
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 73ea35d..62fa98b 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ First, install Flask-SimpleLDAP:
Flask-SimpleLDAP depends, and will install for you, recent versions of Flask
(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.
+with and tested on Python 2.7, 3.4, 3.5 and 3.6.
Next, add a ``LDAP`` instance to your code and at least the three
required configuration options:
diff --git a/dev_requirements.txt b/dev_requirements.txt
index b04e4af..719efad 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,3 +1,3 @@
-r requirements.txt
-pyldap==2.4.25.1 # here instead of requirements.txt so rtfd can build
-Sphinx==1.4.3
+pyldap>=2.4.28 # here instead of requirements.txt so rtfd can build
+Sphinx>=1.5.5
diff --git a/docs/conf.py b/docs/conf.py
index 49867af..e639119 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -16,6 +16,7 @@ import sys
import os
from mock import Mock as MagicMock
+
class Mock(MagicMock):
@classmethod
def __getattr__(cls, name):
@@ -56,16 +57,16 @@ master_doc = 'index'
# General information about the project.
project = u'Flask-SimpleLDAP'
-copyright = u'2016, Alexandre Ferland'
+copyright = u'2017, Alexandre Ferland'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
-version = '1.1.0'
+version = '1.1.1'
# The full version, including alpha/beta/rc tags.
-release = '1.1.0'
+release = '1.1.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/docs/index.rst b/docs/index.rst
index 1ab6e66..3cf6427 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,7 +20,7 @@ First, install Flask-SimpleLDAP:
Flask-SimpleLDAP depends, and will install for you, recent versions of Flask
(0.10.1 or later) and pyldap. Flask-SimpleLDAP is compatible
-with and tested on Python 2.7, 3.4 and 3.5.
+with and tested on Python 2.7, 3.4, 3.5 and 3.6.
Next, add a :class:`~flask_simpleldap.LDAP` to your code and at least the three
required configuration options:
@@ -116,6 +116,10 @@ History
Changes:
+- 1.1.1 April 10, 2017
+ - Merge GitHub pull `#26 <https://github.com/admiralobvious/flask-simpleldap/pull/26>`_,
+ Fix set_option call to LDAP for SSL CERT
+
- 1.1.0 June 7, 2016
- Add the ability the pass any valid pyldap config options via the LDAP_CUSTOM_OPTIONS configuration directive.
diff --git a/flask_simpleldap/__init__.py b/flask_simpleldap/__init__.py
index 3faceb5..f32acf0 100644
--- a/flask_simpleldap/__init__.py
+++ b/flask_simpleldap/__init__.py
@@ -69,7 +69,7 @@ class LDAP(object):
ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT,
ldap.OPT_X_TLS_DEMAND)
ldap.set_option(ldap.OPT_X_TLS_CACERTFILE,
- current_app.config['LDAP_CERT_PATH'])
+ current_app.config['LDAP_CERT_PATH'])
for option in ['USERNAME', 'PASSWORD', 'BASE_DN']:
if app.config['LDAP_{0}'.format(option)] is None:
diff --git a/requirements.txt b/requirements.txt
index da53812..05f5b8e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-Flask==0.11
-mock==2.0.0 # for ci
+Flask>=0.12.1
+mock>=2.0.0 # for ci
diff --git a/setup.py b/setup.py
index 4ab62db..de66075 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ from setuptools import setup
setup(
name='Flask-SimpleLDAP',
- version='1.1.0',
+ version='1.1.1',
url='https://github.com/admiralobvious/flask-simpleldap',
license='MIT',
author='Alexandre Ferland',
@@ -32,6 +32,7 @@ setup(
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
'Topic :: Software Development :: Libraries :: Python Modules'
]
)
--
GitLab