Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Commit

Permalink
Update version and change log
Browse files Browse the repository at this point in the history
Also do not surface the base service mixin in `mapbox`.
  • Loading branch information
Sean Gillies committed Dec 8, 2015
1 parent 1fd5ac8 commit c45e856
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 12 deletions.
8 changes: 8 additions & 0 deletions CHANGES
@@ -1,3 +1,11 @@
0.5.0 (2015-12-08)
------------------
- We've vendorized the `polyline` module to work around its out of date `six`
dependency (#74, #77).
- No more need to pass username arguments to SDK class constructors or methods
as we now get the username from the provided access token (#81, #85).
- The python usage examples under `docs/` are now tested using doctest.

0.4.0 (2015-11-13)
------------------
- Send a unique User-Agent header with API requests (#66).
Expand Down
4 changes: 2 additions & 2 deletions mapbox/__init__.py
@@ -1,7 +1,7 @@
# mapbox
__version__ = "0.4.0"
__version__ = "0.5.0"

from .services.base import Service
#from .services.base import Service
from .services.directions import Directions
from .services.distance import Distance
from .services.geocoding import Geocoder, InvalidPlaceTypeError
Expand Down
4 changes: 3 additions & 1 deletion setup.py
@@ -1,4 +1,5 @@
from codecs import open as codecs_open

from setuptools import setup, find_packages


Expand Down Expand Up @@ -37,4 +38,5 @@
'boto3',
],
extras_require={
'test': ['coveralls', 'pytest>=2.8.3', 'pytest-cov', 'responses', 'tox']})
'test': [
'coveralls', 'pytest>=2.8.3', 'pytest-cov', 'responses', 'tox']})
19 changes: 10 additions & 9 deletions tests/test_base.py
Expand Up @@ -6,43 +6,44 @@
import responses

import mapbox
from mapbox.services import base


def test_service_session():
"""Get a session using a token"""
session = mapbox.Service().get_session('pk.test')
session = base.Service().get_session('pk.test')
assert session.params.get('access_token') == 'pk.test'


def test_service_session_env():
"""Get a session using the env's token"""
session = mapbox.Service().get_session(
session = base.Service().get_session(
env={'MapboxAccessToken': 'pk.test_env'})
assert session.params.get('access_token') == 'pk.test_env'


def test_service_session_os_environ(monkeypatch):
"""Get a session using os.environ's token"""
monkeypatch.setenv('MapboxAccessToken', 'pk.test_os_environ')
session = mapbox.Service().get_session()
session = base.Service().get_session()
assert session.params.get('access_token') == 'pk.test_os_environ'
monkeypatch.undo()


def test_service_session_os_environ_caps(monkeypatch):
"""Get a session using os.environ's token"""
monkeypatch.setenv('MAPBOX_ACCESS_TOKEN', 'pk.test_os_environ')
session = mapbox.Service().get_session()
session = base.Service().get_session()
assert session.params.get('access_token') == 'pk.test_os_environ'
monkeypatch.undo()


def test_product_token():
assert mapbox.Service().product_token == 'mapbox-sdk-py/{0}'.format(mapbox.__version__)
assert base.Service().product_token == 'mapbox-sdk-py/{0}'.format(mapbox.__version__)


def test_user_agent():
session = mapbox.Service().get_session()
session = base.Service().get_session()
assert session.headers['User-Agent'].startswith('mapbox-sdk-py')
assert 'python-requests' in session.headers['User-Agent']

Expand All @@ -51,7 +52,7 @@ def test_user_agent():
def test_custom_messages():
fakeurl = 'https://example.com'
responses.add(responses.GET, fakeurl, status=401)
service = mapbox.Service()
service = base.Service()
response = service.get_session().get(fakeurl)

assert service.handle_http_error(response) is None
Expand All @@ -65,7 +66,7 @@ def test_custom_messages():
assert "401" in exc.value.message


class MockService(mapbox.Service):
class MockService(base.Service):
def __init__(self, access_token=None):
# In order to get a username, a session must be created on init
self.session = self.get_session(access_token)
Expand All @@ -77,7 +78,7 @@ def test_username(monkeypatch):

def test_username_failures(monkeypatch):
# If your child class doesn't create a session
service = mapbox.Service()
service = base.Service()
with pytest.raises(AttributeError) as exc:
service.username
assert 'session' in exc.value.message
Expand Down

0 comments on commit c45e856

Please sign in to comment.