From 1a3e0ed87cceedfc97170de6d367a282a2c89349 Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Sun, 25 Feb 2018 18:03:34 -0500 Subject: [PATCH] Remove Python 2.6 support and bump to 1.4.0 --- .travis.yml | 1 - AUTHORS.rst | 3 ++- CONTRIBUTING.rst | 2 +- HISTORY.rst | 7 +++++++ cached_property.py | 2 +- setup.py | 4 ++-- tox.ini | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcc2dba..41eb570 100644 --- 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 51d714e..4e5f411 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -5,7 +5,7 @@ Credits Development Lead ---------------- -* Daniel Roy Greenfeld +* Daniel Roy Greenfeld (@pydanny) * Audrey Roy Greenfeld (@audreyr) Contributors @@ -17,3 +17,4 @@ Contributors * Adam Williamson * Ionel Cristian Mărieș (@ionelmc) * Malyshev Artem (@proofit404) +* Volker Braun (@vbraun) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 971e19a..ba7f9b6 100644 --- 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 f27cab8..51a65b2 100644 --- 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 191eb09..53edd60 100644 --- 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 2b670b8..a94df4f 100755 --- 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 9f42a58..2d69b26 100644 --- 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 = -- 2.30.2