Skip to content

Commit b2d13e7

Browse files
committed
General updates to README
Python version bumped to 2.6. Changed PIL to Pillow. Added OWSLib as optional dependencies. Added section for optional requirements. Removed lines relating to proj4/pyproj.
1 parent 24336eb commit b2d13e7

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

README.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ using matplotlib.
55

66
##Requirements
77

8-
* python 2.5 (or higher)
8+
* Python 2.6 (or higher)
99

1010
* matplotlib
1111

@@ -18,18 +18,21 @@ using matplotlib.
1818
* The GEOS (Geometry Engine - Open Source) library (version 3.1.1 or higher).
1919
Source code is included in the geos-3.3.3 directory.
2020

21-
* [PIL](http://pythonware.com/products/pil) is optional (only
22-
needed for Basemap warpimage and bluemarble methods).
23-
2421
* On linux, if your python was installed via a package management system, make
2522
sure the corresponding "python-dev" package is also installed. Otherwise, you
2623
may not have the python header (Python.h), which is required to build python
2724
C extensions.
2825

29-
##Copyright
26+
###Optional
27+
28+
* [OWSLib](https://github.com/geopython/OWSLib) (optional) It is needed
29+
for the BaseMap.wmsimage function.
3030

31-
source code from [proj.4](http://trac.osgeo.org/proj/) is included in the
32-
'src' directory under the terms given in LICENSE_proj4.
31+
* [Pillow](https://python-pillow.github.io/) (optional) It is
32+
needed for Basemap warpimage, bluemarble, shadedrelief, and etop methods.
33+
PIL should work on Python 2.x. Pillow is a maintained fork of PIL.
34+
35+
##Copyright
3336

3437
source code for the GEOS library is
3538
included in the 'geos-3.3.3' directory under the terms given in
@@ -39,7 +42,7 @@ the land-sea mask, coastline, lake, river and political boundary data are extrac
3942
from datasets provided with the [Generic Mapping Tools (GMT)](http://gmt.soest.hawaii.edu)
4043
and are included under the terms given in LICENSE_data.
4144

42-
Everything else (including src/_proj.pyx, src/_proj.c, src/_geos.c, and src/_geos.pyx):
45+
Everything else (including src/_geos.c, and src/_geos.pyx):
4346

4447
copyright (c) 2011 by Jeffrey Whitaker.
4548

0 commit comments

Comments
 (0)