Remove Python 2.6 support and bump to 1.4.0

diff --git a/.travis.yml b/.travis.yml
index dcc2dba8065b591de638579eb5e9507115b309de..41eb570c32f82c8289bb7568af460e47e14cf703 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ python:
   - "3.4"
   - "3.3"
   - "2.7"
-  - "2.6"
   - "pypy"
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 51d714e19f6d8abcf2bfe50eee58c36d9adb3e21..4e5f41152d68153617a803ba734c57dc31574722 100644 (file)
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -5,7 +5,7 @@ Credits
 Development Lead
 ----------------
 
-* Daniel Roy Greenfeld <pydanny@gmail.com>
+* Daniel Roy Greenfeld (@pydanny)
 * Audrey Roy Greenfeld (@audreyr)
 
 Contributors
@@ -17,3 +17,4 @@ Contributors
 * Adam Williamson <awilliam AT redhat DOT com>
 * Ionel Cristian Mărieș (@ionelmc)
 * Malyshev Artem (@proofit404)
+* Volker Braun (@vbraun)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 971e19adb906aab446028dd481e463de9e5b5c3c..ba7f9b67a49622d72f07ddcd81b8161adc2b1863 100644 (file)
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -99,7 +99,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.6, 2.7, and 3.3, and for PyPy. Check 
+3. The pull request should work for Python 2.7, and 3.3, 3.4, 3.5, 3.6 and for PyPy. Check 
    https://travis-ci.org/pydanny/cached-property/pull_requests
    and make sure that the tests pass for all supported Python versions.
 

diff --git a/HISTORY.rst b/HISTORY.rst
index f27cab82559a686080f8649a8a89f3bd547bc299..51a65b23282b69140aff66d88300991af326168a 100644 (file)
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,13 @@
 History
 -------
 
+1.4.0 (2018-02-25)
+++++++++++++++++++
+
+* Added asyncio support, thanks to @vbraun
+* Remove Python 2.6 support, whose end of life was 5 years ago, thanks to @pydanny
+
+
 1.3.1 (2017-09-21)
 ++++++++++++++++++
 

diff --git a/cached_property.py b/cached_property.py
index 191eb099003d9a3b107eb254f16959704ed53594..53edd60de1af9a96db1335f612cfa2df168bbff1 100644 (file)
--- a/cached_property.py
+++ b/cached_property.py
@@ -2,7 +2,7 @@
 
 __author__ = 'Daniel Greenfeld'
 __email__ = 'pydanny@gmail.com'
-__version__ = '1.3.1'
+__version__ = '1.4.0'
 __license__ = 'BSD'
 
 from time import time

diff --git a/setup.py b/setup.py
index 2b670b81357b0e3f406c9536eb26b5fd256b7afd..a94df4fbe4a2ff762960f16cd951721c15382844 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ try:
 except ImportError:
     from distutils.core import setup
 
-__version__ = '1.3.1'
+__version__ = '1.4.0'
 
 
 def read(fname):
@@ -45,11 +45,11 @@ setup(
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
         "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 )

diff --git a/tox.ini b/tox.ini
index 9f42a58f0b8b6945d9e1dc18efd28cc88882e30a..2d69b26e5e43caf1fc2e4f371e6df395e0907a2c 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, py34, py35, py36
+envlist = py27, py33, py34, py35, py36
 
 [testenv]
 setenv =