Merge pull request #57 from goshippo/v2.0.0

v2.0.0

.travis.yml

@@ -1,11 +1,8 @@
 language: python
 python:
-  - "2.6"
-  - "2.7"
-  - "pypy"
-  - "3.3"
-  - "3.4"
   - "3.5"
+  - "3.6"
+  - "3.7"
 install:
   - python setup.py install
 script:

HISTORY.rst

@@ -1,6 +1,13 @@
 Release History
 ---------------
-2.0.0rc1 (2017-03-29)
+
+2.0.0 (2020-01-10)
+
+**Behavioural Changes**
+
+- Update default API version to 2018-02-08. For more information on versioning and upgrading your version, please refer to https://goshippo.com/docs/versioning
+
+2.0.0rc1 (2019-05-06)
 +++++++++++++++++++
 
 **Behavioural Changes**

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2014 Shippo (http://goshippo.com)
+Copyright (c) 2020 Shippo (http://goshippo.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -20,7 +20,7 @@ Configurable variables previously available in the main module (ex: `shippo.api_
 import shippo
 
 shippo.config.api_key = "<API-KEY>"
-shippo.config.api_version = "2017-03-29"
+shippo.config.api_version = "2018-02-08"
 shippo.config.verify_ssl_certs = True
 shippo.config.rates_req_timeout = 30.0
 ```

contributors.txt

@@ -2,3 +2,5 @@ Eyoel Asfaw <[email protected]>
 Subhi Beidas <[email protected]>
 Matthieu Nowicki <[email protected]>
 Steve Byerly <[email protected]>
+Malcolm Rebughini <[email protected]>
+Matthew Hwang <[email protected]>

examples/filter-by-delivery-time.py

@@ -68,10 +68,10 @@
 
 # filter rates by max. transit time, then select cheapest
 eligible_rate = (
-    rate for rate in rates if rate['days'] <= MAX_TRANSIT_TIME_DAYS)
+    rate for rate in rates if rate['estimated_days'] <= MAX_TRANSIT_TIME_DAYS)
 rate = min(eligible_rate, key=lambda x: float(x['amount']))
 print("Picked service %s %s for %s %s with est. transit time of %s days" %
-      (rate['provider'], rate['servicelevel']['name'], rate['currency'], rate['amount'], rate['days']))
+      (rate['provider'], rate['servicelevel']['name'], rate['currency'], rate['amount'], rate['estimated_days']))
 
 # Purchase the desired rate. asynchronous=False indicates that the function will wait until the
 # carrier returns a shipping label before it returns

examples/purchase-fastest-service.py

@@ -69,10 +69,10 @@
 
 # Find the fastest possible transite time
 eligible_rates = (
-    rate for rate in rates if rate['days'] <= MAX_TRANSIT_TIME_DAYS)
+    rate for rate in rates if rate['estimated_days'] <= MAX_TRANSIT_TIME_DAYS)
 rate = min(eligible_rates, key=lambda x: float(x['amount']))
 print("Picked service %s %s for %s %s with est. transit time of %s days" %
-      (rate['provider'], rate['servicelevel']['name'], rate['currency'], rate['amount'], rate['days']))
+      (rate['provider'], rate['servicelevel']['name'], rate['currency'], rate['amount'], rate['estimated_days']))
 
 # Purchase the desired rate. asynchronous=False indicates that the function will wait until the
 # carrier returns a shipping label before it returns

shippo/api_requestor.py

@@ -100,9 +100,9 @@ def request_raw(self, method, url, params=None):
         if my_api_key is None:
             raise error.AuthenticationError(
                 'No API key provided. (HINT: set your API key using '
-                '"shippo.api_key = shippo_test_d90f00698a0a8def0495fddb4212bb08051469d3"). You can generate API keys '
+                '"shippo.config.api_key = shippo_test_d90f00698a0a8def0495fddb4212bb08051469d3"). You can generate API keys '
                 'from the Shippo web interface.  See https://goshippo.com/api '
-                'for details, or email support@goshippo.comom if you have any '
+                'for details, or email support@goshippo.com if you have any '
                 'questions.')
 
         token_type = 'ShippoToken'
@@ -122,7 +122,7 @@ def request_raw(self, method, url, params=None):
         else:
             raise error.APIConnectionError(
                 'Unrecognized HTTP method %r.  This may indicate a bug in the '
-                'Shippo bindings.  Please contact [email protected].com for '
+                'Shippo bindings.  Please contact [email protected] for '
                 'assistance.' % (method,))
 
         ua = {

shippo/certificate_blacklist.py

@@ -25,7 +25,7 @@ def verify(hostname, certificate):
                        "connect to a server that has a revoked "
                        "SSL certificate, which means we cannot "
                        "securely send data to that server. "
-                       "Please email support@goshippo.comom if you "
+                       "Please email support@goshippo.com if you "
                        "need help connecting to the correct API "
                        "server.")
     return True

shippo/config.py

@@ -1,6 +1,6 @@
 # Configurable variables
 api_key = None
 api_base = 'https://api.goshippo.com/'
-api_version = None
+api_version = '2018-02-08'
 verify_ssl_certs = True
 rates_req_timeout = 20.0

shippo/error.py

@@ -10,7 +10,7 @@ def __init__(self, message=None, http_body=None, http_status=None,
                 http_body = http_body.decode('utf-8')
             except:
                 http_body = ('<Could not decode body as utf-8. '
-                             'Please report to support@goshippo.comom>')
+                             'Please report to support@goshippo.com>')
 
         self.http_body = http_body
 

shippo/test/helper.py

@@ -346,7 +346,7 @@ def setUp(self):
         shippo.config.api_key = os.environ.get(
             'SHIPPO_API_KEY', '51895b669caa45038110fd4074e61e0d')
         shippo.config.api_version = os.environ.get(
-            'SHIPPO_API_VERSION', '2017-03-29')
+            'SHIPPO_API_VERSION', '2018-02-08')
 
     def tearDown(self):
         super(ShippoTestCase, self).tearDown()

shippo/version.py

@@ -1 +1 @@
-VERSION = '2.0.0rc1'
+VERSION = '2.0.0'