Merge pull request #54 from psi29a/newer_twisted

tell travis and tox to drop older and add newer versions of twisted a…

Author: psi29a

.travis.yml

@@ -2,33 +2,20 @@ language: python
 python: 2.7
 
 env:
-    - TOX_ENV=py26-twlatest
-    - TOX_ENV=py26-twtrunk
+    - TOX_ENV=py26-tw154
     - TOX_ENV=py26-tw140
-    - TOX_ENV=py26-tw132
-    - TOX_ENV=py26-tw131
-    - TOX_ENV=py26-tw130
-    - TOX_ENV=py26-tw123
-    - TOX_ENV=py26-tw122
-    - TOX_ENV=py26-tw121
     - TOX_ENV=py27-twlatest
     - TOX_ENV=py27-twtrunk
+    - TOX_ENV=py27-tw162
+    - TOX_ENV=py27-tw160
+    - TOX_ENV=py27-tw150
     - TOX_ENV=py27-tw140
-    - TOX_ENV=py27-tw132
-    - TOX_ENV=py27-tw131
-    - TOX_ENV=py27-tw130
-    - TOX_ENV=py27-tw123
-    - TOX_ENV=py27-tw122
-    - TOX_ENV=py27-tw121
     - TOX_ENV=pypy-twlatest
     - TOX_ENV=pypy-twtrunk
+    - TOX_ENV=pypy-tw162
+    - TOX_ENV=pypy-tw160
+    - TOX_ENV=pypy-tw150
     - TOX_ENV=pypy-tw140
-    - TOX_ENV=pypy-tw132
-    - TOX_ENV=pypy-tw131
-    - TOX_ENV=pypy-tw130
-    - TOX_ENV=pypy-tw123
-    - TOX_ENV=pypy-tw122
-    - TOX_ENV=pypy-tw121
     - TOX_ENV=pyflakes
     - TOX_ENV=manifest
 

docs/source/AUTHORS.rst

@@ -8,12 +8,14 @@ Contributors
 ============
 
 - Anton Gyllenberg
+- Aren Sandersen
 - Bret Curtis
 - Carl Waldbieser
 - Christopher Bartz
 - David Strauss
 - HawkOwl
 - Hynek Schlawack
 - Kenny MacDermid
+- Michael Schlenker
 - Stefan Andersson
 - Tommi Virtanen

docs/source/NEWS.rst

@@ -1,15 +1,19 @@
 Changelog
 =========
 
-Release 14.1 (UNRELEASED)
+Release 16.0 (2016-06-07)
 -------------------------
 
 Features
 ^^^^^^^^
 
 - Make meta data introspectable
 - Added `proxybase.py`, an LDAP proxy that is easier to hook into.
-
+- When parsing LDAPControls, criticality may not exist while controlValue still does
+- Requested attributes can also be passed as '*' symbol
+- Numerous small bug fixes.
+- Additional documentation
+- Updated Travis-CI, Tox and other bits for better coverage.
 
 Release 14.0 (2014-10-31)
 -------------------------

docs/source/conf.py

@@ -49,16 +49,16 @@
 
 # General information about the project.
 project = u'Ldaptor'
-copyright = u'2014, Twisted Matrix Labs'
+copyright = u'2016, Twisted Matrix Labs'
 
 # 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 = '14.0'
+version = '16.0'
 # The full version, including alpha/beta/rc tags.
-release = '14.0'
+release = '16.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

ldaptor/__init__.py

@@ -1,9 +1,9 @@
-__version__ = "14.1.0dev"
+__version__ = "16.0.0"
 
 __title__ = "ldaptor"
 __description__ = "A Pure-Python Twisted library for LDAP"
 __uri__ = "https://github.com/twisted/ldaptor"
 
 __license__ = "MIT"
 __author__ = "The ldaptor developers"
-__copyright__ = "Copyright (c) 2002-2014 {0}".format(__author__)
+__copyright__ = "Copyright (c) 2002-2016 {0}".format(__author__)

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    {py26,py27,pypy}-{twlatest,twtrunk,tw140,tw132,tw131,tw130,tw123,tw122,tw121},
+    {py26,py27,pypy}-{twlatest,twtrunk,tw162,tw160,tw154,tw150,tw140},{py33,py34,py35}-{twtrunk},
     pyflakes, manifest
 
 
@@ -11,14 +11,12 @@ deps =
     pyparsing
     pycrypto
     twlatest: Twisted
-    twtrunk: git+git://github.com/twisted/twisted.git
+    twtrunk: https://github.com/twisted/twisted/archive/trunk.zip
+    tw162: Twisted==16.2
+    tw160: Twisted==16.0
+    tw154: Twisted==15.4
+    tw150: Twisted==15.0
     tw140: Twisted==14.0
-    tw132: Twisted==13.2
-    tw131: Twisted==13.1
-    tw130: Twisted==13.0
-    tw123: Twisted==12.3
-    tw122: Twisted==12.2
-    tw121: Twisted==12.1
 commands =
     {envpython} --version
     trial --version