Commit 978dbc4f authored by SVN-Git Migration's avatar SVN-Git Migration

Imported Upstream version 1.0.2

parent e5becad7

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

version 1.0.2: default value for lakes kwarg in drawlsmask changed from False to True.
default value for inlands kwarg in maskoceans changed from False to True.
NetCDFFile function removed.
version 0.99: now must be imported as mpl_toolkits.basemap instead
of matplotlib.toolkits.basemap.
version 0.9.8: remove linestyle kwarg from drawparallels and drawmeridians.
......
version 1.0.2 (git tag v1.0.2)
* update include geos from 3.2.0 to 3.3.1 so it compiles with gcc
4.6.
* added colorbar method that uses axes_grid toolkit to
create colorbar axes.
* replace hasattr(arr,'mask') with numpy.ma.isMA(arr).
* docs updated, moved to matplotlib.github.com/basemap.
* added optional 1.25, 2.5 and 10 minute land/sea masks (derived from
GSHHS coastline data). 'resolution'
and 'grid' kwargs added to drawlsmask and maskoceans.
'resolution' can be 'c','l','i','h' or 'f', grid can be 1.25,2.5,5 or 10.
* update shapefile.py from pyshp.googlecode.com to r72.
* change default land-sea mask (now derived directly from gshhs
coastline data, default is 5 minutes use coastline resolution =
'l'). Default for plotting lakes is now True.
* add etopo method (similar to bluemarble, but plots etopo
relief image from www.ngdc.noaa.gov/mgg/global as a map background).
* add shadedrelief method (similar to bluemarble, but plots shaded
relief image from naturalearthdata.com as a map background).
* replace pyshapelib with pure python shapelib.py from
pyshp.googlecode.com. Allows full python 3 compatibility.
* fix doc/conf.py to use inheritance_diagram from Sphinx, not
matplotlib.
* fix drawlsmask so cylindrical projections work correctly when
longitude range outside of -180 to 180.
* python 3 compatibility.
* added lic_demo.py to examples (line integral convolution,
requires scikit.vectorplot).
* removed deprecated NetCDFFile.
* added zorder keyword to drawmapscale.
version 1.0.1 (svn revision 8967)
* regenerated C source with cython 0.14.1.
* added new "allsky" example from Tom Loredo.
......
......@@ -2,6 +2,6 @@
always tries to fill the inside of a polygon. Under certain situations,
what is the inside of a coastline polygon can be ambiguous, and the
outside may be filled instead of the inside. To trigger this,
run the garp.py example with lon=-71,lat=-33 (Santiago, Chile).
run the ortho_demo.py example with lon=-120,lat=60.
Workaround - mask the land areas with the drawlsmask method instead of
filling the coastline polygons.
filling the coastline polygons (this is illustrated in the ortho_demo.py example).
This diff is collapsed.
pyshp is released under the MIT license, which can be found at:
http://www.opensource.org/licenses/mit-license.php
......@@ -2,14 +2,13 @@ include FAQ
include README
include MANIFEST.in
include LICENSE_proj4
include LICENSE_pyshapelib
include LICENSE_pyshp
include LICENSE_data
include LICENSE_geos
include API_CHANGES
include KNOWN_BUGS
include Changelog
include setup.py
include setup.cfg
include setupegg.py
include nad2bin.c
include src/*
include examples/allskymap.py
......@@ -75,24 +74,21 @@ include examples/cities.shp
include examples/cities.shx
include examples/show_colormaps.py
include examples/plotprecip.py
include examples/lic_demo.py
include examples/nws_precip_conus_20061222.nc
include examples/C02562.orog.nc
include examples/ccsm_popgrid.nc
include examples/NetCDFFile_tst.py
include examples/rita.nc
include examples/maskoceans.py
include examples/README
include lib/mpl_toolkits/__init__.py
include lib/mpl_toolkits/basemap/__init__.py
include lib/mpl_toolkits/basemap/proj.py
include lib/mpl_toolkits/basemap/pyproj.py
include lib/mpl_toolkits/basemap/shapefile.py
include lib/mpl_toolkits/basemap/cm.py
include lib/mpl_toolkits/basemap/netcdf.py
include lib/mpl_toolkits/basemap/pupynere.py
include lib/mpl_toolkits/basemap/netcdftime.py
include pyshapelib/README pyshapelib/COPYING pyshapelib/ChangeLog pyshapelib/NEWS
include pyshapelib/*.i pyshapelib/*.c pyshapelib/*.py pyshapelib/*.h
include pyshapelib/*.shp pyshapelib/*.shx pyshapelib/*.dbf
include pyshapelib/shapelib/*.c pyshapelib/shapelib/*.h
include lib/mpl_toolkits/basemap/solar.py
include lib/mpl_toolkits/basemap/test.py
include doc/users/figures/*py
include doc/users/*rst
include doc/api/*rst
......@@ -100,9 +96,5 @@ include doc/README.txt
include doc/make.py
include doc/conf.py
include doc/index.rst
recursive-include geos-3.2.0 *
recursive-include lib/dap *
recursive-include lib/httplib2 *
recursive-include lib/dbflib *
recursive-include lib/shapelib *
recursive-include geos-3.3.1 *
recursive-include lib/mpl_toolkits/basemap/data *
Metadata-Version: 1.0
Name: basemap
Version: 1.0.1
Version: 1.0.2
Summary: Plot data on map projections with matplotlib
Home-page: http://matplotlib.sourceforge.net/toolkits.html
Author: Jeff Whitaker
......
......@@ -7,12 +7,12 @@ using matplotlib.
python 2.4 (or higher)
matplotlib 0.98 (or higher)
matplotlib 1.0.1 (or higher)
numpy 1.1 (or higher)
numpy 1.4 (or higher)
The GEOS (Geometry Engine - Open Source) library (version 3.1.1 or higher).
Source code is included in the geos-3.2.0 directory.
Source code is included in the geos-3.3.1 directory.
PIL (http://pythonware.com/products/pil) is optional (only
needed for Basemap warpimage and bluemarble methods).
......@@ -28,25 +28,21 @@ source code from proj.4 (http://proj.maptools.org) is included in the
'src' directory under the terms given in LICENSE_proj4.
source code for the GEOS library is
included in the 'geos-3.1.1' directory under the terms given in
included in the 'geos-3.3.1' directory under the terms given in
LICENSE_geos.
pyshapelib by Bernhard Herzog is included in the 'pyshapelib' directory
under the terms given in LICENSE_pyshapelib.
shapefile.py from pyshp.googlecode.com is included under the terms given
in LICENSE_pyshp.
the coastline, lake, river and political boundary data are extracted
the land-sea mask, coastline, lake, river and political boundary data are extracted
from datasets provided with the Generic Mapping Tools
(http://gmt.soest.hawaii.edu)
and are included under the terms given in LICENSE_data.
a public domain 5-minute land/sea/lake mask dataset from
http://www.ngdc.noaa.gov/seg/cdroms/graham/graham/graham.htm
is included.
Everything else (including src/_proj.pyx, src/_geod.pyx, src/_pyproj.pxi,
src/_proj.c, src/_geod.c, src/_geos.c, and src/_geos.pyx):
copyright (c) 2007 by Jeffrey Whitaker.
copyright (c) 2011 by Jeffrey Whitaker.
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
......@@ -63,7 +59,7 @@ PERFORMANCE OF THIS SOFTWARE.
**Documentation**
see http://matplotlib.sf.net/basemap/doc/html/.
see http://matplotlib.gitub.net/basemap.
see scripts in 'examples' directory for example usage.
......@@ -76,15 +72,6 @@ you have problems or questions.
1) Then download basemap-X.Y.Z.tar.gz (approx 100 mb) from
the sourceforge download site, unpack and cd to basemap-X.Y.Z.
Note that most of that size consists of coastline data, which
does not change with every release. When it does change, it is
noted in the Changelog. If you already have the latest data installed,
you can download basemap-nodata-X.Y.Z.tar.gz instead, which is
*much* smaller.
By default the data is installed in the same directory as the toolkit.
You may move it if you wish, and set the environment variable
BASEMAPDATA to point to the new location.
2) Install the GEOS library. If you already have it on your
system, just set the environment variable GEOS_DIR to point to the location
......@@ -93,7 +80,7 @@ geos_c.h is in /usr/local/include, set GEOS_DIR to /usr/local).
Then go to step (3). If you don't have it, you can build it from
the source code included with basemap by following these steps:
> cd geos-3.1.1
> cd geos-3.3.1
> export GEOS_DIR=<where you want the libs and headers to go>
A reasonable choice on a Unix-like system is /usr/local, or
if you don't have permission to write there, your home directory.
......@@ -105,13 +92,6 @@ run the usual 'python setup.py install'. Check your installation
by running "from mpl_toolkits.basemap import Basemap" at the python
prompt.
Basemap includes three auxilliary packages, pydap (http://pydap.org, just
the client is included), httplib2 and pyshapelib. By default, setup.py checks to
see if these are already installed, and if so does not try to overwrite
them. If you get import errors related to either of these two packages,
edit setup.cfg and set pydap, httplib2 and/or pyshapelib to True to force
installation of the included versions.
4) To test, cd to the examples directory and run 'python simpletest.py'.
To run all the examples (except those that have extra dependencies
or require an internet connection), execute 'python run_all.py'.
......
To build docs ....
* install sphinx from svn.
* make _static and sphinxext symlinks here that point to the corresponding
directories in the matplotlib doc tree, e.g.
ln -s ../../../matplotlib/doc/_static _static
ln -s ../../../matplotlib/doc/sphinxext sphinxext
* copy matplotlibrc to users/figures, edit to make default figure size 6,6
instead of 8,6.
* install sphinx.
* run 'python make.py html'. Entry point is build/html/index.html.
* to update on sf site:
cd build
rsync -avz html jswhit,matplotlib@web.sf.net:/home/groups/m/ma/matplotlib/htdocs/basemap/doc/ -essh
* to update on github site:
checkout gh-pages basemap branch in ../../basemap.git.web
(cd ../..; git clone git@github.com:matplotlib/basemap.git -b gh-pages basemap.git.web)
rsync -vaz build/html/ ../../basemap.git.web
go to basemap.git.web, commit and push the updates.
......@@ -16,18 +16,19 @@ import sys, os
# If your extensions are in another directory, add it here. If the directory
# is relative to the documentation root, use os.path.abspath to make it
# absolute, like shown here.
sys.path.append(os.path.abspath('sphinxext'))
#sys.path.append(os.path.abspath('sphinxext'))
# General configuration
# ---------------------
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['matplotlib.sphinxext.mathmpl', 'math_symbol_table',
'sphinx.ext.autodoc', 'matplotlib.sphinxext.only_directives',
'matplotlib.sphinxext.plot_directive', 'inheritance_diagram',
'gen_rst',
'matplotlib.sphinxext.ipython_console_highlighting']
extensions = ['sphinx.ext.autodoc']
#extensions = ['matplotlib.sphinxext.mathmpl',
# 'sphinx.ext.autodoc', 'matplotlib.sphinxext.only_directives',
# 'matplotlib.sphinxext.plot_directive',
# 'sphinx.ext.inheritance_diagram',
# 'matplotlib.sphinxext.ipython_console_highlighting']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
......@@ -39,16 +40,16 @@ source_suffix = '.rst'
master_doc = 'index'