.travis.yml

@@ -2,31 +2,22 @@ language: python
 
 sudo: false
 
-
 matrix:
   include:
     # Only one test for these Python versions
-    - python: 3.5
-      env: PANDAS=0.20.2 MATPLOTLIB=1.5.3
+    - env: ENV_FILE="ci/travis/35-minimal.yaml"
 
     # Python 2.7 and 3.6 test all supported Pandas versions
-    - python: 2.7
-      env: PANDAS=0.19.2  MATPLOTLIB=1.5.3 SHAPELY=1.5
-    - python: 2.7
-      env: PANDAS=0.20.2  MATPLOTLIB=2.0.2
-    - python: 2.7
-      env: PANDAS=0.23.2  MATPLOTLIB=2.1.2
-    - python: 2.7
-      env: PANDAS=master  MATPLOTLIB=2.2.2
-
-    - python: 3.6
-      env: PANDAS=0.19.2  MATPLOTLIB=1.5.3 SHAPELY=1.5 CHANNEL=conda-forge
-    - python: 3.6
-      env: PANDAS=0.20.2  MATPLOTLIB=2.0.2
-    - python: 3.6
-      env: PANDAS=0.23.2  MATPLOTLIB=2.2.2
-    - python: 3.6
-      env: PANDAS=master  MATPLOTLIB=master
+    - env: ENV_FILE="ci/travis/27-pd020.yaml"
+    - env: ENV_FILE="ci/travis/27-latest-defaults.yaml"
+    - env: ENV_FILE="ci/travis/27-dev.yaml"
+
+    - env: ENV_FILE="ci/travis/36-pd020.yaml"
+    - env: ENV_FILE="ci/travis/36-pd022.yaml"
+
+    - env: ENV_FILE="ci/travis/37-latest-defaults.yaml"
+    - env: ENV_FILE="ci/travis/37-latest-conda-forge.yaml"
+    - env: ENV_FILE="ci/travis/37-dev.yaml"
 
 install:
   # Install conda
@@ -35,17 +26,12 @@ install:
   - export PATH="$HOME/miniconda/bin:$PATH"
   - conda config --set always_yes yes --set changeps1 no
   - conda update conda
-  - if [ -n "$CHANNEL" ]; then conda config --add channels $CHANNEL; fi
 
   # Install dependencies
-  - conda create -n test-geopandas -c conda-forge python=$TRAVIS_PYTHON_VERSION pytest matplotlib six psycopg2 sqlalchemy codecov pytest-cov mock
-  - source activate test-geopandas
-  - if [[ $MATPLOTLIB == 'master' ]]; then pip install git+https://github.com/matplotlib/matplotlib.git; fi
-  - if [ -n "$SHAPELY" ]; then conda install shapely=$SHAPELY; else conda install shapely; fi
-  - conda install pysal pyproj fiona descartes rtree
-
-  - if [[ $PANDAS != 'master' ]]; then conda install pandas==$PANDAS; fi
-  - if [[ $PANDAS == 'master' ]]; then conda install pandas cython; pip install git+https://github.com/pydata/pandas.git; fi
+  - conda env create --file="${ENV_FILE}"
+  - source activate test
+  - pip install -e .
+  - conda list
 
 script:
   - py.test geopandas --cov geopandas -v --cov-report term-missing

CHANGELOG.md

 Changes
 =======
 
