.gitignore

@@ -37,15 +37,22 @@ coverage.xml
 
 # Sphinx documentation
 doc/_build/
+.buildinfo
 
 # Jupyter Notebook
 .ipynb_checkpoints
 
+# pytest
+.pytest_cache
+
+.mypy_cache
+
 # projects
 .spyderproject
 .spyproject
 .idea
 .ropeproject
+.vscode
 
 *.py~
 .DS_Store

.travis.yml

@@ -7,18 +7,18 @@ matrix:
     # Only one test for these Python versions
     - env: ENV_FILE="ci/travis/35-minimal.yaml"
 
-    # Python 2.7 and 3.6 test all supported Pandas versions
-    - env: ENV_FILE="ci/travis/27-pd023.yaml"
-    # - env: ENV_FILE="ci/travis/27-latest-defaults.yaml"
-    - env: ENV_FILE="ci/travis/27-latest-conda-forge.yaml"
-
+    # Python 3.6 test all supported Pandas versions
     - env: ENV_FILE="ci/travis/36-pd023.yaml"
     - env: ENV_FILE="ci/travis/36-pd024.yaml"
 
     - env: ENV_FILE="ci/travis/37-latest-defaults.yaml" STYLE=true
     - env: ENV_FILE="ci/travis/37-latest-conda-forge.yaml"
+
+    - env: ENV_FILE="ci/travis/38-latest-conda-forge.yaml"
+
     - env: ENV_FILE="ci/travis/37-dev.yaml" DEV=true
 
+
 install:
   # Install conda
   - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
@@ -37,6 +37,7 @@ install:
   - source activate test
   - if [ "$DEV" ]; then pip install git+https://github.com/pydata/pandas.git; fi
   - if [ "$DEV" ]; then pip install git+https://github.com/matplotlib/matplotlib.git; fi
+  - if [ "$DEV" ]; then pip install git+https://github.com/Toblerity/Shapely.git; fi
   - if [ "$STYLE" ]; then pip install black flake8; fi
   - pip install -e .
   - conda list

CHANGELOG.md

 Changes
 =======
 
