Updates in preparation for 0.5.0

Author: oschwald

.travis.yml

@@ -4,6 +4,7 @@ python:
   - 2.6
   - 2.7
   - 3.3
+  - pypy
 
 before_install:
   - git submodule update --init --recursive

HISTORY.rst

@@ -3,6 +3,15 @@
 History
 -------
 
+0.5.0 (2014-02-11)
+++++++++++++++++++
+
+* Fixed missing import statements for geoip2.errors and geoip2.models.
+  (Gustavo J. A. M. Carneiro)
+* Minor documentation and code cleanup
+* Added requirement for maxminddb v0.3.0, which includes a pure Python
+  database reader.
+
 0.4.2 (2013-12-20)
 ++++++++++++++++++
 

README.rst

@@ -22,9 +22,6 @@ MaxMind's free `GeoLite2 databases
 Installation
 ------------
 
-Web Service Client Only
-^^^^^^^^^^^^^^^^^^^^^^^
-
 To install the ``geoip2`` module, type:
 
 .. code-block:: bash
@@ -38,29 +35,13 @@ source directory:
 
     $ easy_install .
 
-Database Reader and Web Service Client
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You must first install the `libmaxminddb C API
-<https://github.com/maxmind/libmaxminddb>`_. Please `see the instructions
-distributed with it <https://github.com/maxmind/libmaxminddb/blob/master/README.md#installing-from-a-tarball>`_.
-
-After installing ``libmaxminddb``, install the ``geoip2`` module with the
-database reader dependencies by typing:
-
-.. code-block:: bash
-
-    $ pip install geoip2[DB]
-
-If you are not able to use pip, you may also use easy_install. To do this, you
-must first install `maxminddb <http://maxminddb.readthedocs.org/>`_ and
-`requests <http://www.python-requests.org/en/latest/>`_. Once these
-dependencies have been satisfied, ``cd`` to the source directory and type:
-
-.. code-block:: bash
-
-    $ easy_install .
+Database Reader Extension
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
+If you wish to use the C extension for the database reader, you must first
+install the `libmaxminddb C API <https://github.com/maxmind/libmaxminddb>`_.
+Please `see the instructions distributed with it
+<https://github.com/maxmind/libmaxminddb/blob/master/README.md>`_.
 
 Usage
 -----
@@ -234,11 +215,11 @@ Requirements
 ------------
 
 This code requires Python 2.6+ or 3.3+. Older versions are not supported.
+This library has been tested with CPython and PyPy.
 
 The Requests HTTP library is also required. See
 <http://python-requests.org> for details.
 
-
 Versioning
 ----------
 

geoip2/__init__.py

@@ -1,7 +1,7 @@
 # pylint:disable=C0111
 
 __title__ = 'geoip2'
-__version__ = '0.4.2'
+__version__ = '0.5.0'
 __author__ = 'Gregory Oschwald'
 __license__ = 'LGPLv2.1+'
-__copyright__ = 'Copyright 2013 Maxmind, Inc.'
+__copyright__ = 'Copyright 2014 Maxmind, Inc.'

requirements.txt

@@ -1 +1,2 @@
 requests>=2.0
+maxminddb>=0.3.0

setup.py

@@ -37,7 +37,6 @@
     package_dir={'geoip2': 'geoip2'},
     include_package_data=True,
     install_requires=requirements,
-    extras_require={'DB': ['maxminddb']},
     tests_require=['httpretty>=0.6.1'],
     test_suite="tests",
     license=open('LICENSE').read(),