Merge branch 'master' into develop

Bobspadger · Apr 6, 2018 · d924661 · d924661
2 parents ea3325b + 32dad4a
commit d924661
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/royal_mail_rest_api/tools.py b/royal_mail_rest_api/tools.py
@@ -262,11 +262,13 @@ def add_service_format(self, format=None):
     def add_service_type(self, service_type=None):
         if service_type is None:
             raise(ValueError('no service type selected'))
+
         if service_type not in self.service_types:
             raise(KeyError('Invalid service type'))
         self.service_type = self.service_types[service_type]
 
 
+
     def add_service_offering(self, service_offering=None):
         if service_offering is None:
             raise(ValueError('No service type selected'))

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,7 @@
 [bumpversion]
+
 current_version = 0.0.5
+
 commit = True
 tag = True
 

diff --git a/tests/test_royal_mail_rest_api.py b/tests/test_royal_mail_rest_api.py
@@ -6,6 +6,7 @@
 import datetime
 from royal_mail_rest_api.tools import RoyalMailBody
 
+
 def test_add_services():
     body = RoyalMailBody('delivery')
     with pytest.raises(ValueError):
@@ -42,3 +43,4 @@ def test_add_ship_date():
     # Test we get date out in format YYYY-mm-dd
     body.add_ship_date(datetime.datetime.today())
     assert body.shipping_date == datetime.datetime.strftime(datetime.datetime.today(), '%Y-%m-%d')
+