summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Simionato <michele.simionato@gmail.com>2015-07-19 06:37:30 +0200
committerMichele Simionato <michele.simionato@gmail.com>2015-07-19 06:37:30 +0200
commitda7b6d12e18d4d123db61a74c933d5106db59465 (patch)
tree1cc9598d491dc5845de07c0c1d69cb31490e9722
parentc517358ff0a14c6b15914e2969fe17a76c276917 (diff)
downloadpython-decorator-git-da7b6d12e18d4d123db61a74c933d5106db59465.tar.gz
Updated the changelog and travis file
-rw-r--r--.travis.yml2
-rw-r--r--CHANGES.txt9
-rw-r--r--LICENSE23
3 files changed, 8 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml
index 62c5eb8..2e68d63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,12 @@
language: python
python:
+ - "2.6"
- "2.7"
- "3.2"
- "3.3"
- "3.4"
+ - "3.5"
install:
- python setup.py install
diff --git a/CHANGES.txt b/CHANGES.txt
index 5595fb6..9b18a60 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,13 @@
HISTORY
-----------
+--------
+4.0.0 Removed the need for 2to3 by dropping the support for Python 2.5; now
+ the decorator module can be distributed as a wheel
+ (2015/07/19)
3.4.1 Ported the repository from GoogleCode to GitHub and added Travis CI
support. Tests are executed with the new command `python test.py -v`.
setuptools is now mandatory in Python 3. The suggested
- installation tool is `pip`, not `easy_install`. Supported IronPython
+ installation tool is now `pip`, not `easy_install`. Supported IronPython
and other Python implementations without sys._getframe, as requested by
Doug Blank (2015/03/16)
3.4.0 Added the ability to use classes and generic callables as callers and
@@ -17,7 +20,7 @@ HISTORY
Ellison (01/09/2011)
3.3.1 Fixed a doctest broken for Python 3.2, as noted by
Arfrever Frehtes Taifersar Arahesis; changed the name of
- the attribute ``undecorated`` to ``__wrapped__`` following the
+ the attribute ``undecorated`` to ``__wrapped__``, by following the
Python 3.2 convention, as requested by Ram Rachum; added
the Python 3 classifier to setup.py (22/04/2011)
3.3. Added support for function annotations (1/1/2011)
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index f342d7b..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2013, Michele Simionato
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this
- list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file