[Python-modules-commits] [basemap] 07/19: Import basemap_1.1.0+dfsg.orig.tar.gz
Sandro Tosi
morph at moszumanska.debian.org
Wed Jan 24 03:51:31 UTC 2018
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository basemap.
commit 3778c573a31f9c4c4370ed925034523f6bc6e485
Author: Sandro Tosi <morph at debian.org>
Date: Sun Jan 21 20:57:41 2018 -0500
Import basemap_1.1.0+dfsg.orig.tar.gz
---
.cvsignore | 2 +
.gitignore | 69 +
.requirements-2.6.txt | 1 +
.travis.yml | 148 +
Changelog | 94 +-
LICENSE_proj4 | 34 -
LICENSE_pyshp | 3 -
PKG-INFO | 27 +-
README => README.md | 114 +-
doc/conf.py | 2 +-
doc/index.rst | 4 +-
doc/matplotlibrc | 1 +
doc/users/figures/background2.py | 1 -
doc/users/figures/geos_partial.py | 2 +-
doc/users/figures/lcc.py | 2 +-
doc/users/figures/nsper_partial.py | 2 +-
doc/users/figures/ortho_partial.py | 2 +-
doc/users/geography.rst | 4 +-
doc/users/installing.rst | 13 +-
doc/users/intro.rst | 30 +-
examples/allskymap.py | 5 +-
examples/camx.sample.nc | Bin 0 -> 35558 bytes
examples/land_shallow_topo_2048.jpg | Bin 0 -> 238676 bytes
examples/nsper_demo.py | 49 +
examples/nytolondon.py | 56 +
examples/panelplot.py | 85 +
examples/plotmap_masked.py | 2 +-
examples/plotozone.py | 106 +
examples/run_all.py | 11 +
examples/streamplot_demo.py | 2 +-
examples/testwmsimage.py | 5 +-
examples/utmtest.py | 2 +-
lib/mpl_toolkits/basemap/__init__.py | 829 +-
lib/mpl_toolkits/basemap/data/GL27 | 22 -
lib/mpl_toolkits/basemap/data/IGNF | 487 -
lib/mpl_toolkits/basemap/data/README | 72 -
lib/mpl_toolkits/basemap/data/countries_c.dat | Bin 18672 -> 168360 bytes
lib/mpl_toolkits/basemap/data/countries_f.dat | Bin 3122600 -> 3115216 bytes
lib/mpl_toolkits/basemap/data/countries_h.dat | Bin 580112 -> 832216 bytes
lib/mpl_toolkits/basemap/data/countries_i.dat | Bin 209840 -> 348088 bytes
lib/mpl_toolkits/basemap/data/countries_l.dat | Bin 61440 -> 248400 bytes
lib/mpl_toolkits/basemap/data/countriesmeta_c.dat | 1009 +-
lib/mpl_toolkits/basemap/data/countriesmeta_f.dat | 4701 +-
lib/mpl_toolkits/basemap/data/countriesmeta_h.dat | 2437 +-
lib/mpl_toolkits/basemap/data/countriesmeta_i.dat | 1465 +-
lib/mpl_toolkits/basemap/data/countriesmeta_l.dat | 1169 +-
lib/mpl_toolkits/basemap/data/epsg | 8628 -
lib/mpl_toolkits/basemap/data/esri | 5937 -
lib/mpl_toolkits/basemap/data/esri.extra | 948 -
lib/mpl_toolkits/basemap/data/gshhs_c.dat | Bin 102640 -> 100808 bytes
lib/mpl_toolkits/basemap/data/gshhs_f.dat | Bin 82801672 -> 84707544 bytes
lib/mpl_toolkits/basemap/data/gshhs_h.dat | Bin 15257928 -> 15391144 bytes
lib/mpl_toolkits/basemap/data/gshhs_i.dat | Bin 3603320 -> 3606784 bytes
lib/mpl_toolkits/basemap/data/gshhs_l.dat | Bin 720264 -> 719016 bytes
lib/mpl_toolkits/basemap/data/gshhsmeta_c.dat | 3588 +-
lib/mpl_toolkits/basemap/data/gshhsmeta_f.dat | 376837 +++++++++---------
lib/mpl_toolkits/basemap/data/gshhsmeta_h.dat | 306639 +++++++-------
lib/mpl_toolkits/basemap/data/gshhsmeta_i.dat | 82374 ++--
lib/mpl_toolkits/basemap/data/gshhsmeta_l.dat | 21319 +-
lib/mpl_toolkits/basemap/data/lsmask_1.25min_c.bin | Bin 347367 -> 347295 bytes
lib/mpl_toolkits/basemap/data/lsmask_1.25min_f.bin | Bin 684215 -> 684487 bytes
lib/mpl_toolkits/basemap/data/lsmask_1.25min_i.bin | Bin 581414 -> 582277 bytes
lib/mpl_toolkits/basemap/data/lsmask_1.25min_l.bin | Bin 457862 -> 458273 bytes
lib/mpl_toolkits/basemap/data/lsmask_10min_c.bin | Bin 20797 -> 20781 bytes
lib/mpl_toolkits/basemap/data/lsmask_10min_f.bin | Bin 31826 -> 31804 bytes
lib/mpl_toolkits/basemap/data/lsmask_10min_i.bin | Bin 30054 -> 30042 bytes
lib/mpl_toolkits/basemap/data/lsmask_10min_l.bin | Bin 25888 -> 25901 bytes
lib/mpl_toolkits/basemap/data/lsmask_2.5min_c.bin | Bin 129232 -> 129142 bytes
lib/mpl_toolkits/basemap/data/lsmask_2.5min_f.bin | Bin 248194 -> 248126 bytes
lib/mpl_toolkits/basemap/data/lsmask_2.5min_i.bin | Bin 218044 -> 218313 bytes
lib/mpl_toolkits/basemap/data/lsmask_2.5min_l.bin | Bin 174232 -> 174340 bytes
lib/mpl_toolkits/basemap/data/lsmask_5min_c.bin | Bin 50301 -> 50263 bytes
lib/mpl_toolkits/basemap/data/lsmask_5min_f.bin | Bin 87592 -> 87517 bytes
lib/mpl_toolkits/basemap/data/lsmask_5min_i.bin | Bin 79837 -> 79853 bytes
lib/mpl_toolkits/basemap/data/lsmask_5min_l.bin | Bin 66238 -> 66305 bytes
lib/mpl_toolkits/basemap/data/nad.lst | 142 -
lib/mpl_toolkits/basemap/data/nad27 | 809 -
lib/mpl_toolkits/basemap/data/nad83 | 744 -
lib/mpl_toolkits/basemap/data/ntf_r93.gsb | Bin 277424 -> 0 bytes
lib/mpl_toolkits/basemap/data/ntv1_can.dat | Bin 1113184 -> 0 bytes
lib/mpl_toolkits/basemap/data/ntv2_out.dist | 11 -
lib/mpl_toolkits/basemap/data/nzgd2kgrid0005.gsb | Bin 318464 -> 0 bytes
lib/mpl_toolkits/basemap/data/other.extra | 53 -
lib/mpl_toolkits/basemap/data/pj_out27.dist | 265 -
lib/mpl_toolkits/basemap/data/pj_out83.dist | 225 -
lib/mpl_toolkits/basemap/data/proj_def.dat | 17 -
lib/mpl_toolkits/basemap/data/proj_outIGNF.dist | 40 -
lib/mpl_toolkits/basemap/data/rivers_c.dat | Bin 382640 -> 381872 bytes
lib/mpl_toolkits/basemap/data/rivers_f.dat | Bin 18276680 -> 18261392 bytes
lib/mpl_toolkits/basemap/data/rivers_h.dat | Bin 4309272 -> 4300464 bytes
lib/mpl_toolkits/basemap/data/rivers_i.dat | Bin 1593216 -> 1590176 bytes
lib/mpl_toolkits/basemap/data/rivers_l.dat | Bin 573288 -> 571880 bytes
lib/mpl_toolkits/basemap/data/riversmeta_c.dat | 46558 ++-
lib/mpl_toolkits/basemap/data/riversmeta_f.dat | 47813 ++-
lib/mpl_toolkits/basemap/data/riversmeta_h.dat | 47067 ++-
lib/mpl_toolkits/basemap/data/riversmeta_i.dat | 46704 ++-
lib/mpl_toolkits/basemap/data/riversmeta_l.dat | 46600 ++-
lib/mpl_toolkits/basemap/data/states_c.dat | Bin 19488 -> 177008 bytes
lib/mpl_toolkits/basemap/data/states_f.dat | Bin 2820752 -> 2824000 bytes
lib/mpl_toolkits/basemap/data/states_h.dat | Bin 465624 -> 854832 bytes
lib/mpl_toolkits/basemap/data/states_i.dat | Bin 172928 -> 379888 bytes
lib/mpl_toolkits/basemap/data/states_l.dat | Bin 56224 -> 264944 bytes
lib/mpl_toolkits/basemap/data/statesmeta_c.dat | 1389 +-
lib/mpl_toolkits/basemap/data/statesmeta_f.dat | 8283 +-
lib/mpl_toolkits/basemap/data/statesmeta_h.dat | 2803 +-
lib/mpl_toolkits/basemap/data/statesmeta_i.dat | 1864 +-
lib/mpl_toolkits/basemap/data/statesmeta_l.dat | 1548 +-
lib/mpl_toolkits/basemap/data/td_out.dist | 25 -
lib/mpl_toolkits/basemap/data/test27 | 847 -
lib/mpl_toolkits/basemap/data/test83 | 728 -
lib/mpl_toolkits/basemap/data/testIGNF | 166 -
lib/mpl_toolkits/basemap/data/testdatumfile | 113 -
lib/mpl_toolkits/basemap/data/testntv2 | 73 -
lib/mpl_toolkits/basemap/data/testvarious | 435 -
lib/mpl_toolkits/basemap/data/tv_out.dist | 188 -
lib/mpl_toolkits/basemap/data/world | 212 -
lib/mpl_toolkits/basemap/diagnostic.py | 118 +
lib/mpl_toolkits/basemap/proj.py | 2 +-
lib/mpl_toolkits/basemap/pyproj.py | 863 -
lib/mpl_toolkits/basemap/shapefile.py | 1128 -
lib/mpl_toolkits/basemap/test.py | 186 +-
requirements.txt | 2 +
setup.py | 114 +-
src/PJ_aea.c | 162 -
src/PJ_aeqd.c | 271 -
src/PJ_airy.c | 124 -
src/PJ_aitoff.c | 76 -
src/PJ_august.c | 18 -
src/PJ_bacon.c | 41 -
src/PJ_bipc.c | 132 -
src/PJ_boggs.c | 32 -
src/PJ_bonne.c | 85 -
src/PJ_cass.c | 79 -
src/PJ_cc.c | 19 -
src/PJ_cea.c | 60 -
src/PJ_chamb.c | 112 -
src/PJ_collg.c | 29 -
src/PJ_crast.c | 22 -
src/PJ_denoy.c | 18 -
src/PJ_eck1.c | 19 -
src/PJ_eck2.c | 28 -
src/PJ_eck3.c | 50 -
src/PJ_eck4.c | 44 -
src/PJ_eck5.c | 18 -
src/PJ_eqc.c | 23 -
src/PJ_eqdc.c | 85 -
src/PJ_fahey.c | 17 -
src/PJ_fouc_s.c | 45 -
src/PJ_gall.c | 19 -
src/PJ_geos.c | 192 -
src/PJ_gins8.c | 17 -
src/PJ_gn_sinu.c | 98 -
src/PJ_gnom.c | 105 -
src/PJ_goode.c | 49 -
src/PJ_gstmerc.c | 48 -
src/PJ_hammer.c | 43 -
src/PJ_hatano.c | 50 -
src/PJ_healpix.c | 703 -
src/PJ_igh.c | 190 -
src/PJ_imw_p.c | 151 -
src/PJ_isea.c | 1134 -
src/PJ_krovak.c | 250 -
src/PJ_labrd.c | 109 -
src/PJ_laea.c | 233 -
src/PJ_lagrng.c | 35 -
src/PJ_larr.c | 12 -
src/PJ_lask.c | 26 -
src/PJ_lcc.c | 105 -
src/PJ_lcca.c | 72 -
src/PJ_loxim.c | 41 -
src/PJ_lsat.c | 171 -
src/PJ_mbt_fps.c | 38 -
src/PJ_mbtfpp.c | 32 -
src/PJ_mbtfpq.c | 47 -
src/PJ_merc.c | 47 -
src/PJ_mill.c | 15 -
src/PJ_mod_ster.c | 211 -
src/PJ_moll.c | 60 -
src/PJ_natearth.c | 77 -
src/PJ_nell.c | 29 -
src/PJ_nell_h.c | 30 -
src/PJ_nocol.c | 38 -
src/PJ_nsper.c | 149 -
src/PJ_nzmg.c | 107 -
src/PJ_ob_tran.c | 144 -
src/PJ_ocea.c | 68 -
src/PJ_oea.c | 58 -
src/PJ_omerc.c | 194 -
src/PJ_ortho.c | 95 -
src/PJ_poly.c | 99 -
src/PJ_putp2.c | 40 -
src/PJ_putp3.c | 26 -
src/PJ_putp4p.c | 29 -
src/PJ_putp5.c | 26 -
src/PJ_putp6.c | 59 -
src/PJ_robin.c | 105 -
src/PJ_rpoly.c | 35 -
src/PJ_sconics.c | 154 -
src/PJ_somerc.c | 66 -
src/PJ_stere.c | 241 -
src/PJ_sterea.c | 85 -
src/PJ_sts.c | 54 -
src/PJ_tcc.c | 17 -
src/PJ_tcea.c | 27 -
src/PJ_tmerc.c | 175 -
src/PJ_tpeqd.c | 76 -
src/PJ_urm5.c | 28 -
src/PJ_urmfps.c | 40 -
src/PJ_vandg.c | 78 -
src/PJ_vandg2.c | 45 -
src/PJ_vandg4.c | 41 -
src/PJ_wag2.c | 21 -
src/PJ_wag3.c | 24 -
src/PJ_wag7.c | 14 -
src/PJ_wink1.c | 20 -
src/PJ_wink2.c | 34 -
src/_geoslib.c | 5354 +-
src/_geoslib.pyx | 24 +-
src/_proj.c | 7801 -
src/_proj.pyx | 524 -
src/aasincos.c | 35 -
src/adjlon.c | 15 -
src/bch2bps.c | 140 -
src/bchgen.c | 58 -
src/biveval.c | 87 -
src/dmstor.c | 113 -
src/emess.c | 57 -
src/emess.h | 28 -
src/gen_cheb.c | 71 -
src/geocent.c | 435 -
src/geocent.h | 179 -
src/geod_interface.c | 34 -
src/geod_interface.h | 45 -
src/geod_set.c | 66 -
src/geodesic.c | 1519 -
src/geodesic.h | 533 -
src/hypot.c | 36 -
src/mk_cheby.c | 161 -
src/nad_cvt.c | 68 -
src/nad_init.c | 311 -
src/nad_intr.c | 62 -
src/nad_list.h | 6 -
src/org_proj4_Projections.h | 37 -
src/p_series.c | 39 -
src/pj_apply_gridshift.c | 253 -
src/pj_apply_vgridshift.c | 208 -
src/pj_auth.c | 30 -
src/pj_ctx.c | 179 -
src/pj_datum_set.c | 154 -
src/pj_datums.c | 90 -
src/pj_deriv.c | 33 -
src/pj_ell_set.c | 105 -
src/pj_ellps.c | 56 -
src/pj_errno.c | 17 -
src/pj_factors.c | 86 -
src/pj_fwd.c | 37 -
src/pj_gauss.c | 94 -
src/pj_gc_reader.c | 221 -
src/pj_geocent.c | 57 -
src/pj_gridcatalog.c | 282 -
src/pj_gridinfo.c | 870 -
src/pj_gridlist.c | 224 -
src/pj_init.c | 518 -
src/pj_initcache.c | 181 -
src/pj_inv.c | 33 -
src/pj_latlong.c | 80 -
src/pj_list.c | 11 -
src/pj_list.h | 142 -
src/pj_log.c | 73 -
src/pj_malloc.c | 27 -
src/pj_mlfn.c | 57 -
src/pj_msfn.c | 7 -
src/pj_mutex.c | 196 -
src/pj_open_lib.c | 176 -
src/pj_param.c | 108 -
src/pj_phi2.c | 25 -
src/pj_pr_list.c | 91 -
src/pj_qsfn.c | 16 -
src/pj_release.c | 11 -
src/pj_strerrno.c | 85 -
src/pj_transform.c | 826 -
src/pj_tsfn.c | 10 -
src/pj_units.c | 37 -
src/pj_utils.c | 173 -
src/pj_zpoly1.c | 46 -
src/proj.def | 41 -
src/proj_api.h | 134 -
src/proj_etmerc.c | 252 -
src/proj_mdist.c | 123 -
src/proj_rouss.c | 122 -
src/projects.h | 532 -
src/rtodms.c | 72 -
src/vector1.c | 29 -
utils/README | 44 +
utils/dumpbounds.sh | 28 +
utils/readboundaries.py | 182 +
utils/readboundaries_shp.py | 230 +
utils/update_landmasks.py | 65 +
298 files changed, 521687 insertions(+), 589964 deletions(-)
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..b646cc4
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,2 @@
+.project
+build
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e72e562
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,69 @@
+#########################################
+# Editor temporary/working/backup files #
+.#*
+[#]*#
+*~
+*$
+*.bak
+.project
+.pydevproject
+
+# Compiled source #
+###################
+*.a
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.py[ocd]
+*.so
+
+# Python files #
+################
+# setup.py working directory
+build
+# sphinx build directory
+doc/_build
+# setup.py dist directory
+dist
+# Egg metadata
+*.egg-info
+# tox testing tool
+.tox
+
+# OS generated files #
+######################
+.gdb_history
+.DS_Store?
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Things specific to this project #
+###################################
+nad2bin
+examples/*.png
+*.pickle
+
+# output of nad2bin
+lib/mpl_toolkits/basemap/data/FL
+lib/mpl_toolkits/basemap/data/MD
+lib/mpl_toolkits/basemap/data/TN
+lib/mpl_toolkits/basemap/data/WI
+lib/mpl_toolkits/basemap/data/WO
+lib/mpl_toolkits/basemap/data/alaska
+lib/mpl_toolkits/basemap/data/conus
+lib/mpl_toolkits/basemap/data/hawaii
+lib/mpl_toolkits/basemap/data/null
+lib/mpl_toolkits/basemap/data/prvi
+lib/mpl_toolkits/basemap/data/stgeorge
+lib/mpl_toolkits/basemap/data/stlrnc
+lib/mpl_toolkits/basemap/data/stpaul
+
+# Documentation generated files #
+#################################
+doc/examples
+doc/_templates/gallery.html
+doc/users/installing.rst
+doc/_static/matplotlibrc
diff --git a/.requirements-2.6.txt b/.requirements-2.6.txt
new file mode 100644
index 0000000..9a23970
--- /dev/null
+++ b/.requirements-2.6.txt
@@ -0,0 +1 @@
+unittest2
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..70cde14
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,148 @@
+sudo: false
+
+env:
+ global:
+ - NUMPY=numpy
+ - MPL=matplotlib
+ - PYPROJ=pyproj
+ - TEST_ARGS=--no-pep8
+ - BUILD_LIBGEOS=false
+
+# install apt binary packages
+addons:
+ apt:
+ packages:
+ - libgeos-3.3.8
+ # matplotlib requirements
+ - libpng12-dev
+ - libfreetype6-dev
+ # helpers utilities
+ - autotools-dev
+ - wget
+
+language: python
+
+cache:
+ directories:
+ # cache for wheels generated by pip
+ - $HOME/.cache/pip
+ # cache for libgeos library binaries
+ - $HOME/.libgeos
+
+
+# matrix generates 6 test cases
+matrix:
+ include:
+ # "minimum requirements" environments
+ # test the bare minimum versions
+ # compiles internal libgeos
+ # Notes:
+ # numpy 1.7.0 is the first version that works out of the box for Python 2.6 and 3.3
+ # numpy 1.5.1 is the earliest version to compile and *might* be able to work on Python 2.6,
+ # if two unit tests are skipped due to numpy.copy(a,order) not having 'order' parameter
+ # 1.6.0-1.6.2 works out of the box for Python 2.6
+ # matplotlib 1.2.0 was found to be the earliest version that installs
+ - python: 2.6
+ env:
+ - NUMPY=numpy==1.7.0
+ - MPL=matplotlib==1.2.0
+ - BUILD_LIBGEOS=internal
+
+ # "middle of the road" environment
+ # use prepackaged binaries
+ # if no prepackaged binary available, use a previous stable version
+ - python: 3.4
+ env:
+ - MPL=matplotlib==1.4.3
+ - NUMPY=numpy==1.9.3
+ - BUILD_LIBGEOS=internal
+
+ # "latest and greatest" stable environments
+ # this uses the current stable versions
+ # pip installs latest stable versions automatically
+ - python: 2.7
+ env:
+ - BUILD_LIBGEOS=3.5.1
+ - python: 3.5
+ env:
+ - BUILD_LIBGEOS=3.5.1
+ - python: 3.6
+ env:
+ - BUILD_LIBGEOS=3.6.1
+
+ # "current development" environment
+ # this test is diagnostic for development versions and is not required to pass
+ - python: "nightly"
+ env:
+ # these are python packages so prepend "git+" to git URL
+ - NUMPY=git+https://github.com/numpy/numpy.git
+ - MPL=git+https://github.com/matplotlib/matplotlib.git
+ - PYPROJ=git+https://github.com/jswhit/pyproj.git
+ # C lib, git URL only
+ - BUILD_LIBGEOS=https://github.com/libgeos/libgeos.git
+ # or download latest stable
+ # - BUILD_LIBGEOS=3.5.0
+
+ allow_failures:
+ - python: "nightly"
+
+# before_install:
+ # Install into our own pristine virtualenv
+ # - virtualenv --python=python venv
+ # - source venv/bin/activate
+
+install:
+ # Upgrade pip and setuptools. Install wheel.
+ - pip install --upgrade pip
+ - pip install --upgrade setuptools
+ - pip install wheel
+
+ # the development version of numpy requires Cython
+ - if [[ $TRAVIS_PYTHON_VERSION == 'nightly' ]]; then pip install --install-option="--no-cython-compile" Cython; fi
+
+
+ - pip install --upgrade $NUMPY
+ - pip install $MPL
+ - pip install $PYPROJ
+ - pip install -r requirements.txt
+
+ # extra requirements to support Python 2.6
+ - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install -r .requirements-2.6.txt; fi
+
+ - |
+ # Is libgeos suppose to be built?
+ if [[ $BUILD_LIBGEOS != 'false' ]]; then
+ export GEOS_DIR=$HOME/.libgeos/${BUILD_LIBGEOS}/
+ # Does this path (for libgeos binaries) not exist in cache?
+ if [[ ! -d "$GEOS_DIR" ]] ; then
+ # Download and Compile libgeos
+ if [[ $BUILD_LIBGEOS == 'internal' ]]; then
+ echo 'Building internal libgeos'
+ cd geos-3.3.3
+ # Does this string contain a "git" substring?
+ elif [[ $BUILD_LIBGEOS == *"git"* ]]; then
+ echo 'Using git to download libgeos development'
+ git clone ${BUILD_LIBGEOS}
+ cd libgeos
+ ./autogen.sh
+ # do NOT cache libgeos git
+ export GEOS_DIR=$HOME/dont-cache-me/
+ else
+ echo 'Downloading and building external libgeos'
+ wget https://github.com/libgeos/libgeos/archive/${BUILD_LIBGEOS}.tar.gz
+ tar zxf ${BUILD_LIBGEOS}.tar.gz
+ cd geos-${BUILD_LIBGEOS}
+ ./autogen.sh
+ fi
+ ./configure --prefix=$GEOS_DIR
+ make; make install
+ cd ..
+ fi
+ fi
+# - pip install pep8
+ - pip install .
+
+script:
+ - python lib/mpl_toolkits/basemap/test.py --verbose
+
+
diff --git a/Changelog b/Changelog
index b1060c6..4619081 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,31 @@
+version 1.1.0 (git tag v1.1.0rel)
+--------------------------------
+* Updated packaged data to use GSHHG v2.3.6 (PR #311 & #320)
+* pyshp/pyproj are now external dependencies (PR #234)
+* Proper clipping of plots regardless of projection (issue #175)
+* drawmapscale() supports "feet" as an input unit (PR #289)
+* nightshade() supports datetime timezone-aware datetime objects
+ as long as the timezone is UTC. Still assumes timezone-naive
+ objects are UTC as well. (issue #272)
+* Properly perform input validation/casting (issue #260)
+* Support newer versions of OWSLib (PR #259)
+* Use integer indexes (PR #246)
+* Stop ResourceWarnings for unclosed files in py3k (PR #244)
+* add 'textcolor' kwarg to drawmeridians and drawparallels (issue #145).
+* don't assume grid is regular when adding cyclic point in addcyclic.
+ New kwargs 'axis' and 'cyclic' added. More than one array
+ can be handled at a time, as long as the last one is longitude. (issue #139).
+* fix for coastline drawing glitch (issue #123).
+* added 'facecolor' keyward argument to drawcounties() method; gives user
+ ability to fill counties with specified matplotlib color argument.
+* fix drawgreatcircle bug so that lines exiting and reentering a projection
+ region don't draw horizontally across the map.
+* on non-windows platforms, only link against libgeos C API (and not against
+ C++ API anymore; issue #140). This is recommended by the authors/maintainers
+ of GEOS. Also, this means that on e.g. Debian Linux, basemap can now be
+ installed from source simply using 'pip install basemap' when the libgeos
+ packages are installed globally using the package management.
+
version 1.0.7 (git tag v1.0.7rel)
---------------------------------
* include mpl_toolkits/__init__.py, since the one installed by matplotlib
@@ -19,7 +47,7 @@ version 1.0.6 (git tag v1.0.6rel)
* update pyproj to version 1.9.3 (remove geographiclib python code, replace
with C code from proj4).
* in contourf and contour, all points outside the map projection
- region were masked. This meant that if a grid cell was partly inside and partly
+ region were masked. This meant that if a grid cell was partly inside and partly
outside the map projection region, nothing was drawn, leaving a gap along the
edge of the map. This was particularly noticeable for very coarse resolution grids.
This commit only masks those points more than one grid length beyond the edge
@@ -31,8 +59,8 @@ version 1.0.6 (git tag v1.0.6rel)
(requires using 'epsg' keyword to define projection).
* fix drawing of meridians and parallels for very small map regions
(issue 79).
-* add module variable 'latlon_default' that can be used to switch
- default value of latlon kwarg to True so plotting methods can be
+* add module variable 'latlon_default' that can be used to switch
+ default value of latlon kwarg to True so plotting methods can be
passed lats and lons (geographic coordinatsin degrees) instead
of x,y (projection coordinates).
* have drawcoastlines use line segments instead of coastline polygons, to
@@ -48,7 +76,7 @@ version 1.0.6 (git tag v1.0.6rel)
* added linestyle keyword to all draw* methods.
* added 'drawcounties' method (https://github.com/matplotlib/basemap/pull/65)
thanks to Patrick Marsh.
-* fix bug that caused plotting to fail when latlon keyword is
+* fix bug that caused plotting to fail when latlon keyword is
explicitly set to False (https://github.com/matplotlib/basemap/pull/66).
* add latlon keyword to plot and scatter methods
(https://github.com/matplotlib/basemap/pull/64).
@@ -69,7 +97,7 @@ version 1.0.5 (git tag v1.0.5rel)
to illustrate usage.
* fix bluemarble and warpimage methods to account for change in orientation
of arrays returned to matplotlib's pil_to_array (issue 51)
-* fix glitch with drawing meridians and filling coastline polygons with
+* fix glitch with drawing meridians and filling coastline polygons with
omerc projection that includes pole.
version 1.0.4 (git tag v1.0.4rel)
@@ -97,10 +125,10 @@ version 1.0.3 (git tag v1.0.3rel)
* update coastlines, rivers, political boundaries to GSHHS
2.2.0/GMT 4.5.7. The fillcontinents bug (filling the outside
instead of the inside of a coastline polygon) is now much
- harder to trigger.
+ harder to trigger.
* add 'round' keyword keyword to Basemap.__init__ for pole-centered
projections to make them round (clipped at boundinglat) instead
- of square.
+ of square.
* added hexbin method, along with hexbin_demo.py example.
* drawmapboundary now uses axes bgcolor as default fill_color. If
no color fill wanted, set fill_color='none' (a string).
@@ -141,7 +169,7 @@ version 1.0.2 (git tag v1.0.2)
* 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
+ * 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).
@@ -169,7 +197,7 @@ version 1.0.1 (svn revision 8967)
projection to proj4 src in src/PJ_hammer.c).
* updated src/pj_mutex.c from proj4 svn to fix a threading bug
on Windows.
- * if you try to transform NaNs to/from map projection coords, 1.e30
+ * if you try to transform NaNs to/from map projection coords, 1.e30
is returned (previously, this caused a segfault for some
projections).
* NetCDFFile function deprecated, will be removed in 1.0.2. Issue
@@ -207,15 +235,15 @@ version 1.0 (svn revision 8531)
'daynight.py' example added to illustrate usage.
* added lonmin, lonmax instance variables.
version 0.99.4 (svn revision 7332)
- * ax.frame replaced with ax.spines to maintain compatibility
+ * ax.frame replaced with ax.spines to maintain compatibility
with matplotlib spines support.
- * added latmax kwarg to drawparallels and drawmeridians
+ * added latmax kwarg to drawparallels and drawmeridians
(patch from Chris Murphy).
* added new example "plotmap_shaded.py" (shaded relief plot).
* added new example "plothighsandlows.py".
* add fix_aspect kwarg to Basemap.__init__, when False
axes.set_aspect is set to 'auto' instead of default 'equal'.
- Can be used to make plot fill whole plot region, even if the
+ Can be used to make plot fill whole plot region, even if the
plot region doesn't match the aspect ratio of the map region.
* added date2index function, updated netcdftime to 0.7.1.
* added maskoceans function.
@@ -224,20 +252,20 @@ version 0.99.4 (svn revision 7332)
one of the shapefile components can't be found.
version 0.99.3 (svn revision 6780)
* if upper right/lower left corners nor width/height given for
- azimuthal equidistant ('aeqd') the whole world is drawn in
+ azimuthal equidistant ('aeqd') the whole world is drawn in
a circle (only works for perfect spheres, not ellipsoids).
* have setup.py check for already installed pyshapelib (just
like it does for httplib2 and pydap).
* Basemap will now look for it's data in BASEMAPDATA.
- If that env var not set, it will fall back to it's
+ If that env var not set, it will fall back to it's
default location.
* if readshapefile is called with drawbounds=True, a
LineCollection object is appended to the returned tuple.
* make sure drawmapscale method returns a list of objects that
can be iterated over to remove them from the plot.
* fillcontinents was returning just last Polygon instance.
- Now returns a list of all Polygon instances.
- * bluemarble/warpimage: pass kwargs to imshow,
+ Now returns a list of all Polygon instances.
+ * bluemarble/warpimage: pass kwargs to imshow,
return Image instance.
version 0.99.2 (svn revision 6541)
* fix drawlsmask method so that it works for cylindrical
@@ -269,7 +297,7 @@ version 0.99.2 (svn revision 6541)
* added "proj4string" Basemap instance variable.
* testgdal example now uses gdal to read topo data from a raster
DEM file and ogr to read state boundaries from a shape file.
- * warpimage method can now handle gray-scale images, and
+ * warpimage method can now handle gray-scale images, and
images specifed as URLs (for example, the Blue Marble images from
http://earthobservatory.nasa.gov/Newsroom/BlueMarble/BlueMarble_monthlies.html).
version 0.99.1 (svn revision 5961)
@@ -295,7 +323,7 @@ version 0.99 (svn revision 5344)
* drawcoastlines, drawcountries and friends now have
PatchCollection return values.
* make sure '_nolabel_' set on coastlines, countries, states,
- rivers, parallels and meridians so they are not included in
+ rivers, parallels and meridians so they are not included in
a legend.
* added drawmapscale method to create a map scale bar similar
to that available with the GMT's psbasemap.
@@ -332,7 +360,7 @@ version 0.9.9 (svn revision 4799)
* now automatically draws figure if running in
interactive mode (so draw() does not need
to be called explicitly in ipython).
- * added num2date and date2num functions, which use
+ * added num2date and date2num functions, which use
included netcdftime module.
version 0.9.8 (svn revision 4526)
* fixes for filling continents in orthographic projection.
@@ -341,12 +369,12 @@ version 0.9.8 (svn revision 4526)
of variable data.
* NetCDFFile will try to use PyNIO if it installed
and the file cannot be read with pupynere. This
- allows GRIB1,GRIB2,HDF4 and HDFEOS2 files to
+ allows GRIB1,GRIB2,HDF4 and HDFEOS2 files to
be read.
- * 'fmt' kwarg to drawparallels and drawmeridians can
+ * 'fmt' kwarg to drawparallels and drawmeridians can
now be a custom string formatting function (example
customticks.py demonstrates usage).
- * remove 'linestyle' kwarg from drawparallels and
+ * remove 'linestyle' kwarg from drawparallels and
drawmeridians (it never did anything anyway since
it was overridden by the 'dashes' kwarg).
* modify NetCDFFile to use dap module to read remote
@@ -363,7 +391,7 @@ version 0.9.7 (svn revision 4422)
projections.
* added lake_color keyword to fillcontinents.
* fixed a bug in the 'tmerc' projection.
- * added pure python NetCDFFile reader from Roberto De Almeida
+ * added pure python NetCDFFile reader from Roberto De Almeida
to basemap namespace
(from matplotlib.toolkits.basemap import NetCDFFile).
* added support for full-resolution boundaries (will be
@@ -392,11 +420,11 @@ version 0.9.6 (svn revision 3888)
llcrnrlon,urcrnrlat,urcrnrlon keywords for 'ortho' and 'geos'.
(illustrated by examples/geos_demo_2.py).
* Added "labelstyle" keyword to drawparallels and drawmeridians.
- If set to "+/-", labels are given prefixed by "+" or "-",
- instead of suffixed with "N","S","E" or "W". Useful for
+ If set to "+/-", labels are given prefixed by "+" or "-",
+ instead of suffixed with "N","S","E" or "W". Useful for
astronomical plots, where the is no such thing and north, south
east or west.
- * Added support for geostationary satellite projection
+ * Added support for geostationary satellite projection
(projection='geos'), contributed by Scott Sinclair.
Illustrated by examples/geos_demo.py.
* added a bunch of extra colormaps (mostly from GMT),
@@ -405,7 +433,7 @@ version 0.9.6 (svn revision 3888)
import cm'
* orthographic projection only defined for perfect sphere - raise
an error if user tries to use an ellipsoid.
- * print a warning in contour, contourf in situations that may
+ * print a warning in contour, contourf in situations that may
result in a screwy looking plot (x not monotonically increasing,
because the data wraps around the edge of the plot). The warning
suggests using the shiftgrid function to recenter the data on
@@ -425,7 +453,7 @@ version 0.9.6 (svn revision 3888)
* fixed examples to conform to 'one show() per script' rule.
* intermediate coastlines now installed by default.
basemap-data is no longer a separate package (couldn't
- figure out how to manage the egg). If the 'h' res
+ figure out how to manage the egg). If the 'h' res
boundaries are needed, the data files must be manually
put in place by the user. BASEMAP_DATA_PATH env var
no longer used.
@@ -467,9 +495,9 @@ version 0.9.6 (svn revision 3888)
Now maps will always have the correct aspect ratio.
* if resolution keyword is set to None when Basemap
instance is created, no boundary data sets are needed
- (methods to draw boundaries, like drawcoastlines, will
+ (methods to draw boundaries, like drawcoastlines, will
raise an exception).
- * update to proj4 module - renamed pyproj to avoid
+ * update to proj4 module - renamed pyproj to avoid
conflicts with proj4 module from CDAT.
* createfigure method deprecated, since maps
will now automatically have the correct aspect ratio.
@@ -478,7 +506,7 @@ version 0.9.6 (svn revision 3888)
versions of the stereographic, lambert azimuthal equal area
and azimuthal equidistant projections that don't require
you specify the lat/lon values of the lower-left and upper-right
- corners.
+ corners.
* fixed bugs in plot, scatter and mapboundary methods for
miller, cylindrical and mercator projections.
* 'crude' and 'low' resolution boundary datasets now installed
@@ -499,7 +527,7 @@ version 0.9.6 (svn revision 3888)
20060203: version 0.8.1: Huge speedups for numpy
(no significant differences for Numeric and numarray).
20060114: version 0.8: added numpy compatibility
-20051118: version 0.7.2.1:
+20051118: version 0.7.2.1:
There was a problem running examples that read pickle files.
The pickle files were created with numarray, and the
data would not be read correctly using Numeric. Fixed so
@@ -512,7 +540,7 @@ version 0.9.6 (svn revision 3888)
by contour and contourf.
* Axes frame turned off by default for non-rectangular
projections ('ortho','robin' and 'moll').
- * Added createfigure method to create a figure with the
+ * Added createfigure method to create a figure with the
same aspect ratio as the map using pylab.figure.
* Resets subplot.params defaults so that default
axes rectangle will have both a width and height of 0.9
diff --git a/LICENSE_proj4 b/LICENSE_proj4
deleted file mode 100644
index fa37174..0000000
--- a/LICENSE_proj4
+++ /dev/null
@@ -1,34 +0,0 @@
-
-All source, data files and other contents of the PROJ.4 package are
-available under the following terms. Note that the PROJ 4.3 and earlier
-was "public domain" as is common with US government work, but apparently
-this is not a well defined legal term in many countries. I am placing
-everything under the following MIT style license because I believe it is
-effectively the same as public domain, allowing anyone to use the code as
-they wish, including making proprietary derivatives.
-
-Though I have put my own name as copyright holder, I don't mean to imply
-I did the work. Essentially all work was done by Gerald Evenden.
-
- --------------
-
- Copyright (c) 2000, Frank Warmerdam
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
diff --git a/LICENSE_pyshp b/LICENSE_pyshp
deleted file mode 100644
index 56e4c61..0000000
--- a/LICENSE_pyshp
+++ /dev/null
@@ -1,3 +0,0 @@
-pyshp is released under the MIT license, which can be found at:
-
-http://www.opensource.org/licenses/mit-license.php
diff --git a/PKG-INFO b/PKG-INFO
index 64f2948..53ffaf0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,24 +1,11 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: basemap
-Version: 1.0.7
+Version: 20050130
Summary: Plot data on map projections with matplotlib
-Home-page: http://matplotlib.sourceforge.net/toolkits.html
+Home-page: http://www.cdc.noaa.gov/people/jeffrey.s.whitaker/python/basemap/
Author: Jeff Whitaker
Author-email: jeffrey.s.whitaker at noaa.gov
-License: OSI Approved
-Download-URL: http://sourceforge.net/projects/matplotlib
-Description:
- An add-on toolkit for matplotlib that lets you plot data
- on map projections with coastlines, lakes, rivers and political boundaries.
- See http://www.scipy.org/wikis/topical_software/Maps for an
- example of what it can do.
-Keywords: python,plotting,plots,graphs,charts,GIS,mapping,map projections,maps
-Platform: any
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Scientific/Engineering :: Visualization
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Operating System :: OS Independent
+License: UNKNOWN
+Download-URL: http://www.cdc.noaa.gov/people/jeffrey.s.whitaker/python/basemap/basemap-20050130.tar.gz
+Description: UNKNOWN
+Platform: UNKNOWN
diff --git a/README b/README.md
similarity index 50%
rename from README
rename to README.md
index 4499d8c..8aadad6 100644
--- a/README
+++ b/README.md
@@ -1,50 +1,48 @@
-**Descripton**
+#Basemap
-basemap - plot on map projections (with coastlines and political boundaries)
+Plot on map projections (with coastlines and political boundaries)
using matplotlib.
-**Requirements**
+##Requirements
-python 2.5 (or higher)
+* Python 2.6 (or higher)
-matplotlib
+* matplotlib
-numpy
+* numpy
-The GEOS (Geometry Engine - Open Source) library (version 3.1.1 or higher).
-Source code is included in the geos-3.3.3 directory.
+* [pyproj](https://github.com/jswhit/pyproj)
+
+* [pyshp](https://github.com/GeospatialPython/pyshp)
-PIL (http://pythonware.com/products/pil) is optional (only
-needed for Basemap warpimage and bluemarble methods).
+* The GEOS (Geometry Engine - Open Source) library (version 3.1.1 or higher).
+Source code is included in the geos-3.3.3 directory.
-On linux, if your python was installed via a package management system, make
+* On linux, if your python was installed via a package management system, make
sure the corresponding "python-dev" package is also installed. Otherwise, you
may not have the python header (Python.h), which is required to build python
C extensions.
-**Copyright**
+###Optional
+
+* [OWSLib](https://github.com/geopython/OWSLib) (optional) It is needed
+for the BaseMap.wmsimage function.
-source code from proj.4 (http://proj.maptools.org) is included in the
-'src' directory under the terms given in LICENSE_proj4.
+* [Pillow](https://python-pillow.github.io/) (optional) It is
+needed for Basemap warpimage, bluemarble, shadedrelief, and etop methods.
+PIL should work on Python 2.x. Pillow is a maintained fork of PIL.
-source code from geographiclib (http://pypi.python.org/pypi/geographiclib)
-is included in the 'lib/mpl_toolkits/basemap' directory under the terms
-given in LICENSE_geographiclib.
+##Copyright
source code for the GEOS library is
included in the 'geos-3.3.3' directory under the terms given in
LICENSE_geos.
-shapefile.py from pyshp.googlecode.com is included under the terms given
-in LICENSE_pyshp.
-
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)
+from datasets provided with the [Generic Mapping Tools (GMT)](http://gmt.soest.hawaii.edu)
and are included under the terms given in LICENSE_data.
-Everything else (including src/_proj.pyx,,
-src/_proj.c, src/_geos.c, and src/_geos.pyx):
+Everything else (including src/_geos.c, and src/_geos.pyx):
copyright (c) 2011 by Jeffrey Whitaker.
@@ -61,7 +59,7 @@ USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-**Documentation**
+##Documentation
see http://matplotlib.github.com/basemap/
@@ -70,64 +68,42 @@ see scripts in 'examples' directory for example usage.
read the FAQ and/or email the matplotlib-users mailing list if
you have problems or questions.
... 1117149 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/basemap.git
More information about the Python-modules-commits
mailing list