Merge pull request #28 from secynic/dev

v0.7.0
secynic · Jan 15, 2014 · cfb2d25 · cfb2d25
2 parents c8dd2a2 + 7119b36
commit cfb2d25
Show file tree

Hide file tree

Showing 8 changed files with 176 additions and 98 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.7.0 (2014-01-14)
+------------------
+
+- Added Python 2.6+ support.
+- The country field in net dicts is now forced uppercase.
+
 0.6.0 (2014-01-13)
 ------------------
 

diff --git a/README.rst b/README.rst
@@ -9,8 +9,6 @@ The various NICs are pretty inconsistent with formatting Whois results and the
 information contained within. I am still working through how to parse some of 
 these fields in to standard dictionary keys.
 
-This version requires Python 3.3+ (for the ipaddress library) and dnspython3.
-
 Usage Examples
 ==============
 
@@ -109,6 +107,18 @@ Countries::
 
 	United States
 
+Dependencies
+============
+
+Python 2.6, 2.7::
+
+    dnspython
+    ipaddr
+
+Python 3.3::
+
+    dnspython3
+
 Installing
 ==========
 

diff --git a/ipwhois/__init__.py b/ipwhois/__init__.py
@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = '0.6.0'
+__version__ = '0.7.0'
 
 from .ipwhois import (IPWhois, IPDefinedError, ASNLookupError,
                       WhoisLookupError, HostLookupError)