[python-geopandas] 03/12: Merge tag 'upstream/0.2'

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository python-geopandas.

commit e246ba11080ad7aa62331c2607fb39083f0ab11f
Merge: dbdc773 b536ca7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 10 22:21:39 2016 +0200

    Merge tag 'upstream/0.2'
    
    Upstream version 0.2
    
    Conflicts:
    	.gitignore
    	.travis.yml
    	LICENSE.txt
    	README.md
    	doc/source/about.rst
    	doc/source/conf.py
    	doc/source/index.rst
    	doc/source/install.rst
    	examples/nyc_boros.py
    	geopandas/__init__.py
    	geopandas/base.py
    	geopandas/geodataframe.py
    	geopandas/geoseries.py
    	geopandas/io/file.py
    	geopandas/plotting.py
    	requirements.test.txt
    	requirements.txt
    	setup.py

 .gitattributes                                     |    1 +
 .gitignore                                         |    2 +
 .requirements-2.6.txt                              |    2 -
 .travis.yml                                        |   96 +-
 CHANGELOG                                          |   37 +
 LICENSE.txt                                        |    2 +-
 MANIFEST.in                                        |    2 +
 README.md                                          |   40 +-
 constraints.txt                                    |    1 +
 doc/environment.yml                                |   18 +
 doc/source/_static/overlay_operations.png          |  Bin 0 -> 19251 bytes
 doc/source/about.rst                               |    6 +-
 doc/source/aggregation_with_dissolve.rst           |   51 +
 doc/source/conf.py                                 |   22 +-
 doc/source/contributing.rst                        |  281 ++++
 doc/source/data_structures.rst                     |  135 ++
 doc/source/geocoding.rst                           |   17 +
 doc/source/geometric_manipulations.rst             |  222 +++
 doc/source/index.rst                               |   15 +-
 doc/source/install.rst                             |   64 +-
 doc/source/io.rst                                  |   28 +
 doc/source/mapping.rst                             |  120 ++
 doc/source/mergingdata.rst                         |   77 +
 doc/source/projections.rst                         |   71 +
 doc/source/{user.rst => reference.rst}             |  220 +--
 doc/source/set_operations.rst                      |  195 +++
 examples/null_geom.geojson                         |    9 +
 examples/nyc_boros.py                              |    2 +-
 examples/overlays.ipynb                            |  601 +++++++
 examples/spatial_joins.ipynb                       |  929 ++++++++++
 geopandas/__init__.py                              |   13 +-
 geopandas/_version.py                              |  484 ++++++
 geopandas/base.py                                  |  183 +-
 geopandas/datasets/__init__.py                     |   27 +
 .../naturalearth_cities.README.html                |  336 ++++
 .../naturalearth_cities.VERSION.txt                |    1 +
 .../naturalearth_cities/naturalearth_cities.cpg    |    1 +
 .../naturalearth_cities/naturalearth_cities.dbf    |  Bin 0 -> 16427 bytes
 .../naturalearth_cities/naturalearth_cities.prj    |    1 +
 .../naturalearth_cities/naturalearth_cities.shp    |  Bin 0 -> 5756 bytes
 .../naturalearth_cities/naturalearth_cities.shx    |  Bin 0 -> 1716 bytes
 .../naturalearth_lowres/naturalearth_lowres.cpg    |    1 +
 .../naturalearth_lowres/naturalearth_lowres.dbf    |  Bin 0 -> 51346 bytes
 .../naturalearth_lowres/naturalearth_lowres.prj    |    1 +
 .../naturalearth_lowres/naturalearth_lowres.shp    |  Bin 0 -> 179828 bytes
 .../naturalearth_lowres/naturalearth_lowres.shx    |  Bin 0 -> 1516 bytes
 geopandas/geodataframe.py                          |  262 ++-
 geopandas/geoseries.py                             |   65 +-
 geopandas/io/file.py                               |   92 +-
 {tests => geopandas/io/tests}/__init__.py          |    0
 {tests => geopandas/io/tests}/test_io.py           |   27 +-
 geopandas/plotting.py                              |  225 ++-
 geopandas/sindex.py                                |   26 +
 {tests => geopandas/tests}/__init__.py             |    0
 .../baseline_images/test_plotting/lines_plot.png   |  Bin
 .../baseline_images/test_plotting/points_plot.png  |  Bin
 .../baseline_images/test_plotting/poly_plot.png    |  Bin
 .../test_plotting/poly_plot_with_kwargs.png        |  Bin 0 -> 30619 bytes
 geopandas/tests/test_dissolve.py                   |   83 +
 geopandas/tests/test_geocode.py                    |  143 ++
 {tests => geopandas/tests}/test_geodataframe.py    |  127 +-
 {tests => geopandas/tests}/test_geom_methods.py    |   59 +-
 {tests => geopandas/tests}/test_geoseries.py       |   45 +-
 geopandas/tests/test_merge.py                      |   62 +
 geopandas/tests/test_overlay.py                    |  114 ++
 geopandas/tests/test_plotting.py                   |  311 ++++
 geopandas/tests/test_sindex.py                     |  117 ++
 {tests => geopandas/tests}/test_types.py           |    6 +-
 {tests => geopandas/tests}/util.py                 |   41 +-
 geopandas/tools/__init__.py                        |   14 +
 geopandas/{geocode.py => tools/geocoding.py}       |   78 +-
 geopandas/tools/overlay.py                         |  183 ++
 geopandas/tools/sjoin.py                           |  125 ++
 {tests => geopandas/tools/tests}/__init__.py       |    0
 geopandas/tools/tests/test_sjoin.py                |   88 +
 geopandas/tools/tests/test_tools.py                |   51 +
 geopandas/tools/util.py                            |   52 +
 readthedocs.yml                                    |    7 +
 requirements.test.txt                              |    4 +-
 requirements.txt                                   |    3 +
 setup.cfg                                          |   10 +
 setup.py                                           |   73 +-
 tests/test_geocode.py                              |   91 -
 tests/test_plotting.py                             |   78 -
 versioneer.py                                      | 1774 ++++++++++++++++++++
 85 files changed, 7956 insertions(+), 794 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-geopandas.git