Merge pull request #217 from ocefpaf/fix_travis

Fix Travis-CI

Author: themiurgo

.travis.yml

@@ -3,20 +3,24 @@ language: python
 sudo: false
 
 env:
-    - CONDA="python=2.7"
-    - CONDA="python=3.3"
-    - CONDA="python=3.4"
+    - PYTHON="2.7"
+    - PYTHON="3.3"
+    - PYTHON="3.4"
+    - PYTHON="3.5"
 
 before_install:
     - wget http://bit.ly/miniconda -O miniconda.sh
     - bash miniconda.sh -b -p $HOME/miniconda
     - export PATH="$HOME/miniconda/bin:$PATH"
+    - conda config --add channels ioos -f
     - conda update --yes --all
-    - travis_retry conda create --yes -n test $CONDA --file requirements.txt
+    - travis_retry conda create --yes -n test python=$PYTHON --file requirements.txt
     - source activate test
-    - travis_retry conda install --yes pip mock pytest pandas
-    - travis_retry pip install vincent
+    - travis_retry conda install --yes pytest pandas vincent
+    - if [[ "$PYTHON" != "3.5" ]]; then
+        travis_retry conda install --yes mock ;
+      fi
+    - travis_retry pip install
 
 script:
     - python setup.py test
-

CHANGES.txt

@@ -1,19 +1,35 @@
-0.2.0
+0.2.0.dev
+~~~~~~~~~
+TODO
+
+
+0.1.6
+~~~~~
+- Added Image Overlay. (andrewgiessel b625613)
+- All popups can take a `popup_width` keyword to adjust the width in
+  text/HTML (ocefpaf #157).
+- CAVEAT! Backwards incompatibly change: the keyword `width` in popups is now
+  `popup_width` to avoid confusion with map `width`.
+
+
+0.1.5
 ~~~~~
-- Popups on lines. (themiurgo 97c0a02)
-- `fit_bounds` method. (themiurgo 713c292)
+- Popups on lines. (themiurgo #122)
+- Map auto bounds. (themiurgo #134)
 - GeoJSON popup. (ocefpaf 7aad5e0)
 - Added cartodb positron and dark_matter tiles (ocefpaf d4daee7)
 - Forcing HTTPS when available. (ocefpaf c69ac89)
 - Added Stamen Watercolor tiles. (ocefpaf 8c1f837)
-- Added Image Overlay. (andrewgiessel b625613)
-
-Bug Fixes
-- popup width keyword is now consistent in all pop objects (ocefpaf e2c0310)
+- Added non-pixel width and height. (ocefpaf a87a449)
+- Default map size is defined as non-pixel and equal to 100% of the window.
+  (ocefpaf dcaf575)
 
 Bug Fixes
 
 - Draw GeoJSON first. (ocefpaf d92bdbe)
+- Removed keyword unnecessary `popup_on`. (themiurgo 204d722)
+- Fixed MapQuest Open Aerial URL. (ocefpaf 5e787fa)
+
 
 0.1.4
 ~~~~~
@@ -29,6 +45,7 @@ Bug Fixes
 - Fix #50 template not found on Windows OSes. (ocefpaf 101daee)
 - Fixed `add_wms_layer` py3k bug. (ocefpaf 154f0a5)
 
+
 0.1.3
 ~~~~~
 - Bootstrap glyphicon marker icons.  @birdage
@@ -51,6 +68,7 @@ Bug Fixes
 - Changed no-data fill to null/no-fill, rather than #fff. (Rob Story 6ff80a6)
 - Fixed issue with counties TopoJSON. (Rob Story cddaab3)
 
+
 0.1.2
 ~~~~~
 - TopoJSON functionality. (Rob Story 5566b71)

MANIFEST.in

@@ -1,4 +1,3 @@
-include *.md
 include *.txt
 
 recursive-include folium *.py

folium/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
-__version__ = '0.1.5'
+__version__ = '0.2.0.dev'
 
 from folium.folium import Map, initialize_notebook

setup.py

@@ -11,9 +11,7 @@
 class PyTest(TestCommand):
     def finalize_options(self):
         TestCommand.finalize_options(self)
-        # FIXME: '--doctest-modules'
-        self.test_args = ['--verbose']
-        self.test_suite = True
+        self.verbose = True
 
     def run_tests(self):
         import pytest
@@ -76,11 +74,12 @@ def walk_subpkg(name):
               author_email='[email protected]',
               url='https://github.com/python-visualization/folium',
               keywords='data visualization',
-              classifiers=['Development Status :: 4 - Beta',
-                           'Programming Language :: Python :: 2.7',
+              classifiers=['Programming Language :: Python :: 2.7',
                            'Programming Language :: Python :: 3.3',
                            'Programming Language :: Python :: 3.4',
-                           'License :: OSI Approved :: MIT License'],
+                           'Programming Language :: Python :: 3.5',
+                           'License :: OSI Approved :: MIT License',
+                           'Development Status :: 5 - Production/Stable'],
               packages=pkgs,
               package_data=pkg_data,
               cmdclass=dict(test=PyTest),