4.41.0

Co-authored-by: David Johnson <djohnson14@paypal.com>

Author: braintreeps

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.41.0
+* Add extra fields in `sender` and `receiver` details in `transfer` to `Transaction`
+* Remove unused error code `AdjustmentAmountMustBeGreaterThanZero`
+* Removed `venmo_merchant_data` from `Transaction`
+* Filter CreditCardVerification.search() to only return credit card verifications
+
 ## 4.40.0
 * Add `payment_account_reference` to `Transaction::ApplePayCard`, `Transaction::AndroidPayCard`, `Transaction::CreditCard`, and `CreditCardVerification`
 * Add `processing_merchant_category_code` field in `Transaction`

Jenkinsfile

@@ -10,10 +10,15 @@ pipeline {
     SLACK_CHANNEL = "#auto-team-sdk-builds"
   }
 
+  options {
+    buildDiscarder(logRotator(numToKeepStr: '50'))
+    timestamps()
+    timeout(time: 120, unit: 'MINUTES')
+  }
+
   stages {
     stage("Audit") {
       parallel {
-        // Runs a static code analysis scan and posts results to the PayPal Polaris server
         stage("CodeQL") {
           agent {
             node {
@@ -36,5 +41,63 @@ pipeline {
         }
       }
     }
+
+    stage("SDK Tests") {
+      when {
+        branch 'master'
+      }
+
+      parallel {
+        stage("Python 3.5 Stretch") {
+          agent {
+            node {
+              label ""
+              customWorkspace "workspace/${REPO_NAME}"
+            }
+          }
+
+          steps {
+            build job: 'python_3.5-stretch_server_sdk_master', wait: true
+          }
+
+          post {
+            failure {
+              script {
+                FAILED_STAGE = env.STAGE_NAME
+              }
+            }
+          }
+        }
+
+        stage("Python 3.12 Bullseye") {
+          agent {
+            node {
+              label ""
+              customWorkspace "workspace/${REPO_NAME}"
+            }
+          }
+
+          steps {
+            build job: 'python_3.12-bullseye_server_sdk_master', wait: true
+          }
+
+          post {
+            failure {
+              script {
+                FAILED_STAGE = env.STAGE_NAME
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  post {
+    unsuccessful {
+      slackSend color: "danger",
+        channel: "${env.SLACK_CHANNEL}",
+        message: "${env.JOB_NAME} - #${env.BUILD_NUMBER} Failure after ${currentBuild.durationString} at stage \"${FAILED_STAGE}\"(<${env.BUILD_URL}|Open>)"
+    }
   }
 }

braintree/apple_pay_gateway.py

@@ -1,4 +1,4 @@
-from html import escape
+from urllib.parse import quote
 from braintree.apple_pay_options import ApplePayOptions
 from braintree.error_result import ErrorResult
 from braintree.successful_result import SuccessfulResult
@@ -18,7 +18,7 @@ def register_domain(self, domain):
             return ErrorResult(self.gateway, response["api_error_response"])
 
     def unregister_domain(self, domain):
-        self.config.http().delete(self.config.base_merchant_path() + "/processing/apple_pay/unregister_domain?url=" + escape(domain))
+        self.config.http().delete(self.config.base_merchant_path() + "/processing/apple_pay/unregister_domain?url=" + quote(domain))
         return SuccessfulResult()
 
     def registered_domains(self):

braintree/credit_card_verification_gateway.py

@@ -33,6 +33,7 @@ def __criteria(self, query):
     def __fetch(self, query, ids):
         criteria = self.__criteria(query)
         criteria["ids"] = CreditCardVerificationSearch.ids.in_list(ids).to_param()
+        criteria["verification_type"] = ["credit_card"]
         response = self.config.http().post(self.config.base_merchant_path() + "/verifications/advanced_search", {"search": criteria})
         return [CreditCardVerification(self.gateway, item) for item in
                 ResourceCollection._extract_as_array(response["credit_card_verifications"], "verification")]
@@ -42,7 +43,9 @@ def search(self, *query):
         if isinstance(query[0], list):
             query = query[0]
 
-        response = self.config.http().post(self.config.base_merchant_path() + "/verifications/advanced_search_ids", {"search": self.__criteria(query)})
+        search_params = self.__criteria(query)
+        search_params["verification_type"] = ["credit_card"]
+        response = self.config.http().post(self.config.base_merchant_path() + "/verifications/advanced_search_ids", {"search": search_params})
         return ResourceCollection(query, response, self.__fetch)
 
     def __fetch_verifications(self, query, verification_ids):

braintree/error_codes.py

@@ -453,7 +453,6 @@ class Modification(object):
             IdToRemoveIsInvalid = "92025"
 
     class Transaction(object):
-        AdjustmentAmountMustBeGreaterThanZero = "95605"
         AmountCannotBeNegative = "81501"
         AmountDoesNotMatch3DSecureAmount = "91585"
         AmountIsInvalid = AmountFormatIsInvalid = "81503"

braintree/transaction.py

@@ -581,12 +581,6 @@ def create_signature():
                             "currency_amount",
                             "currency_iso_code"
                         ],
-                        "venmo_merchant_data": [
-                            "venmo_merchant_public_id",
-                            "originating_transaction_id",
-                            "originating_merchant_id",
-                            "originating_merchant_kind"
-                        ],
                         "venmo": [
                             "profile_id"
                         ],
@@ -670,8 +664,10 @@ def create_signature():
                     {
                         "sender": [
                             "account_reference_number",
+                            "date_of_birth",
                             "first_name",
                             "last_name",
+                            "middle_name",
                             "tax_id",
                             {
                                 "address": [
@@ -686,6 +682,7 @@ def create_signature():
                             "account_reference_number",
                             "first_name",
                             "last_name",
+                            "middle_name",
                             "tax_id",
                             {
                                 "address": [

braintree/version.py

@@ -1 +1 @@
-Version = "4.40.0"
+Version = "4.41.0"

dev_requirements.txt

@@ -1,2 +1,3 @@
-twine>=4.0,<6.0
+twine>=1.15.0,<2.0; python_version < '3.6'
+twine>=4.0,<6.0; python_version >= '3.6'
 -r requirements.txt

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name="braintree",
-    version="4.40.0",
+    version="4.41.0",
     description="Braintree Python Library",
     long_description=long_description,
     author="Braintree",

tests/integration/test_bank_account_instant_verification.py

@@ -35,11 +35,11 @@ def assert_has_attributes(self, obj, expected_attributes):
                 self.assert_has_attributes(actual_value, expected_value)
             elif callable(expected_value):
                 # Handle type checks and regex patterns
-                self.assertTrue(expected_value(actual_value), f"Expected {key} to match predicate, got {actual_value}")
+                self.assertTrue(expected_value(actual_value), "Expected {} to match predicate, got {}".format(key, actual_value))
             elif expected_value is not None:
-                self.assertEqual(expected_value, actual_value, f"Expected {key} to be {expected_value}, got {actual_value}")
+                self.assertEqual(expected_value, actual_value, "Expected {} to be {}, got {}".format(key, expected_value, actual_value))
             else:
-                self.assertIsNotNone(actual_value, f"Expected {key} to not be None")
+                self.assertIsNotNone(actual_value, "Expected {} to not be None".format(key))
 
     def generate_us_bank_account_nonce_via_open_banking(self):
         config = Configuration(
@@ -87,7 +87,7 @@ def generate_us_bank_account_nonce_via_open_banking(self):
             'Content-Type': 'application/json',
             'Accept': 'application/json',
             'Braintree-Version': '2019-01-01',
-            'User-Agent': f'Braintree Python Library {braintree.version.Version}',
+            'User-Agent': 'Braintree Python Library {}'.format(braintree.version.Version),
             'X-ApiVersion': Configuration.api_version()
         }
 
@@ -100,11 +100,11 @@ def generate_us_bank_account_nonce_via_open_banking(self):
         )
 
         if response.status_code != 200:
-            raise Exception(f'HTTP error {response.status_code}: {response.text}')
-        
+            raise Exception('HTTP error {}: {}'.format(response.status_code, response.text))
+
         response_data = response.json()
         if 'tenant_token' not in response_data:
-            raise Exception(f'Open Banking tokenization failed: {response_data}')
+            raise Exception('Open Banking tokenization failed: {}'.format(response_data))
 
         return response_data['tenant_token']
 
@@ -116,7 +116,7 @@ def test_create_jwt_creates_a_jwt_with_valid_request(self):
 
         result = self.gateway.bank_account_instant_verification.create_jwt(request)
 
-        self.assertTrue(result.is_success, f"Expected success but got errors: {getattr(result, 'errors', 'none')}")
+        self.assertTrue(result.is_success, "Expected success but got errors: {}".format(getattr(result, 'errors', 'none')))
         self.assertIsNotNone(result.bank_account_instant_verification_jwt)
         self.assertIsNotNone(result.bank_account_instant_verification_jwt.jwt)
         self.assertNotEqual("", result.bank_account_instant_verification_jwt.jwt)
@@ -167,7 +167,7 @@ def test_charge_us_bank_creates_transaction_directly_with_nonce_and_provides_ach
 
         transaction_result = self.us_bank_gateway.transaction.sale(transaction_request)
 
-        self.assertTrue(transaction_result.is_success, f"Expected transaction success but got failure with validation errors")
+        self.assertTrue(transaction_result.is_success, "Expected transaction success but got failure with validation errors")
         transaction = transaction_result.transaction
 
         expected_transaction = {
@@ -210,7 +210,7 @@ def test_open_finance_flow_tokenizes_bank_account_via_open_finance_api_vaults_wi
         }
 
         payment_method_result = self.us_bank_gateway.payment_method.create(payment_method_request)
-        self.assertTrue(payment_method_result.is_success, f"Expected payment method creation success but got failure with validation errors")
+        self.assertTrue(payment_method_result.is_success, "Expected payment method creation success but got failure with validation errors")
 
         us_bank_account = payment_method_result.payment_method
 
@@ -242,7 +242,7 @@ def test_open_finance_flow_tokenizes_bank_account_via_open_finance_api_vaults_wi
         }
 
         transaction_result = self.us_bank_gateway.transaction.sale(transaction_request)
-        self.assertTrue(transaction_result.is_success, f"Expected transaction success but got failure")
+        self.assertTrue(transaction_result.is_success, "Expected transaction success but got failure")
         transaction = transaction_result.transaction
 
         expected_transaction = {