-Version 0.4.0 (July 15, 2017)
+Version 0.4.1 (March 5, 2019)
+-----------------------------
+
+Small bug-fix release for compatibility with the latest Fiona and PySAL
+releases:
+
+* Compatibility with Fiona 1.8: fix deprecation warning (#854).
+* Compatibility with PySAL 2.0: switched to `mapclassify` instead of `PySAL` as
+  dependency for choropleth mapping with the `scheme` keyword (#872).
+* Fix for new `overlay` implementation in case the intersection is empty (#800).
+
+
+Version 0.4.0 (July 15, 2018)
 -----------------------------
 
 Improvements:

MANIFEST.in

 include versioneer.py
 include geopandas/_version.py
+include LICENSE.txt

README.md

@@ -28,9 +28,8 @@ Documentation is available at [geopandas.org](http://geopandas.org)
 Install
 --------
 
-**Requirements**
-
-For the installation of GeoPandas, the following packages are required:
+See the [installation docs](https://geopandas.readthedocs.io/en/latest/install.html)
+for all details. GeoPandas depends on the following packages:
 
 - ``pandas``
 - ``shapely``
@@ -39,40 +38,10 @@ For the installation of GeoPandas, the following packages are required:
 
 Further, ``descartes`` and ``matplotlib`` are optional dependencies, required
 for plotting, and [``rtree``](https://github.com/Toblerity/rtree) is an optional
-dependency, required for spatial joins. ``rtree`` requires the C library [``libspatialindex``](https://github.com/libspatialindex/libspatialindex). If using brew, you can install using ``brew install Spatialindex``.
-
-
-**Install**
-
-GeoPandas depends on several low-level libraries for geospatial analysis. Depending on the system and package
-manager that you use, this may cause dependency conflicts if you are not careful.
-
-*Using `conda`*
-
-We suggest that you use the [anaconda distribution](https://conda.io/docs/user-guide/install/download.html)
-to install GeoPandas (``miniconda`` is fine as well).
-
-Use ``conda`` and the ``conda-forge`` channel to install GeoPandas on a clean environment:
-
-```bash
-conda create -n geopandas
-source activate geopandas  # 'activate geopandas' on Windows
-conda install -c conda-forge geopandas
-```
-
-**NOTE:** Creating a new environment is not strictly necessary, but installing other geospatial packages
-from a *different* channel than ``conda-forge`` may cause dependency conflicts, so we recommend starting
-fresh if possible. See the [conda-forge gotcha page](https://conda-forge.org/docs/conda-forge_gotchas.html)
-for more information.
-
-*Using `pip`*
+dependency, required for spatial joins. ``rtree`` requires the C library [``libspatialindex``](https://github.com/libspatialindex/libspatialindex).
 
-GeoPandas is also pip-installable. If you choose to use `pip`, make sure that you have the proper non-python
-libraries installed and linked properly.
+Those packages depend on several low-level libraries for geospatial analysis, which can be a challenge to install. Therefore, we recommend to install GeoPandas using the [conda package manager](https://conda.io/en/latest/). See the [installation docs](https://geopandas.readthedocs.io/en/latest/install.html) for more details.
 
-```bash
-pip install geopandas
-```
 
 Examples
 --------

appveyor.yml

@@ -12,8 +12,8 @@ environment:
     - PYTHON_VERSION: "2.7"
       MINICONDA: C:\Miniconda-x64
 
-    - PYTHON_VERSION: "3.5"
-      MINICONDA: C:\Miniconda35-x64
+    - PYTHON_VERSION: "3.7"
+      MINICONDA: C:\Miniconda37-x64
 
 # all our python builds have to happen in tests_script...
 build: false

ci/travis/27-dev.yaml

+name: test
+channels:
+  - defaults
+dependencies:
+  - python=2.7
+  - six
+  - cython
+  # required
+  - pandas
+  - shapely
+  - fiona
+  - pyproj
+  # testing
+  - pytest
+  - pytest-cov
+  #- codecov
+  - mock
+  # optional
+  - rtree
+  - matplotlib
+  - descartes
+  #- geopy
+  - SQLalchemy
+  - psycopg2
+  - pip:
+    - git+https://github.com/pydata/pandas.git
+    - codecov
+    - geopy
+    - mapclassify==1.0.1

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
+  - pip:
+    - codecov
+    - geopy

ci/travis/27-latest-defaults.yaml

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

ci/travis/27-pd020.yaml

+name: test
+channels:
+  - conda-forge
+dependencies:
+  - python=2.7
+  - six
+  - numpy # need to list to get this from conda-forge
+  - gdal
+  # required
+  - pandas==0.20.2
+  - shapely
+  - fiona
+  - pyproj
+  # testing
+  - pytest
+  - pytest-cov
+  - codecov
+  - mock
+  # optional
+  - rtree
+  - matplotlib==2.0.2
+  - descartes
+  - pysal=1
+  - geopy
+  - SQLalchemy
+  - psycopg2

ci/travis/35-minimal.yaml

+name: test
+channels:
+  - defaults
+  - conda-forge
+dependencies:
+  - python=3.5
+  - six
+  # required
+  - pandas==0.19.2
+  - shapely=1.5
+  - fiona
+  - pyproj
+  # testing
+  - pytest
+  - pytest-cov
+  - codecov
+  # optional
+  - rtree
+  - matplotlib==1.5.3
+  - descartes
+  - mapclassify
+  - geopy
+  - SQLalchemy
+  - psycopg2

ci/travis/36-pd020.yaml

+name: test
+channels:
+  - conda-forge
+dependencies:
+  - python=3.6
+  - six
+  # required
+  - pandas==0.20.2
+  - nomkl
+  - shapely
+  - gdal=2.3
+  - fiona
+  - pyproj
+  # testing
+  - pytest
+  - pytest-cov
+  - codecov
+  # optional
+  - rtree
+  - matplotlib=2
+  - descartes
+  - mapclassify
+  - geopy
+  - SQLalchemy
+  - psycopg2

ci/travis/36-pd022.yaml

+name: test
+channels:
+  - defaults
+dependencies:
+  - python=3.6
+  - six
+  # required
+  - pandas=0.22
+  - shapely
+  - fiona
+  - pyproj
+  # testing
+  - pytest
+  - pytest-cov
+  #- codecov
+  # optional
+  - rtree
+  - matplotlib==2.0.2
+  - descartes
+  #- geopy
+  - SQLalchemy
+  - psycopg2
+  - pip:
+    - codecov
+    - geopy
+    - mapclassify

ci/travis/37-dev.yaml

+name: test
+channels:
+  - defaults
+dependencies:
+  - python=3.7
+  - six
+  - cython
+  # required
+  - pandas
+  - shapely
+  - fiona
+  - pyproj
+  # testing
+  - pytest
+  - pytest-cov
+  #- codecov
+  # optional
+  - rtree
+  - matplotlib
+  - descartes
+  #- geopy
+  - SQLalchemy
+  - psycopg2
+  - pip:
+    - git+https://github.com/matplotlib/matplotlib.git
+    - git+https://github.com/pydata/pandas.git
+    - codecov
+    - geopy
+    - mapclassify

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

+name: test
+channels:
+  - conda-forge
+dependencies:
+  - python=3.7
+  - six
+  # required
+  - pandas
+  - shapely
+  - fiona
+  - pyproj
+  # testing
+  - pytest
+  - pytest-cov
+  - codecov
+  # optional
+  - rtree
+  - matplotlib
+  - descartes
+  - mapclassify
+  - geopy
+  - SQLalchemy
+  - psycopg2

ci/travis/37-latest-defaults.yaml

+name: test
+channels:
+  - defaults
+dependencies:
+  - python=3.7
+  - six
+  # required
+  - pandas
+  - shapely
+  - fiona
+  - pyproj
+  # testing
+  - pytest
+  - pytest-cov
+  #- codecov
+  # optional
+  - rtree
+  - matplotlib
+  - descartes
+  #- geopy
+  - SQLalchemy
+  - psycopg2
+  - pip:
+    - codecov
+    - geopy
+    - mapclassify

debian/changelog

-python-geopandas (0.4.0-4) UNRELEASED; urgency=medium
+python-geopandas (0.4.1-1~exp1) experimental; urgency=medium
 
+  * Team upload.
+  * New upstream release.
   * Bump Standards-Version to 4.3.0, no changes.
+  * Refresh patches.
+  * Copy test data in test target.
+  * Drop -doc packages, fails to build correctly.
+  * Ignore overlay test.
 
- -- Bas Couwenberg <sebastic@debian.org>  Tue, 28 Aug 2018 15:25:14 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 06 Mar 2019 17:20:05 +0100
 
 python-geopandas (0.4.0-3) unstable; urgency=medium
 

debian/control

@@ -51,13 +51,7 @@ Build-Depends: debhelper (>= 9),
                python-shapely,
                python3-shapely,
                python-sqlalchemy,
-               python3-sqlalchemy,
-               python-sphinx,
-               python3-sphinx,
-               python-sphinx-gallery,
-               python3-sphinx-gallery,
-               python-sphinx-rtd-theme,
-               python3-sphinx-rtd-theme
+               python3-sqlalchemy
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/python-geopandas/
 Vcs-Git: https://salsa.debian.org/debian-gis-team/python-geopandas.git
@@ -124,24 +118,3 @@ Description: Python3 tools for geographic data
  but that may change in the future.
  .
  This package contains the Python 3 version of the library.
-
-Package: python-geopandas-doc
-Architecture: all
-Depends: ${sphinxdoc:Depends},
-         ${misc:Depends}
-Section: doc
-Description: Documentation for the geopandas library
- GeoPandas is a project to add support for geographic data to
- pandas objects.  It currently implements
- `GeoSeries` and `GeoDataFrame` types which are subclasses of
- `pandas.Series` and `pandas.DataFrame` respectively.  GeoPandas
- objects can act on shapely  geometry objects and perform geometric operations.
- .
- GeoPandas geometry operations are cartesian.  The coordinate reference
- system (crs) can be stored as an attribute on an object, and is
- automatically set when loading from a file.  Objects may be
- transformed to new coordinate systems with the `to_crs()` method.
- There is currently no enforcement of like coordinates for operations,
- but that may change in the future.
- .
- This package contains the GeoPandas documentation.

debian/patches/no-gallery.patch

@@ -12,7 +12,7 @@ Forwarded: not-needed
                'sphinx.ext.autosummary',
                'sphinx.ext.intersphinx',
                'sphinx.ext.autodoc',
-@@ -46,19 +45,6 @@ templates_path = ['_templates']
+@@ -49,19 +48,6 @@ templates_path = ['_templates']
  
  autosummary_generate = True
  

debian/python-geopandas.lintian-overrides

-# Not a problem
-package-contains-documentation-outside-usr-share-doc usr/lib/python*/dist-packages/examples/README.txt
-

debian/rules

@@ -5,22 +5,18 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 export PYBUILD_NAME=geopandas
 
 %:
-	dh  $@ --with python2,python3,sphinxdoc --buildsystem pybuild --parallel
+	dh  $@ --with python2,python3 --buildsystem pybuild --parallel
 
 override_dh_clean:
 	dh_clean
 	rm -f geopandas/version.py
 
-override_dh_auto_build:
-	dh_auto_build
-	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml doc/source build/html # HTML generator
-
 override_dh_auto_test:
 	cp -v debian/nybb_*.zip examples/
 
-	PYBUILD_BEFORE_TEST="cp -rv examples/ {build_dir}" \
-	PYBUILD_AFTER_TEST="rm -rfv {build_dir}/examples/" \
-	PYBUILD_TEST_ARGS="-v --ignore=geopandas/tests/test_geocode.py --ignore=geopandas/tests/test_plotting.py" \
+	PYBUILD_BEFORE_TEST="cp -rv examples/ {build_dir} && mkdir -p {build_dir}/tests/ && cp -rv geopandas/tests/data/ {build_dir}/tests/" \
+	PYBUILD_AFTER_TEST="rm -rfv {build_dir}/examples/ {build_dir}/tests/data/" \
+	PYBUILD_TEST_ARGS="-v --ignore=geopandas/tests/test_geocode.py --ignore=geopandas/tests/test_plotting.py --ignore=geopandas/tests/test_overlay.py" \
 	dh_auto_test || echo "Ignoring test failures"
 
 	rm -f examples/nybb_*.zip