Skip to content

Fix Travis-CI #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2015
Merged

Fix Travis-CI #217

merged 1 commit into from
Oct 26, 2015

Conversation

ocefpaf
Copy link
Member

@ocefpaf ocefpaf commented Oct 25, 2015

This PR:

  1. fixes for Travis-CI (pytest was failing due to a change in how the latest setuptools passes arguments)
  2. Adds Python 3.5 to the test matrix
  3. Import workaround for mock on python 3.5
  4. PEP8 test_folium.py (Sorry for the noise the important change is in 3)
  5. Clean the change log up
  6. Bump master to 0.2.0.dev

@BibMartin or @andrewgiessel can you review and merge this please?

@BibMartin
Copy link
Contributor

It seems good to me (sorry I realise I'm not a good pep8er)
Merge in 2 days when I'm back home.

@ocefpaf
Copy link
Member Author

ocefpaf commented Oct 26, 2015

sorry I realise I'm not a good pep8er

Good! It means I still have a role here 😉

@themiurgo
Copy link
Contributor

Seems good to me as well! Merged! 👍

themiurgo added a commit that referenced this pull request Oct 26, 2015
@themiurgo themiurgo merged commit d351abd into python-visualization:master Oct 26, 2015
@ocefpaf ocefpaf deleted the fix_travis branch October 26, 2015 13:58
@ocefpaf
Copy link
Member Author

ocefpaf commented Oct 26, 2015

Thanks @themiurgo! Awesome to see you around here!! Is the day job giving you a break? 😉

@themiurgo
Copy link
Contributor

Kind of 😄

@ocefpaf ocefpaf added the bug An issue describing unexpected or malicious behaviour label Feb 12, 2016
@ocefpaf ocefpaf added this to the v0.2.0 milestone Feb 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug An issue describing unexpected or malicious behaviour
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants