Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Bobspadger committed Apr 6, 2018
2 parents 041c549 + f70e7ec commit babcf79
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions royal_mail_rest_api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
__version__ = '0.0.6'



# from .api import RoyalMailBaseClass
# from .tracking import TrackingApi
# from .cli import cli
3 changes: 3 additions & 0 deletions royal_mail_rest_api/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,13 @@ def add_service_format(self, format=None):


def add_service_type(self, service_type=None):

"""
add a valid service type using our friendly names
:param service_type:
:return:
"""

if service_type is None:
raise(ValueError('no service type selected'))

Expand All @@ -294,6 +296,7 @@ def add_service_offering(self, service_offering=None):
:param service_offering:
:return:
"""

if service_offering is None:
raise(ValueError('No service type selected'))
if service_offering not in self.service_offerings:
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[bumpversion]

current_version = 0.0.6

commit = True
tag = True

Expand Down

0 comments on commit babcf79

Please sign in to comment.