+Version 0.7.0 (February 16, 2020)
+---------------------------------
+
+Support for Python 2.7 has been dropped. GeoPandas now works with Python >= 3.5.
+
+The important API change of this release is that GeoPandas now requires
+PROJ > 6 and pyproj > 2.2, and that the `.crs` attribute of a GeoSeries and
+GeoDataFrame no longer stores the CRS information as a proj4 string or dict,
+but as a ``pyproj.CRS`` object (#1101).
+
+This gives a better user interface and integrates improvements from pyproj and
+PROJ 6, but might also require some changes in your code. Check the
+[migration guide](https://geopandas.readthedocs.io/en/latest/projections.html#upgrading-to-geopandas-0-7-with-pyproj-2-2-and-proj-6)
+in the documentation.
+
+Other API changes;
+
+- The `GeoDataFrame.to_file` method will now also write the GeoDataFrame index
+  to the file, if the index is named and/or non-integer. You can use the
+  `index=True/False` keyword to overwrite this default inference (#1059).
+
+New features and improvements:
+
+- A new `geopandas.clip` function to clip a GeoDataFrame to the spatial extent
+  of another shape (#1128).
+- The `geopandas.overlay` function now works for all geometry types, including
+  points and linestrings in addition to polygons (#1110).
+- The `plot()` method gained support for missing values (in the column that
+  determines the colors). By default it doesn't plot the corresponding
+  geometries, but using the new `missing_kwds` argument you can specify how to
+  style those geometries (#1156).
+- The `plot()` method now also supports plotting GeometryCollection and
+  LinearRing objects (#1225).
+- Added support for filtering with a geometry or reading a subset of the rows in
+  `geopandas.read_file` (#1160).
+- Added support for the new nullable integer data type of pandas in
+  `GeoDataFrame.to_file` (#1220).
+
+Bug fixes:
+
+- `GeoSeries.reset_index()` now correctly results in a GeoDataFrame instead of DataFrame (#1252).
+- Fixed the `geopandas.sjoin` function to handle MultiIndex correctly (#1159).
+- Fixed the `geopandas.sjoin` function to preserve the index name of the left GeoDataFrame (#1150).
+
+
 Version 0.6.3 (February 6, 2020)
 ---------------------------------
 

CONTRIBUTING.md

@@ -36,14 +36,8 @@ is a great way to get started if you'd like to make a contribution.
 Style
 -----
 
-- GeoPandas supports Python 2 (2.7+) and Python 3 (3.5+) with a single
-  code base. Use modern Python idioms when possible that are
-  compatible with both major versions, and use the
-  [six](https://pythonhosted.org/six) library where helpful to smooth
-  over the differences. Use `from __future__ import` statements where
-  appropriate. Test code locally in both Python 2 and Python 3 when
-  possible (all supported versions will be automatically tested on
-  Travis CI).
+- GeoPandas supports Python 3.5+ only. The last version of GeoPandas
+  supporting Python 2 is 0.6.
 
 - GeoPandas follows [the PEP 8
   standard](http://www.python.org/dev/peps/pep-0008/) and uses

appveyor.yml

@@ -5,14 +5,14 @@
 
 environment:
   matrix:
-    - PYTHON_VERSION: "2.7"
-      MINICONDA: C:\Miniconda-x64
-      ENV_FILE: "ci/travis/27-latest-defaults.yaml"
-
     - PYTHON_VERSION: "3.7"
       MINICONDA: C:\Miniconda37-x64
       ENV_FILE: "ci/travis/37-latest-conda-forge.yaml"
 
+    - PYTHON_VERSION: "3.8"
+      MINICONDA: C:\Miniconda37-x64
+      ENV_FILE: "ci/travis/38-latest-conda-forge.yaml"
+
 # all our python builds have to happen in tests_script...
 build: false
 

asv.conf.json

@@ -58,7 +58,6 @@
         "cython": [],
         "fiona": [],
         "pyproj": [],
-        "six": [],
         "rtree": [],
         "matplotlib": [],
         "descartes": []

ci/travis/27-latest-conda-forge.yaml

-name: test
-channels:
-  - conda-forge
-dependencies:
-  - python=2.7
-  - six
-  # required
-  - pandas
-  - shapely
-  - fiona
-  - pyproj
-  # testing
-  - pytest
-  - pytest-cov
-  #- codecov
-  - mock
-  # optional
-  - rtree
-  - matplotlib
-  - descartes
-  - mapclassify==1.0.1
-  #- geopy
-  - SQLalchemy
-  - psycopg2
-  - libspatialite
-  # TEMP: workaround until conda-forge fixes the issues with gdal
-  - zstd
-  - pip:
-    - codecov
-    - geopy

ci/travis/27-pd023.yaml

-name: test
-channels:
-  - defaults
-dependencies:
-  - python=2.7
-  - six
-  - cython
-  # required
-  - pandas=0.23
-  - shapely
-  - fiona=1.7
-  - pyproj
-  # testing
-  - pytest
-  - pytest-cov
-  #- codecov
-  - mock
-  # optional
-  - rtree
-  - matplotlib==2.0.2
-  - descartes
-  #- geopy
-  - SQLalchemy
-  - psycopg2
-  - libspatialite
-  - pip:
-    - codecov
-    - geopy
-    - mapclassify==1.0.1

ci/travis/35-minimal.yaml

@@ -4,13 +4,12 @@ channels:
   - conda-forge
 dependencies:
   - python=3.5
-  - six
   # required
   - numpy=1.12
   - pandas==0.23.4
   - shapely=1.5
   - fiona=1.7
-  - pyproj
+  #- pyproj
   # testing
   - pytest
   - pytest-cov
@@ -25,3 +24,5 @@ dependencies:
   - SQLalchemy
   - psycopg2
   - libspatialite
+  - pip:
+    - pyproj==2.2.2

ci/travis/36-pd023.yaml

@@ -4,14 +4,13 @@ channels:
 dependencies:
   - python=3.6
   - pip
-  - six
   # required
   - pandas==0.23.4
   - nomkl
   - shapely
   - gdal=2.3
   - fiona
-  - pyproj
+  #- pyproj
   # testing
   - pytest
   - pytest-cov
@@ -26,5 +25,6 @@ dependencies:
   - psycopg2
   - libspatialite
   - pip:
+    - pyproj==2.3.1
     - geopy
     - codecov

ci/travis/36-pd024.yaml

@@ -3,12 +3,11 @@ channels:
   - defaults
 dependencies:
   - python=3.6
-  - six
   # required
   - pandas=0.24
   - shapely
   - fiona=1.7
-  - pyproj
+  #- pyproj
   # testing
   - pytest
   - pytest-cov
@@ -22,6 +21,7 @@ dependencies:
   - psycopg2
   - libspatialite
   - pip:
+    - pyproj
     - codecov
     - geopy
     - mapclassify

ci/travis/37-dev.yaml

@@ -3,7 +3,6 @@ channels:
   - defaults
 dependencies:
   - python=3.7.3
-  - six
   - cython
   # required
   - pandas

ci/travis/37-latest-conda-forge.yaml

@@ -3,7 +3,6 @@ channels:
   - conda-forge
 dependencies:
   - python=3.7
-  - six
   # required
   - pandas
   - shapely
@@ -22,5 +21,3 @@ dependencies:
   - SQLalchemy
   - psycopg2
   - libspatialite
-  # TEMP: workaround until conda-forge fixes the issues with gdal
-  - zstd

ci/travis/37-latest-defaults.yaml

@@ -3,7 +3,6 @@ channels:
   - defaults
 dependencies:
   - python=3.7.3
-  - six
   # required
   - pandas
   - shapely

ci/travis/27-latest-defaults.yaml → ci/travis/38-latest-conda-forge.yaml

 name: test
 channels:
-  - defaults
+  - conda-forge
 dependencies:
-  - python=2.7
-  - six
+  - python=3.8
   # required
   - pandas
   - shapely
@@ -12,17 +11,13 @@ dependencies:
   # testing
   - pytest
   - pytest-cov
-  #- codecov
-  - mock
+  - codecov
   # optional
   - rtree
   - matplotlib
   - descartes
-  #- geopy
+  - pysal
+  - geopy
   - SQLalchemy
   - psycopg2
   - libspatialite
-  - pip:
-    - codecov
-    - geopy
-    - mapclassify==1.0.1

debian/changelog

+python-geopandas (0.7.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Refresh patches.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 17 Feb 2020 15:17:10 +0100
+
 python-geopandas (0.6.3-1) unstable; urgency=medium
 
   * Team upload.

debian/patches/no-gallery.patch

@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
-@@ -27,7 +27,6 @@ import sys, os
+@@ -28,7 +28,6 @@ import warnings
  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
  extensions = ['IPython.sphinxext.ipython_console_highlighting',
                'IPython.sphinxext.ipython_directive',
@@ -12,7 +12,7 @@ Forwarded: not-needed
                'sphinx.ext.autosummary',
                'sphinx.ext.intersphinx',
                'sphinx.ext.autodoc',
-@@ -55,19 +54,6 @@ templates_path = ['_templates']
+@@ -56,20 +55,6 @@ templates_path = ['_templates']
  
  autosummary_generate = True
  
@@ -25,10 +25,11 @@ Forwarded: not-needed
 -    'reference_url': {'matplotlib': 'http://matplotlib.org',
 -                      'numpy': 'http://docs.scipy.org/doc/numpy',
 -                      'scipy': 'http://docs.scipy.org/doc/scipy/reference',
+-                      'pyproj': 'http://pyproj4.github.io/pyproj/stable/',
 -                      'geopandas': None},
 -    'backreferences_dir': 'reference'
 -}
 -
- # The suffix of source filenames.
- source_suffix = '.rst'
- 
+ # suppress matplotlib warning in examples
+ warnings.filterwarnings(
+     "ignore",

doc/Makefile

@@ -41,6 +41,7 @@ help:
 clean:
 	-rm -rf $(BUILDDIR)/*
 	-rm -rf source/reference/*
+	-rm -rf source/gallery/*
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html

doc/environment.yml

@@ -3,26 +3,31 @@ channels:
 - conda-forge
 dependencies:
 - python=3.7
-- pandas=0.25.0
-- shapely=1.6.4
-- fiona=1.8.6
-- pyproj=1.9.6
-- rtree=0.8.3
-- six=1.12.0
-- geopy=1.20.0
-- matplotlib=3.1.1
+- pandas=1.0.1
+- shapely=1.7.0
+- fiona=1.8.13
+- pyproj=2.4.2.post1
+- rtree=0.9.4
+- geopy=1.21.0
+- matplotlib=3.1.3
 - descartes=1.1.0
-- mapclassify=2.1.1
-- sphinx=2.1.2
+- mapclassify=2.2.0
+- sphinx=2.4.1
 - sphinx_rtd_theme=0.4.3
-- numpydoc=0.9.1
-- ipython=7.7.0
-- pillow=6.1.0
+- numpydoc=0.9.2
+- ipython=7.12.0
+- pillow=7.0.0
 - mock=3.0.5
 - cartopy=0.17.0
 - contextily=1.0rc2
-- rasterio=1.0.24
-- geoplot=0.3.0
+- rasterio=1.1.1
+- geoplot=0.4.0
+# 0.5.0 has a bug (https://github.com/sphinx-gallery/sphinx-gallery/issues/568)
 - sphinx-gallery=0.4.0
-- jinja2=2.10
+- jinja2=2.11.1
 - doc2dash
+# specify additional dependencies to reduce solving for conda
+- gdal=3.0.4
+- libgdal=3.0.4
+- proj=6.3.0
+- geos=3.8.0

doc/source/_static/custom.css

@@ -2,3 +2,16 @@
 div.section a span {
     color: #2980B9 !important
 }
+
+/*Copied from sphinx' basic.css to ensure the sphinx >2.0 docstrings are
+rendered somewhat properly (xref https://github.com/numpy/numpydoc/issues/215) */
+
+.classifier {
+    font-style: oblique;
+}
+
+.classifier:before {
+    font-style: normal;
+    margin: 0.5em;
+    content: ":";
+}