summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--six.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index a4a479f..164f0b5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,8 +3,8 @@ Changelog for six
This file lists the changes in each six version.
-Development version
--------------------
+1.12.0
+------
- Issue #259, pull request #260: `six.add_metaclass` now preserves
`__qualname__` from the original class.
diff --git a/six.py b/six.py
index 901ec39..89b2188 100644
--- a/six.py
+++ b/six.py
@@ -29,7 +29,7 @@ import sys
import types
__author__ = "Benjamin Peterson <benjamin@python.org>"
-__version__ = "1.11.0"
+__version__ = "1.12.0"
# Useful for very coarse version differentiation.