Merge commit '555c8cdf47401fca9d00a5f611c040760e42483c' into pakrym/m…

…erge-master

# Conflicts:
#	CHANGELOG.md
#	VERSION
#	stripe/_credit_note.py
#	stripe/_invoice.py
#	stripe/_invoice_item.py
#	stripe/_invoice_line_item.py
#	stripe/_line_item.py
#	stripe/_payment_intent.py
#	stripe/_quote.py
#	stripe/_setup_attempt.py
#	stripe/_setup_intent.py
#	stripe/_subscription_item.py
#	stripe/_subscription_schedule.py
#	stripe/_webhook_endpoint.py
#	stripe/api_resources/financial_connections/__init__.py
#	stripe/api_resources/issuing/__init__.py
#	stripe/api_resources/tax/__init__.py
#	stripe/checkout/_session.py
#	stripe/financial_connections/_account.py
#	stripe/financial_connections/account_inferred_balance.py
#	stripe/financial_connections/transaction.py
#	stripe/issuing/_card.py
#	stripe/issuing/credit_underwriting_record.py
#	stripe/issuing/personalization_design.py
#	stripe/issuing/physical_bundle.py
#	stripe/object_classes.py
#	stripe/tax/form.py
#	stripe/terminal/_reader.py
#	stripe/version.py

CHANGELOG.md

