start 1.13 release prep

diff --git a/ChangeLog b/ChangeLog
index c953588e211bcb38903c7c172ad619b37d377e66..32ddb21fb0b983247bb57d4f10a09efa874b5a2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-05-03  Arthur Gautier
+
+        * Single source support for python 2 and 3
+
 2014-09-04  Bob Halley  <halley@dnspython.org>
 
        * Comparing two rdata is now always done by comparing the binary

diff --git a/README.md b/README.md
index 64146e2ae85f3945abe97480053a2f4655954ed9..71eddfd8e3fe31493c0d046008877de57f6e019b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -20,16 +20,28 @@ open sourced under a BSD-style license, and helps support its future
 development by continuing to employ the author :).
 
 ## INSTALLATION
-- If you have pip installed and are using Python 2.x, you can do this
+- If you have pip installed,  you can do this
 `pip install dnspython`
-- If you have pip installed and are using Python 3.x, you can do this
-`pip install dnspython3`
 - If not just download the source file and unzip it, then run this
 `sudo python setup.py install`
 
 ## ABOUT THIS RELEASE
 
-This is dnspython 1.12.0
+This is dnspython 1.13.0
+
+New since 1.12.0:
+
+        Single source support for python 2 and python 3.  Thank
+       you so much to Arthur Gautier for taking on this
+       challenge and making it work!  It was a big job!
+
+       Support for Python older than 2.6 dropped.
+
+       XXX TBD XXX
+
+Bugs fixed since 1.12.0:
+
+       XXX TBD XXX
 
 New since 1.11.1:
     

diff --git a/dns/version.py b/dns/version.py
index 8279fef530737302f1cfe9b227b6be40f3791eaf..94ab87fa5f3f237739640b071d10d9a7078acd0d 100644 (file)
--- a/dns/version.py
+++ b/dns/version.py
@@ -16,7 +16,7 @@
 """dnspython release version information."""
 
 MAJOR = 1
-MINOR = 12
+MINOR = 13
 MICRO = 0
 RELEASELEVEL = 0x0f
 SERIAL = 0

diff --git a/setup.py b/setup.py
index 04d3ab118fba354cb32098a34dfe5bdeb63b984d..67287c4335065a9470073b51526546e013b2b3b5 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
 import sys
 from setuptools import setup
 
-version = '1.12.0'
+version = '1.13.0'
 
 kwargs = {
     'name' : 'dnspython',