API Updates for beta branch (#834)

* Trigger workflows on beta branches (#823)

* Codegen for openapi v157 (#824)

* Bump version to 3.4.0

* Add feature/** and sdk-release/** to PR CI triggers (#830)

* Add feature/** and release/** to PR CI triggers

* Rename release to sdk-release in CI triggers

* API Updates (#831)

* Bump version to 3.5.0

* Set version to 3.5.0 to simplify merge

* Reset version to 3.3.0

Co-authored-by: Kamil Pajdzik <99290280+kamil-stripe@users.noreply.github.com>
Co-authored-by: Kamil Pajdzik <kamil@stripe.com>
Co-authored-by: Dominic Charley-Roy <78050200+dcr-stripe@users.noreply.github.com>
Co-authored-by: Dominic Charley-Roy <dcr@stripe.com>

.github/workflows/python-package.yml → .github/workflows/ci.yml

@@ -3,11 +3,19 @@ name: CI
 on:
   workflow_dispatch: {}
   push:
-    branches: [master]
+    branches:
+      - master
+      - beta
+      - sdk-release/**
+      - feature/**
     tags:
       - v[0-9]+.[0-9]+.[0-9]+*
   pull_request:
-    branches: [master]
+    branches:
+      - master
+      - beta
+      - sdk-release/**
+      - feature/**
 
 jobs:
   lint:

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 3.5.0 - 2022-06-30
+* [#831](https://github.com/stripe/stripe-python/pull/831) API Updates
+  * Add support for `deliver_card`, `fail_card`, `return_card`, and `ship_card` test helper methods on resource `Issuing.Card`
+  * Switch from using `instance_url` to computing method path in place for custom methods.
+  * Switch from using explicit class methods for test helpers instead of using meta-programming.
+
+## 3.4.0 - 2022-06-17
+* [#824](https://github.com/stripe/stripe-python/pull/824) API Updates
+  * Add support for `fund_cash_balance` test helper method on resource `Customer`
+* [#823](https://github.com/stripe/stripe-python/pull/823) Trigger workflows on beta branches
+
 ## 3.3.0 - 2022-06-08
 * [#818](https://github.com/stripe/stripe-python/pull/818) fix: Update cash balance methods to no longer require nested ID.
 

Makefile

@@ -38,7 +38,7 @@ clean:
 
 update-version:
 	@echo "$(VERSION)" > VERSION
-	@perl -pi -e 's|VERSION = "[.\d]+"|VERSION = "$(VERSION)"|' stripe/version.py
+	@perl -pi -e 's|VERSION = "[.\d\w]+"|VERSION = "$(VERSION)"|' stripe/version.py
 
 codegen-format: fmt
 

OPENAPI_VERSION

@@ -1 +1 @@
-v146
+v161

stripe/api_resources/account.py

@@ -38,15 +38,19 @@ class Account(
     OBJECT_NAME = "account"
 
     def persons(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/persons"
+        url = "/v1/accounts/{account}/persons".format(
+            account=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         resp = self.request("get", url, params, headers)
         stripe_object = util.convert_to_stripe_object(resp)
         stripe_object._retrieve_params = params
         return stripe_object
 
     def reject(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/reject"
+        url = "/v1/accounts/{account}/reject".format(
+            account=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self

stripe/api_resources/apps/secret.py

@@ -19,9 +19,10 @@ def delete_where(
         )
         url = "/v1/apps/secrets/delete"
         response, api_key = requestor.request("post", url, params)
-        return util.convert_to_stripe_object(
+        stripe_object = util.convert_to_stripe_object(
             response, api_key, stripe_version, stripe_account
         )
+        return stripe_object
 
     @classmethod
     def find(
@@ -32,6 +33,7 @@ def find(
         )
         url = "/v1/apps/secrets/find"
         response, api_key = requestor.request("get", url, params)
-        return util.convert_to_stripe_object(
+        stripe_object = util.convert_to_stripe_object(
             response, api_key, stripe_version, stripe_account
         )
+        return stripe_object

stripe/api_resources/balance.py

@@ -6,3 +6,7 @@
 
 class Balance(SingletonAPIResource):
     OBJECT_NAME = "balance"
+
+    @classmethod
+    def class_url(cls):
+        return "/v1/balance"

stripe/api_resources/bitcoin_receiver.py

@@ -10,6 +10,10 @@
 class BitcoinReceiver(ListableAPIResource):
     OBJECT_NAME = "bitcoin_receiver"
 
+    @classmethod
+    def class_url(cls):
+        return "/v1/bitcoin/receivers"
+
     def instance_url(self):
         token = util.utf8(self.id)
         extn = quote_plus(token)
@@ -22,7 +26,3 @@ def instance_url(self):
         else:
             base = BitcoinReceiver.class_url()
             return "%s/%s" % (base, extn)
-
-    @classmethod
-    def class_url(cls):
-        return "/v1/bitcoin/receivers"

stripe/api_resources/charge.py

@@ -20,7 +20,9 @@ class Charge(
     OBJECT_NAME = "charge"
 
     def capture(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/capture"
+        url = "/v1/charges/{charge}/capture".format(
+            charge=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self

stripe/api_resources/checkout/session.py

@@ -14,7 +14,9 @@ class Session(CreateableAPIResource, ListableAPIResource):
     OBJECT_NAME = "checkout.session"
 
     def expire(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/expire"
+        url = "/v1/checkout/sessions/{session}/expire".format(
+            session=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self

stripe/api_resources/credit_note.py

@@ -18,7 +18,9 @@ class CreditNote(
     OBJECT_NAME = "credit_note"
 
     def void_credit_note(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/void"
+        url = "/v1/credit_notes/{id}/void".format(
+            id=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self

stripe/api_resources/customer.py

@@ -3,16 +3,19 @@
 
 from stripe import api_requestor
 from stripe import util
+from stripe.api_resources.abstract import APIResourceTestHelpers
 from stripe.api_resources.abstract import CreateableAPIResource
 from stripe.api_resources.abstract import DeletableAPIResource
 from stripe.api_resources.abstract import ListableAPIResource
 from stripe.api_resources.abstract import SearchableAPIResource
 from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import custom_method
 from stripe.api_resources.abstract import nested_resource_class_methods
+from stripe.api_resources.abstract import test_helpers
 
 
 @custom_method("delete_discount", http_verb="delete", http_path="discount")
+@test_helpers
 @custom_method(
     "create_funding_instructions",
     http_verb="post",
@@ -45,14 +48,18 @@ class Customer(
     OBJECT_NAME = "customer"
 
     def create_funding_instructions(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/funding_instructions"
+        url = "/v1/customers/{customer}/funding_instructions".format(
+            customer=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         resp = self.request("post", url, params, headers)
         stripe_object = util.convert_to_stripe_object(resp)
         return stripe_object
 
     def list_payment_methods(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/payment_methods"
+        url = "/v1/customers/{customer}/payment_methods".format(
+            customer=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         resp = self.request("get", url, params, headers)
         stripe_object = util.convert_to_stripe_object(resp)
@@ -79,9 +86,10 @@ def _cls_retrieve_payment_method(
             )
         )
         response, api_key = requestor.request("get", url, params)
-        return util.convert_to_stripe_object(
+        stripe_object = util.convert_to_stripe_object(
             response, api_key, stripe_version, stripe_account
         )
+        return stripe_object
 
     @util.class_method_variant("_cls_retrieve_payment_method")
     def retrieve_payment_method(
@@ -134,9 +142,10 @@ def retrieve_cash_balance(
             customer=util.sanitize_id(customer)
         )
         response, api_key = requestor.request("get", url, params)
-        return util.convert_to_stripe_object(
+        stripe_object = util.convert_to_stripe_object(
             response, api_key, stripe_version, stripe_account
         )
+        return stripe_object
 
     @classmethod
     def modify_cash_balance(
@@ -156,6 +165,40 @@ def modify_cash_balance(
             customer=util.sanitize_id(customer)
         )
         response, api_key = requestor.request("post", url, params)
-        return util.convert_to_stripe_object(
+        stripe_object = util.convert_to_stripe_object(
             response, api_key, stripe_version, stripe_account
         )
+        return stripe_object
+
+    class TestHelpers(APIResourceTestHelpers):
+        @classmethod
+        def _cls_fund_cash_balance(
+            cls,
+            customer,
+            api_key=None,
+            stripe_version=None,
+            stripe_account=None,
+            **params
+        ):
+            requestor = api_requestor.APIRequestor(
+                api_key, api_version=stripe_version, account=stripe_account
+            )
+            url = "/v1/test_helpers/customers/{customer}/fund_cash_balance".format(
+                customer=util.sanitize_id(customer)
+            )
+            response, api_key = requestor.request("post", url, params)
+            stripe_object = util.convert_to_stripe_object(
+                response, api_key, stripe_version, stripe_account
+            )
+            return stripe_object
+
+        @util.class_method_variant("_cls_fund_cash_balance")
+        def fund_cash_balance(self, idempotency_key=None, **params):
+            url = "/v1/test_helpers/customers/{customer}/fund_cash_balance".format(
+                customer=util.sanitize_id(self.get("id"))
+            )
+            headers = util.populate_headers(idempotency_key)
+            self.resource.refresh_from(
+                self.resource.request("post", url, params, headers)
+            )
+            return self.resource

stripe/api_resources/dispute.py

@@ -12,7 +12,9 @@ class Dispute(ListableAPIResource, UpdateableAPIResource):
     OBJECT_NAME = "dispute"
 
     def close(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/close"
+        url = "/v1/disputes/{dispute}/close".format(
+            dispute=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self

stripe/api_resources/financial_connections/account.py

@@ -13,21 +13,27 @@ class Account(ListableAPIResource):
     OBJECT_NAME = "financial_connections.account"
 
     def disconnect(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/disconnect"
+        url = "/v1/financial_connections/accounts/{account}/disconnect".format(
+            account=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self
 
     def list_owners(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/owners"
+        url = "/v1/financial_connections/accounts/{account}/owners".format(
+            account=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         resp = self.request("get", url, params, headers)
         stripe_object = util.convert_to_stripe_object(resp)
         stripe_object._retrieve_params = params
         return stripe_object
 
     def refresh_account(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/refresh"
+        url = "/v1/financial_connections/accounts/{account}/refresh".format(
+            account=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self

stripe/api_resources/identity/verification_session.py

@@ -18,13 +18,17 @@ class VerificationSession(
     OBJECT_NAME = "identity.verification_session"
 
     def cancel(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/cancel"
+        url = "/v1/identity/verification_sessions/{session}/cancel".format(
+            session=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self
 
     def redact(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/redact"
+        url = "/v1/identity/verification_sessions/{session}/redact".format(
+            session=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self

stripe/api_resources/invoice.py

@@ -26,31 +26,41 @@ class Invoice(
     OBJECT_NAME = "invoice"
 
     def finalize_invoice(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/finalize"
+        url = "/v1/invoices/{invoice}/finalize".format(
+            invoice=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self
 
     def mark_uncollectible(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/mark_uncollectible"
+        url = "/v1/invoices/{invoice}/mark_uncollectible".format(
+            invoice=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self
 
     def pay(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/pay"
+        url = "/v1/invoices/{invoice}/pay".format(
+            invoice=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self
 
     def send_invoice(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/send"
+        url = "/v1/invoices/{invoice}/send".format(
+            invoice=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self
 
     def void_invoice(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/void"
+        url = "/v1/invoices/{invoice}/void".format(
+            invoice=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self

stripe/api_resources/issuing/authorization.py

@@ -13,13 +13,17 @@ class Authorization(ListableAPIResource, UpdateableAPIResource):
     OBJECT_NAME = "issuing.authorization"
 
     def approve(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/approve"
+        url = "/v1/issuing/authorizations/{authorization}/approve".format(
+            authorization=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self
 
     def decline(self, idempotency_key=None, **params):
-        url = self.instance_url() + "/decline"
+        url = "/v1/issuing/authorizations/{authorization}/decline".format(
+            authorization=util.sanitize_id(self.get("id"))
+        )
         headers = util.populate_headers(idempotency_key)
         self.refresh_from(self.request("post", url, params, headers))
         return self