@@ -3,6 +3,21 @@
 ## 7.8.0b1 - 2023-11-30
 * [#1148](https://github.com/stripe/stripe-python/pull/1148) Update generated code for beta
 
+## 7.7.0 - 2023-11-30
+* [#1147](https://github.com/stripe/stripe-python/pull/1147) Update generated code
+  * Add support for new resources `Climate.Order`, `Climate.Product`, and `Climate.Supplier`
+  * Add support for `cancel`, `create`, `list`, `modify`, and `retrieve` methods on resource `Order`
+  * Add support for `list` and `retrieve` methods on resources `Product` and `Supplier`
+  * Add support for new value `financial_connections_account_inactive` on enums `Invoice.LastFinalizationError.code`, `PaymentIntent.LastPaymentError.code`, `SetupAttempt.SetupError.code`, and `SetupIntent.LastSetupError.code`
+  * Add support for new values `climate_order_purchase` and `climate_order_refund` on enum `BalanceTransaction.type`
+  * Add support for `created` on `Checkout.Session.ListParams`
+  * Add support for `validate_location` on `Customer.CreateParamsTax` and `Customer.ModifyParamsTax`
+  * Add support for new values `climate.order.canceled`, `climate.order.created`, `climate.order.delayed`, `climate.order.delivered`, `climate.order.product_substituted`, `climate.product.created`, and `climate.product.pricing_updated` on enum `Event.type`
+  * Add support for new value `challenge` on enums `PaymentIntent. PaymentMethodOptions.Card.request_three_d_secure` and `SetupIntent. PaymentMethodOptions.Card.request_three_d_secure`
+  * Add support for new values `climate_order_purchase` and `climate_order_refund` on enum `Reporting.ReportRun. CreateParamsParameters.reporting_category`
+  * Add support for new values `climate.order.canceled`, `climate.order.created`, `climate.order.delayed`, `climate.order.delivered`, `climate.order.product_substituted`, `climate.product.created`, and `climate.product.pricing_updated` on enums `WebhookEndpoint.CreateParams.enabled_events[]` and `WebhookEndpoint.ModifyParams.enabled_events[]`
+* [#1145](https://github.com/stripe/stripe-python/pull/1145) Refactor integration test
+
 ## 7.7.0b1 - 2023-11-21
 * [#1141](https://github.com/stripe/stripe-python/pull/1141) Update generated code for beta
 * Rename `receipient` to `recipient` beneath `PaymentDetails` on `Charge` and `PaymentIntent` APIs.* Add support for `electronic_commerce_indicator` on resource classes `Charge.PaymentMethodDetails.Card.ThreeDSecure` and `SetupAttempt.PaymentMethodDetails.Card.ThreeDSecure`

stripe/api_resources/account.py → stripe/_account.py

@@ -1,17 +1,16 @@
 # -*- coding: utf-8 -*-
 # File generated from our OpenAPI spec
-from stripe import api_resources, oauth, util
-from stripe.api_resources.abstract import (
-    CreateableAPIResource,
-    DeletableAPIResource,
-    ListableAPIResource,
-    UpdateableAPIResource,
-    nested_resource_class_methods,
-)
-from stripe.api_resources.expandable_field import ExpandableField
-from stripe.api_resources.list_object import ListObject
-from stripe.request_options import RequestOptions
-from stripe.stripe_object import StripeObject
+from stripe import oauth, util
+from stripe._createable_api_resource import CreateableAPIResource
+from stripe._deletable_api_resource import DeletableAPIResource
+from stripe._expandable_field import ExpandableField
+from stripe._list_object import ListObject
+from stripe._listable_api_resource import ListableAPIResource
+from stripe._nested_resource_class_methods import nested_resource_class_methods
+from stripe._person import Person
+from stripe._request_options import RequestOptions
+from stripe._stripe_object import StripeObject
+from stripe._updateable_api_resource import UpdateableAPIResource
 from stripe.util import class_method_variant
 from typing import ClassVar, Dict, List, Optional, Union, cast, overload
 from typing_extensions import (
@@ -24,12 +23,11 @@
 from urllib.parse import quote_plus
 
 if TYPE_CHECKING:
-    from stripe.api_resources.bank_account import BankAccount
-    from stripe.api_resources.capability import Capability
-    from stripe.api_resources.card import Card
-    from stripe.api_resources.file import File
-    from stripe.api_resources.login_link import LoginLink
-    from stripe.api_resources.person import Person
+    from stripe._bank_account import BankAccount
+    from stripe._capability import Capability
+    from stripe._card import Card
+    from stripe._file import File
+    from stripe._login_link import LoginLink
 
 
 @nested_resource_class_methods("capability")
@@ -3888,11 +3886,7 @@ def serialize(self, previous):
         previous = previous or self._previous or {}
 
         for k, v in iter(self.items()):
-            if (
-                k == "individual"
-                and isinstance(v, api_resources.Person)
-                and k not in params
-            ):
+            if k == "individual" and isinstance(v, Person) and k not in params:
                 params[k] = v.serialize(previous.get(k, None))
 
         return params

stripe/api_resources/account_link.py → stripe/_account_link.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # File generated from our OpenAPI spec
-from stripe.api_resources.abstract import CreateableAPIResource
-from stripe.request_options import RequestOptions
+from stripe._createable_api_resource import CreateableAPIResource
+from stripe._request_options import RequestOptions
 from typing import ClassVar, List, Optional, cast
 from typing_extensions import Literal, NotRequired, Unpack
 

stripe/api_resources/account_session.py → stripe/_account_session.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # File generated from our OpenAPI spec
-from stripe.api_resources.abstract import CreateableAPIResource
-from stripe.request_options import RequestOptions
-from stripe.stripe_object import StripeObject
+from stripe._createable_api_resource import CreateableAPIResource
+from stripe._request_options import RequestOptions
+from stripe._stripe_object import StripeObject
 from typing import ClassVar, List, Optional, cast
 from typing_extensions import Literal, NotRequired, TypedDict, Unpack
 

stripe/api_resources/apple_pay_domain.py → stripe/_apple_pay_domain.py

@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
 # File generated from our OpenAPI spec
-from stripe.api_resources.abstract import (
-    CreateableAPIResource,
-    DeletableAPIResource,
-    ListableAPIResource,
-)
-from stripe.api_resources.list_object import ListObject
-from stripe.request_options import RequestOptions
+from stripe._createable_api_resource import CreateableAPIResource
+from stripe._deletable_api_resource import DeletableAPIResource
+from stripe._list_object import ListObject
+from stripe._listable_api_resource import ListableAPIResource
+from stripe._request_options import RequestOptions
 from stripe.util import class_method_variant
 from typing import ClassVar, List, Optional, cast, overload
 from typing_extensions import Literal, NotRequired, Unpack

stripe/api_resources/application.py → stripe/_application.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # File generated from our OpenAPI spec
-from stripe.stripe_object import StripeObject
+from stripe._stripe_object import StripeObject
 from typing import ClassVar, Optional
 from typing_extensions import Literal
 

stripe/api_resources/application_fee.py → stripe/_application_fee.py

@@ -1,13 +1,11 @@
 # -*- coding: utf-8 -*-
 # File generated from our OpenAPI spec
 from stripe import util
-from stripe.api_resources.abstract import (
-    ListableAPIResource,
-    nested_resource_class_methods,
-)
-from stripe.api_resources.expandable_field import ExpandableField
-from stripe.api_resources.list_object import ListObject
-from stripe.request_options import RequestOptions
+from stripe._expandable_field import ExpandableField
+from stripe._list_object import ListObject
+from stripe._listable_api_resource import ListableAPIResource
+from stripe._nested_resource_class_methods import nested_resource_class_methods
+from stripe._request_options import RequestOptions
 from stripe.util import class_method_variant
 from typing import ClassVar, Dict, List, Optional, cast, overload
 from typing_extensions import (
@@ -19,13 +17,11 @@
 )
 
 if TYPE_CHECKING:
-    from stripe.api_resources.account import Account
-    from stripe.api_resources.application import Application
-    from stripe.api_resources.application_fee_refund import (
-        ApplicationFeeRefund,
-    )
-    from stripe.api_resources.balance_transaction import BalanceTransaction
-    from stripe.api_resources.charge import Charge
+    from stripe._account import Account
+    from stripe._application import Application
+    from stripe._application_fee_refund import ApplicationFeeRefund
+    from stripe._balance_transaction import BalanceTransaction
+    from stripe._charge import Charge
 
 
 @nested_resource_class_methods("refund")

stripe/api_resources/application_fee_refund.py → stripe/_application_fee_refund.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 # File generated from our OpenAPI spec
-from stripe.api_resources.abstract import UpdateableAPIResource
-from stripe.api_resources.application_fee import ApplicationFee
-from stripe.api_resources.expandable_field import ExpandableField
+from stripe._application_fee import ApplicationFee
+from stripe._expandable_field import ExpandableField
+from stripe._updateable_api_resource import UpdateableAPIResource
 from typing import ClassVar, Dict, Optional, cast
 from typing_extensions import Literal, TYPE_CHECKING
 from urllib.parse import quote_plus
 
 if TYPE_CHECKING:
-    from stripe.api_resources.balance_transaction import BalanceTransaction
+    from stripe._balance_transaction import BalanceTransaction
 
 
 class ApplicationFeeRefund(UpdateableAPIResource["ApplicationFeeRefund"]):

stripe/api_resources/balance.py → stripe/_balance.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # File generated from our OpenAPI spec
-from stripe.api_resources.abstract import SingletonAPIResource
-from stripe.request_options import RequestOptions
-from stripe.stripe_object import StripeObject
+from stripe._request_options import RequestOptions
+from stripe._singleton_api_resource import SingletonAPIResource
+from stripe._stripe_object import StripeObject
 from typing import ClassVar, List, Optional
 from typing_extensions import Literal, NotRequired, Unpack
 

stripe/api_resources/balance_transaction.py → stripe/_balance_transaction.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # File generated from our OpenAPI spec
-from stripe.api_resources.abstract import ListableAPIResource
-from stripe.api_resources.expandable_field import ExpandableField
-from stripe.api_resources.list_object import ListObject
-from stripe.request_options import RequestOptions
-from stripe.stripe_object import StripeObject
+from stripe._expandable_field import ExpandableField
+from stripe._list_object import ListObject
+from stripe._listable_api_resource import ListableAPIResource
+from stripe._request_options import RequestOptions
+from stripe._stripe_object import StripeObject
 from typing import ClassVar, List, Optional, Union
 from typing_extensions import (
     Literal,
@@ -15,31 +15,25 @@
 )
 
 if TYPE_CHECKING:
-    from stripe.api_resources.application_fee import ApplicationFee
-    from stripe.api_resources.application_fee_refund import (
-        ApplicationFeeRefund,
-    )
-    from stripe.api_resources.charge import Charge
-    from stripe.api_resources.connect_collection_transfer import (
-        ConnectCollectionTransfer,
-    )
-    from stripe.api_resources.customer_cash_balance_transaction import (
+    from stripe._application_fee import ApplicationFee
+    from stripe._application_fee_refund import ApplicationFeeRefund
+    from stripe._charge import Charge
+    from stripe._connect_collection_transfer import ConnectCollectionTransfer
+    from stripe._customer_cash_balance_transaction import (
         CustomerCashBalanceTransaction,
     )
-    from stripe.api_resources.dispute import Dispute as DisputeResource
-    from stripe.api_resources.issuing.authorization import Authorization
-    from stripe.api_resources.issuing.dispute import (
-        Dispute as IssuingDisputeResource,
-    )
-    from stripe.api_resources.issuing.transaction import Transaction
-    from stripe.api_resources.payout import Payout
-    from stripe.api_resources.platform_tax_fee import PlatformTaxFee
-    from stripe.api_resources.refund import Refund
-    from stripe.api_resources.reserve_transaction import ReserveTransaction
-    from stripe.api_resources.reversal import Reversal
-    from stripe.api_resources.tax_deducted_at_source import TaxDeductedAtSource
-    from stripe.api_resources.topup import Topup
-    from stripe.api_resources.transfer import Transfer
+    from stripe._dispute import Dispute as DisputeResource
+    from stripe._payout import Payout
+    from stripe._platform_tax_fee import PlatformTaxFee
+    from stripe._refund import Refund
+    from stripe._reserve_transaction import ReserveTransaction
+    from stripe._reversal import Reversal
+    from stripe._tax_deducted_at_source import TaxDeductedAtSource
+    from stripe._topup import Topup
+    from stripe._transfer import Transfer
+    from stripe.issuing._authorization import Authorization
+    from stripe.issuing._dispute import Dispute as IssuingDisputeResource
+    from stripe.issuing._transaction import Transaction
 
 
 class BalanceTransaction(ListableAPIResource["BalanceTransaction"]):

stripe/api_resources/bank_account.py → stripe/_bank_account.py

@@ -1,23 +1,21 @@
 # -*- coding: utf-8 -*-
 # File generated from our OpenAPI spec
-from stripe import error
-from stripe.api_resources.abstract import (
-    DeletableAPIResource,
-    UpdateableAPIResource,
-    VerifyMixin,
-)
-from stripe.api_resources.account import Account
-from stripe.api_resources.customer import Customer
-from stripe.api_resources.expandable_field import ExpandableField
-from stripe.request_options import RequestOptions
-from stripe.stripe_object import StripeObject
+from stripe._account import Account
+from stripe._customer import Customer
+from stripe._deletable_api_resource import DeletableAPIResource
+from stripe._error import InvalidRequestError
+from stripe._expandable_field import ExpandableField
+from stripe._request_options import RequestOptions
+from stripe._stripe_object import StripeObject
+from stripe._updateable_api_resource import UpdateableAPIResource
+from stripe._verify_mixin import VerifyMixin
 from stripe.util import class_method_variant
 from typing import ClassVar, Dict, List, Optional, Union, cast, overload
 from typing_extensions import Literal, Unpack, TYPE_CHECKING
 from urllib.parse import quote_plus
 
 if TYPE_CHECKING:
-    from stripe.api_resources.card import Card
+    from stripe._card import Card
 
 
 class BankAccount(
@@ -434,7 +432,7 @@ def instance_url(self):
             class_base = "external_accounts"
 
         else:
-            raise error.InvalidRequestError(
+            raise InvalidRequestError(
                 "Could not determine whether bank_account_id %s is "
                 "attached to a customer or an account." % token,
                 "id",

stripe/api_resources/capability.py → stripe/_capability.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 # File generated from our OpenAPI spec
-from stripe.api_resources.abstract import UpdateableAPIResource
-from stripe.api_resources.account import Account
-from stripe.api_resources.expandable_field import ExpandableField
-from stripe.stripe_object import StripeObject
+from stripe._account import Account
+from stripe._expandable_field import ExpandableField
+from stripe._stripe_object import StripeObject
+from stripe._updateable_api_resource import UpdateableAPIResource
 from typing import ClassVar, List, Optional
 from typing_extensions import Literal
 from urllib.parse import quote_plus

stripe/api_resources/card.py → stripe/_card.py

@@ -1,21 +1,19 @@
 # -*- coding: utf-8 -*-
 # File generated from our OpenAPI spec
-from stripe import error
-from stripe.api_resources.abstract import (
-    DeletableAPIResource,
-    UpdateableAPIResource,
-)
-from stripe.api_resources.account import Account
-from stripe.api_resources.customer import Customer
-from stripe.api_resources.expandable_field import ExpandableField
-from stripe.request_options import RequestOptions
+from stripe._account import Account
+from stripe._customer import Customer
+from stripe._deletable_api_resource import DeletableAPIResource
+from stripe._error import InvalidRequestError
+from stripe._expandable_field import ExpandableField
+from stripe._request_options import RequestOptions
+from stripe._updateable_api_resource import UpdateableAPIResource
 from stripe.util import class_method_variant
 from typing import ClassVar, Dict, List, Optional, Union, cast, overload
 from typing_extensions import Literal, Unpack, TYPE_CHECKING
 from urllib.parse import quote_plus
 
 if TYPE_CHECKING:
-    from stripe.api_resources.bank_account import BankAccount
+    from stripe._bank_account import BankAccount
 
 
 class Card(DeletableAPIResource["Card"], UpdateableAPIResource["Card"]):
@@ -232,7 +230,7 @@ def instance_url(self):
             class_base = "external_accounts"
 
         else:
-            raise error.InvalidRequestError(
+            raise InvalidRequestError(
                 "Could not determine whether card_id %s is "
                 "attached to a customer, or "
                 "account." % token,

stripe/api_resources/cash_balance.py → stripe/_cash_balance.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # File generated from our OpenAPI spec
-from stripe.api_resources.customer import Customer
-from stripe.stripe_object import StripeObject
+from stripe._customer import Customer
+from stripe._stripe_object import StripeObject
 from typing import ClassVar, Dict, Optional
 from typing_extensions import Literal
 from urllib.parse import quote_plus