Skip to content
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

Add Python 3 support and fix failing test for Google country filter #47

Merged
merged 4 commits into from
Mar 19, 2018

Conversation

flibbertigibbet
Copy link
Contributor

@flibbertigibbet flibbertigibbet commented Mar 19, 2018

Test disambiguation of a place name with country name; do not assume default country selection.
Fixes a test that fails when the Google geocoder key is set.
Fixes #45.

Add Python 3 support by running 2to3 and adding backwards support for Python 2 in imports. Adds python 3 to test matrix run on Travis.

Closes #16
Connects #43

Test disambiguation of a place name with country name; do not assume default country selection.
@flibbertigibbet
Copy link
Contributor Author

Ran 2to3 and included the import fix-ups from #43 to run the full test suite on this branch with both python 2 and 3.

@flibbertigibbet flibbertigibbet changed the title Fix failing test for Google country filter Add Python 3 support and fix failing test for Google country filter Mar 19, 2018
Copy link
Contributor

@hectcastro hectcastro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@@ -4,6 +4,7 @@ sudo: false

python:
- '2.7'
- '3.6'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because this creates a matrix build, we need to add an additional condition to the on: configuration under deploy: for Python 3.6 so that only that build publishes to PyPi:

  on:
    tags: true
    python: "3.6"
    distributions: sdist bdist_wheel
    repo: azavea/python-omgeo

Ran 2to3 conversion tool.
Update Travis configuration to test on both python 2 and 3.
Use conditional imports to support both python 2 and 3.
Empty requirements to fix broken Read the Docks build.
@flibbertigibbet
Copy link
Contributor Author

Added python version to deploy build, and also added empty requirements.txt to hopefully fix the broken Read the Docs builds from #39.

@flibbertigibbet flibbertigibbet merged commit 4d6756d into develop Mar 19, 2018
@flibbertigibbet flibbertigibbet deleted the feature/kak/fix-tests#45 branch March 19, 2018 19:52
KlaasH added a commit that referenced this pull request Jul 12, 2019
Per #47, this supports Python 3.  Adding a classifier to `setup.py` lets
people (and scripts like `caniusepython3`) know that.
KlaasH added a commit that referenced this pull request Jul 12, 2019
Per #47, this supports Python 3.  Adding a classifier to `setup.py` lets
people (and scripts like `caniusepython3`) know that.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants