wrap up release 2021.6

danh91 · danh91 · commit 91c6fd41978c · 2021-07-02T17:48:28.000-04:00
diff --git a/extensions/aramex/purplship/mappers/aramex/mapper.py b/extensions/aramex/purplship/mappers/aramex/mapper.py
@@ -44,9 +44,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     # def create_address_validation_request(self, payload: AddressValidationRequest) -> Serializable:
     #     return address_validation_request(payload, self.settings)
     #
@@ -83,9 +80,6 @@ def create_tracking_request(
     ) -> Serializable:
         return tracking_request(payload, self.settings)
 
-
-
-
     # def parse_address_validation_response(
     #     self, response: Deserializable
     # ) -> Tuple[AddressValidationDetails, List[Message]]:
diff --git a/extensions/australiapost/purplship/mappers/australiapost/mapper.py b/extensions/australiapost/purplship/mappers/australiapost/mapper.py
@@ -44,9 +44,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     # def create_address_validation_request(self, payload: AddressValidationRequest) -> Serializable:
     #     return address_validation_request(payload, self.settings)
     #
@@ -83,9 +80,6 @@ def create_tracking_request(
     ) -> Serializable:
         return tracking_request(payload, self.settings)
 
-
-
-
     # def parse_address_validation_response(
     #     self, response: Deserializable
     # ) -> Tuple[AddressValidationDetails, List[Message]]:
diff --git a/extensions/boxknight/purplship/mappers/boxknight/mapper.py b/extensions/boxknight/purplship/mappers/boxknight/mapper.py
@@ -36,9 +36,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     def create_rate_request(
         self, payload: RateRequest
     ) -> Serializable:
@@ -67,9 +64,6 @@ def create_cancel_pickup_request(
     def create_cancel_shipment_request(self, payload: ShipmentCancelRequest) -> Serializable[str]:
         return shipment_cancel_request(payload, self.settings)
 
-    
-
-
     def parse_cancel_pickup_response(
         self, response: Deserializable[str]
     ) -> Tuple[ConfirmationDetails, List[Message]]:
diff --git a/extensions/canadapost/purplship/mappers/canadapost/mapper.py b/extensions/canadapost/purplship/mappers/canadapost/mapper.py
@@ -40,9 +40,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     def create_rate_request(
         self, payload: RateRequest
     ) -> Serializable:
@@ -76,9 +73,6 @@ def create_cancel_pickup_request(
     def create_cancel_shipment_request(self, payload: ShipmentCancelRequest) -> Serializable[str]:
         return shipment_cancel_request(payload, self.settings)
 
-    
-
-
     def parse_cancel_pickup_response(
         self, response: Deserializable[str]
     ) -> Tuple[ConfirmationDetails, List[Message]]:
diff --git a/extensions/canadapost/purplship/providers/canadapost/rate.py b/extensions/canadapost/purplship/providers/canadapost/rate.py
@@ -51,11 +51,7 @@ def _extract_quote(price_quote_node: Element, settings: Settings) -> RateDetails
         service=ServiceType(price_quote.service_code).name,
         base_charge=NF.decimal(price_quote.price_details.base or 0),
         total_charge=NF.decimal(price_quote.price_details.due or 0),
-<<<<<<< HEAD
-        discount=NF.decimal(sum([d.amount for d in discounts], 0.0)),
-=======
         discount=NF.decimal(discount),
->>>>>>> 177aeb9 (handle potential none rate adjustments)
         duties_and_taxes=NF.decimal(
             float(price_quote.price_details.taxes.gst.valueOf_ or 0)
             + float(price_quote.price_details.taxes.pst.valueOf_ or 0)
diff --git a/extensions/canadapost/pyproject.toml b/extensions/canadapost/pyproject.toml
@@ -1,10 +1,6 @@
 [tool.poetry]
 name = "purplship.canadapost"
-<<<<<<< HEAD
 version = "2021.6"
-=======
-version = "2021.6rc1"
->>>>>>> 177aeb9 (handle potential none rate adjustments)
 homepage="https://sdk.purplship.com"
 repository="https://github.com/Purplship/purplship"
 description = "Purplship - Canada Post Shipping Extension"
diff --git a/extensions/canpar/purplship/mappers/canpar/mapper.py b/extensions/canpar/purplship/mappers/canpar/mapper.py
@@ -44,9 +44,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     def create_address_validation_request(self, payload: AddressValidationRequest) -> Serializable:
         return address_validation_request(payload, self.settings)
 
@@ -83,9 +80,6 @@ def create_cancel_pickup_request(
     def create_cancel_shipment_request(self, payload: ShipmentCancelRequest) -> Serializable[str]:
         return shipment_cancel_request(payload, self.settings)
 
-    
-
-
     def parse_address_validation_response(
         self, response: Deserializable
     ) -> Tuple[AddressValidationDetails, List[Message]]:
diff --git a/extensions/dhl_express/purplship/mappers/dhl_express/mapper.py b/extensions/dhl_express/purplship/mappers/dhl_express/mapper.py
@@ -41,9 +41,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     def create_address_validation_request(self, payload: AddressValidationRequest) -> Serializable:
         return address_validation_request(payload, self.settings)
 
@@ -77,9 +74,6 @@ def create_cancel_pickup_request(
     ) -> Serializable:
         return pickup_cancel_request(payload, self.settings)
 
-    
-
-
     def parse_address_validation_response(
         self, response: Deserializable
     ) -> Tuple[AddressValidationDetails, List[Message]]:
diff --git a/extensions/dhl_universal/purplship/mappers/dhl_universal/mapper.py b/extensions/dhl_universal/purplship/mappers/dhl_universal/mapper.py
@@ -44,9 +44,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     # def create_address_validation_request(self, payload: AddressValidationRequest) -> Serializable:
     #     return address_validation_request(payload, self.settings)
     #
@@ -83,9 +80,6 @@ def create_tracking_request(
     ) -> Serializable:
         return tracking_request(payload, self.settings)
 
-    
-
-
     # def parse_address_validation_response(
     #     self, response: Deserializable
     # ) -> Tuple[AddressValidationDetails, List[Message]]:
diff --git a/extensions/dicom/purplship/mappers/dicom/mapper.py b/extensions/dicom/purplship/mappers/dicom/mapper.py
@@ -40,9 +40,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     # def create_rate_request(
     #     self, payload: RateRequest
     # ) -> Serializable:
diff --git a/extensions/fedex/purplship/mappers/fedex/mapper.py b/extensions/fedex/purplship/mappers/fedex/mapper.py
@@ -47,9 +47,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     def create_address_validation_request(self, payload: AddressValidationRequest) -> Serializable:
         return address_validation_request(payload, self.settings)
 
diff --git a/extensions/purolator/purplship/mappers/purolator/mapper.py b/extensions/purolator/purplship/mappers/purolator/mapper.py
@@ -44,9 +44,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     def create_address_validation_request(self, payload: AddressValidationRequest) -> Serializable:
         return address_validation_request(payload, self.settings)
 
diff --git a/extensions/purolator/purplship/providers/purolator/pickup/create.py b/extensions/purolator/purplship/providers/purolator/pickup/create.py
@@ -56,7 +56,8 @@ def _extract_pickup_details(
 def pickup_request(
     payload: PickupRequest, settings: Settings
 ) -> Serializable[Pipeline]:
-    """Create a pickup request
+    """
+    Create a pickup request
     Steps
         1 - validate
         2 - create pickup
@@ -75,7 +76,8 @@ def pickup_request(
 def _schedule_pickup_request(
     payload: Union[PickupRequest, PickupUpdateRequest], settings: Settings
 ) -> Serializable[Envelope]:
-    """schedule_pickup_request create a serializable typed Envelope containing a SchedulePickUpRequest
+    """
+    Create a serializable typed Envelope containing a SchedulePickUpRequest
 
     Options:
         - LoadingDockAvailable
diff --git a/extensions/purolator/purplship/providers/purolator/pickup/update.py b/extensions/purolator/purplship/providers/purolator/pickup/update.py
@@ -42,7 +42,8 @@ def _extract_pickup_details(
 def pickup_update_request(
     payload: PickupUpdateRequest, settings: Settings
 ) -> Serializable[Pipeline]:
-    """Modify a pickup request
+    """
+    Modify a pickup request
     Steps
         1 - validate
         2 - modify pickup
diff --git a/extensions/purolator/purplship/providers/purolator/pickup/validate.py b/extensions/purolator/purplship/providers/purolator/pickup/validate.py
@@ -20,7 +20,8 @@
 def validate_pickup_request(
     payload: Union[PickupRequest, PickupUpdateRequest], settings: Settings
 ) -> Serializable[Envelope]:
-    """validate_pickup_request create a serializable typed Envelope containing a ValidatePickUpRequest
+    """
+    Create a serializable typed Envelope containing a ValidatePickUpRequest
 
     Options:
         - LoadingDockAvailable
diff --git a/extensions/royalmail/purplship/mappers/royalmail/mapper.py b/extensions/royalmail/purplship/mappers/royalmail/mapper.py
@@ -44,9 +44,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     # def create_address_validation_request(self, payload: AddressValidationRequest) -> Serializable:
     #     return address_validation_request(payload, self.settings)
     #
diff --git a/extensions/sendle/purplship/mappers/sendle/mapper.py b/extensions/sendle/purplship/mappers/sendle/mapper.py
@@ -44,9 +44,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     # def create_address_validation_request(self, payload: AddressValidationRequest) -> Serializable:
     #     return address_validation_request(payload, self.settings)
     #
diff --git a/extensions/sf_express/purplship/mappers/sf_express/mapper.py b/extensions/sf_express/purplship/mappers/sf_express/mapper.py
@@ -44,9 +44,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     # def create_address_validation_request(self, payload: AddressValidationRequest) -> Serializable:
     #     return address_validation_request(payload, self.settings)
     #
diff --git a/extensions/tnt/purplship/mappers/tnt/mapper.py b/extensions/tnt/purplship/mappers/tnt/mapper.py
@@ -26,9 +26,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     # def create_rate_request(
     #     self, payload: RateRequest
     # ) -> Serializable:
diff --git a/extensions/ups/purplship/mappers/ups/mapper.py b/extensions/ups/purplship/mappers/ups/mapper.py
@@ -47,9 +47,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     def create_address_validation_request(self, payload: AddressValidationRequest) -> Serializable:
         return address_validation_request(payload, self.settings)
 
diff --git a/extensions/usps/purplship/mappers/usps/mapper.py b/extensions/usps/purplship/mappers/usps/mapper.py
@@ -40,9 +40,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     def create_rate_request(
         self, payload: RateRequest
     ) -> Serializable:
diff --git a/extensions/usps_international/purplship/mappers/usps_international/mapper.py b/extensions/usps_international/purplship/mappers/usps_international/mapper.py
@@ -40,9 +40,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     def create_rate_request(
         self, payload: RateRequest
     ) -> Serializable:
diff --git a/extensions/usps_international/purplship/providers/usps_international/shipment/priority_mail.py b/extensions/usps_international/purplship/providers/usps_international/shipment/priority_mail.py
@@ -8,7 +8,7 @@
     ItemDetailType,
     ExtraServicesType,
 )
-from purplship.core.utils import Serializable, Element, XP, DF, NF, Location
+from purplship.core.utils import Serializable, Element, XP, DF, Location
 from purplship.core.units import Packages, Options, Weight, WeightUnit, CompleteAddress
 from purplship.core.models import (
     ShipmentRequest,
diff --git a/extensions/yanwen/purplship/mappers/yanwen/mapper.py b/extensions/yanwen/purplship/mappers/yanwen/mapper.py
@@ -44,9 +44,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     # def create_address_validation_request(self, payload: AddressValidationRequest) -> Serializable:
     #     return address_validation_request(payload, self.settings)
     #
diff --git a/extensions/yunexpress/purplship/mappers/yunexpress/mapper.py b/extensions/yunexpress/purplship/mappers/yunexpress/mapper.py
@@ -44,9 +44,6 @@
 class Mapper(BaseMapper):
     settings: Settings
 
-    
-
-
     # def create_address_validation_request(self, payload: AddressValidationRequest) -> Serializable:
     #     return address_validation_request(payload, self.settings)
     #
diff --git a/purplship/README.md b/purplship/README.md
@@ -21,12 +21,14 @@ puprlship is a modern development kit that simplifies the integration of shippin
 The key features are:
 
 - **Unified API**: A standardized set of models representing the common shipping data (`Address`, `Parcel`, `Shipment`...)
-- **Intuitive API**: A library that abstracts and unifies the typical shipping API services (`Rating`, `Pickup`, `Tracking`...) 
-- **Multi-carrier**: Integrate Purplship once and connect to multiple shipping carrier APIs
+- **Intuitive API**: A library that abstracts and unifies the typical shipping API services (`Rating`, `Shipping`, `Tracking`...) 
+- **Multi-carrier**: Integrate purplship once and connect to multiple shipping carrier APIs
 - **Custom carrier**: A framework to integrate a shipping carrier services within hours instead of months
 
+
 *For a complete shipping management REST API with a dashboard checkout [purplship-server](https://github.com/puprlship/purplship-server).*
 
+
 ## Requirements
 
 Python 3.7+
@@ -176,4 +178,4 @@ Please see [LICENSE.md](/LICENSE) for licensing details.
 ## Authors
 
 - **Daniel K.** | [@DanHK91](https://twitter.com/DanHK91) | [danielk.xyz](https://danielk.xyz/)
-- **Purplship Team** | hello@purplship.com | [purplship.com](https://purplship.com)
+- **purplship** | hello@purplship.com | [purplship.com](https://purplship.com)
