Merge pull request #55 from sjsrey/master

REL: update changelog for release.

CHANGELOG.md

@@ -1,3 +1,42 @@
+# Version 2.2.0 (2019-12-21)
+
+This releases brings new functionality for [formatting of legend classes](https://github.com/sjsrey/geopandas/blob/legendkwds/examples/choro_legends.ipynb).
+
+We closed a total of 21 issues (enhancements and bug fixes) through 9 pull requests, since our last release on 2019-06-28.
+
+## Issues Closed
+  - 2.2 (#54)
+  - 2.2 (#53)
+  - conda-forge UnsatisfiableError on windows and python 3.7 (#52)
+  - [MAINT] updating supported Python versions in setup.py (#49)
+  - BUG: RecursiveError in HeadTailBreaks (#46)
+  - BUG: HeadTailBreaks raise RecursionError (#45)
+  - BUG: UserDefined accepts only list if max not in bins (#47)
+  - BUG: avoid deprecation warning in HeadTailBreaks (#44)
+  - remove docs badge (#42)
+  - Remove doc badge (#43)
+  - Docs: moving to project pages on github and off rtd (#41)
+  - BUG: Fix for downstream breakage in geopandas (#40)
+
+## Pull Requests
+  - 2.2 (#54)
+  - 2.2 (#53)
+  - [MAINT] updating supported Python versions in setup.py (#49)
+  - BUG: RecursiveError in HeadTailBreaks (#46)
+  - BUG: UserDefined accepts only list if max not in bins (#47)
+  - BUG: avoid deprecation warning in HeadTailBreaks (#44)
+  - Remove doc badge (#43)
+  - Docs: moving to project pages on github and off rtd (#41)
+  - BUG: Fix for downstream breakage in geopandas (#40)
+
+The following individuals contributed to this release:
+
+  - Serge Rey
+  - James Gaboardi
+  - Wei Kang
+  - Martin Fleischmann
+
+
 # Version 2.1.0 (2019-06-26)
 
 We closed a total of 36 issues (enhancements and bug fixes) through 16 pull requests, since our last release on 2018-10-28.

Dockerfile

@@ -0,0 +1,26 @@
+# Ubuntu Bionic 18.04 at Jan 26'19
+FROM jupyter/minimal-notebook:87210526f381
+
+MAINTAINER Serge Rey <[email protected]>
+
+# https://github.com/ContinuumIO/docker-images/blob/master/miniconda3/Dockerfile
+ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
+
+USER root
+
+#--- Utilities ---#
+
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends software-properties-common
+RUN apt-get install -y libgeos-dev
+
+ADD install_deps_py.sh $HOME/install_deps_py.sh
+
+USER root
+RUN chmod +x $HOME/install_deps_py.sh
+RUN sed -i -e 's/\r$//' $HOME/install_deps_py.sh
+RUN ["/bin/bash", "-c", "$HOME/install_deps_py.sh"]
+RUN rm /home/jovyan/install_deps_py.sh 
+
+# Switch back to user to avoid accidental container runs as root
+USER $NB_UID

Makefile

@@ -0,0 +1,18 @@
+GEOPANDAS = /home/serge/Dropbox/g/geopandas
+# Linux specific Docker file for mapclassify
+IMAGE='sjsrey/mapclassify:2.2'
+
+container:
+	docker build -t $(IMAGE) .
+
+# run a shell for our env
+cli:
+	docker run -it -p 8888:8888 -v ${PWD}:/home/jovyan $(IMAGE) /bin/bash
+
+dev:
+	echo ${GEOPANDAS}
+	docker run -it -p 8888:8888 -e "PYSALDATA=/home/jovyan/.local/pysal_data" -v ${PWD}:/home/jovyan -v ${GEOPANDAS}:/home/jovyan/geopandas $(IMAGE) sh -c "/home/jovyan/develop.sh && /bin/bash"
+
+term:
+	echo ${GEOPANDAS}
+	docker run -it -e "PYSALDATA=/home/jovyan/.local/pysal_data" -v ${PWD}:/home/jovyan -v ${GEOPANDAS}:/home/jovyan/geopandas $(IMAGE) sh -c "/home/jovyan/develop.sh && /bin/bash"

docsrc/conf.py

@@ -246,14 +246,17 @@
 
 # Generate the API documentation when building
 autosummary_generate = True
-numpydoc_show_class_members = True
-class_members_toctree = True
-numpydoc_show_inherited_class_members = True
+numpydoc_show_class_members = False
 numpydoc_use_plots = True
 
 # display the source code for Plot directive
 plot_include_source = True
 
+# automatically document class members
+autodoc_default_options = {
+    'members': True
+}
+
 def setup(app):
     app.add_stylesheet("pysal-styles.css")
 

install_deps_py.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+echo "Updating conda....."
+/opt/conda/bin/conda update --yes 
+
+echo "Installing conda mapclassify stack....."
+
+conda config --set always_yes yes --set changeps1 no --set show_channel_urls true
+conda config --add channels conda-forge --force
+conda config --set channel_priority strict
+conda install --quiet --yes \
+  'scikit-learn' \
+  'seaborn' \
+  'libpysal=4.2.0' \
+  'rtree'
+
+#conda install --channel conda-forge geopandas
+
+echo "Installing doc dependencies...."
+pip install -U  sphinx sphinx_gallery sphinxcontrib-bibtex sphinx_bootstrap_theme sphinxcontrib-napoleon
+
+echo "Installing testing dependencies...."
+
+conda install -c conda-forge -c defaults --quiet --yes \
+      'nose' \
+      'nose-progressive' \
+      'nose-exclude' \
+      'coverage' \
+      'coveralls' \
+      'pytest' \
+      'pytest-cov' \
+      'pytest-mpl'
+
+conda install -c conda-forge  --quiet --yes descartes