Skip to content
Snippets Groups Projects
Commit c2467322 authored by admiralobvious's avatar admiralobvious
Browse files

update version + add ci support for py3.6

parent 72937d84
No related branches found
No related tags found
No related merge requests found
...@@ -3,8 +3,10 @@ python: ...@@ -3,8 +3,10 @@ python:
- "2.7" - "2.7"
- "3.4" - "3.4"
- "3.5" - "3.5"
- "3.6"
env: env:
- FLASK=0.11 - FLASK=0.12.1
- FLASK=0.11.1
- FLASK=0.10.1 - FLASK=0.10.1
install: install:
- pip install Flask==$FLASK - pip install Flask==$FLASK
......
The MIT License (MIT) 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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
......
...@@ -14,7 +14,7 @@ First, install Flask-SimpleLDAP: ...@@ -14,7 +14,7 @@ First, install Flask-SimpleLDAP:
Flask-SimpleLDAP depends, and will install for you, recent versions of Flask 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 (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 Next, add a ``LDAP`` instance to your code and at least the three
required configuration options: required configuration options:
......
-r requirements.txt -r requirements.txt
pyldap==2.4.25.1 # here instead of requirements.txt so rtfd can build pyldap>=2.4.28 # here instead of requirements.txt so rtfd can build
Sphinx==1.4.3 Sphinx>=1.5.5
...@@ -16,6 +16,7 @@ import sys ...@@ -16,6 +16,7 @@ import sys
import os import os
from mock import Mock as MagicMock from mock import Mock as MagicMock
class Mock(MagicMock): class Mock(MagicMock):
@classmethod @classmethod
def __getattr__(cls, name): def __getattr__(cls, name):
...@@ -56,16 +57,16 @@ master_doc = 'index' ...@@ -56,16 +57,16 @@ master_doc = 'index'
# General information about the project. # General information about the project.
project = u'Flask-SimpleLDAP' 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 # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '1.1.0' version = '1.1.1'
# The full version, including alpha/beta/rc tags. # 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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
...@@ -20,7 +20,7 @@ First, install Flask-SimpleLDAP: ...@@ -20,7 +20,7 @@ First, install Flask-SimpleLDAP:
Flask-SimpleLDAP depends, and will install for you, recent versions of Flask Flask-SimpleLDAP depends, and will install for you, recent versions of Flask
(0.10.1 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. 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 Next, add a :class:`~flask_simpleldap.LDAP` to your code and at least the three
required configuration options: required configuration options:
...@@ -116,6 +116,10 @@ History ...@@ -116,6 +116,10 @@ History
Changes: 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 - 1.1.0 June 7, 2016
- Add the ability the pass any valid pyldap config options via the LDAP_CUSTOM_OPTIONS configuration directive. - Add the ability the pass any valid pyldap config options via the LDAP_CUSTOM_OPTIONS configuration directive.
......
Flask==0.11 Flask>=0.12.1
mock==2.0.0 # for ci mock>=2.0.0 # for ci
...@@ -9,7 +9,7 @@ from setuptools import setup ...@@ -9,7 +9,7 @@ from setuptools import setup
setup( setup(
name='Flask-SimpleLDAP', name='Flask-SimpleLDAP',
version='1.1.0', version='1.1.1',
url='https://github.com/admiralobvious/flask-simpleldap', url='https://github.com/admiralobvious/flask-simpleldap',
license='MIT', license='MIT',
author='Alexandre Ferland', author='Alexandre Ferland',
...@@ -32,6 +32,7 @@ setup( ...@@ -32,6 +32,7 @@ setup(
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Topic :: Software Development :: Libraries :: Python Modules' 'Topic :: Software Development :: Libraries :: Python Modules'
] ]
) )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment