Visitar URL original
Merge branch 'main' into dependabot/pip/urllib3-2.6.3 · lob/lob-python@ee3f591 · GitHub
Skip to content

Commit ee3f591

Browse files
wernermorgensternwernermorgenstern
authored
Merge branch 'main' into dependabot/pip/urllib3-2.6.3
2 parents b7b5eda + fd29e18 commit ee3f591

14 files changed

Lines changed: 131 additions & 38 deletions

‎.github/workflows/run_tests.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
python-version: ["3.7", "3.8", "3.9"]
12+
python-version: ["3.10", "3.11", "3.12"]
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515

1616
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v3
17+
uses: actions/setup-python@v5
1818
with:
1919
python-version: ${{ matrix.python-version }}
2020
- name: Install dependencies
@@ -23,15 +23,16 @@ jobs:
2323
python -m pip install python-dotenv
2424
python -m pip install unittest-data-provider
2525
pip install -r requirements.txt
26-
- name: Run Integration Tests
26+
- name: Run Unit Tests
2727
run:
28-
python -m unittest test/Integration/test_*.py
28+
python -m unittest test/Unit/test_*.py
2929
env:
3030
LOB_API_TEST_KEY: ${{ secrets.LOB_API_TEST_KEY }}
3131
LOB_API_LIVE_KEY: ${{ secrets.LOB_API_LIVE_KEY }}
32-
- name: Run Unit Tests
32+
- name: Run Integration Tests
33+
continue-on-error: true
3334
run:
34-
python -m unittest test/Unit/test_*.py
35+
python -m unittest test/Integration/test_*.py
3536
env:
3637
LOB_API_TEST_KEY: ${{ secrets.LOB_API_TEST_KEY }}
3738
LOB_API_LIVE_KEY: ${{ secrets.LOB_API_LIVE_KEY }}

‎lob_python/model/bank_account.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ def openapi_types():
124124
'bank_name': (str, type(None)), # noqa: E501
125125
'verified': (bool, type(None)), # noqa: E501
126126
'deleted': (bool, type(None)), # noqa: E501
127+
'microdeposit_type': (str, type(None)), # noqa: E501
127128
}
128129

129130
@cached_property
@@ -146,6 +147,7 @@ def discriminator():
146147
'bank_name': 'bank_name', # noqa: E501
147148
'verified': 'verified', # noqa: E501
148149
'deleted': 'deleted', # noqa: E501
150+
'microdeposit_type': 'microdeposit_type', # noqa: E501
149151
}
150152

151153
read_only_vars = {

‎lob_python/model/bank_account_verify.py‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
from lob_python.model_utils import ( # noqa: F401
1616
ApiTypeError,
17+
ApiValueError,
1718
ModelComposed,
1819
ModelNormal,
1920
ModelSimple,
@@ -65,6 +66,11 @@ class BankAccountVerify(ModelNormal):
6566
'max_items': 2,
6667
'min_items': 2,
6768
},
69+
('descriptor_code',): {
70+
'regex': {
71+
'pattern': r'^SM[a-zA-Z0-9]{4}$',
72+
},
73+
},
6874
}
6975

7076
@cached_property
@@ -89,6 +95,7 @@ def openapi_types():
8995
"""
9096
return {
9197
'amounts': (list,), # noqa: E501
98+
'descriptor_code': (str,), # noqa: E501
9299
}
93100

94101
@cached_property
@@ -98,6 +105,7 @@ def discriminator():
98105

99106
attribute_map = {
100107
'amounts': 'amounts', # noqa: E501
108+
'descriptor_code': 'descriptor_code', # noqa: E501
101109
}
102110

103111
read_only_vars = {
@@ -107,13 +115,12 @@ def discriminator():
107115

108116
@classmethod
109117
@convert_js_args_to_python_args
110-
def _from_openapi_data(cls, amounts, *args, **kwargs): # noqa: E501
118+
def _from_openapi_data(cls, *args, **kwargs): # noqa: E501
111119
"""BankAccountVerify - a model defined in OpenAPI
112120
113-
Args:
114-
amounts (list): In live mode, an array containing the two micro deposits (in cents) placed in the bank account. In test mode, no micro deposits will be placed, so any two integers between `1` and `100` will work.
115-
116121
Keyword Args:
122+
amounts (list): In live mode, an array containing the two micro deposits (in cents) placed in the bank account. In test mode, no micro deposits will be placed, so any two integers between `1` and `100` will work. [optional] # noqa: E501
123+
descriptor_code (str): The 6-character code (beginning with SM) from the bank statement descriptor of the single $0.01 microdeposit. Required when microdeposit_type is descriptor_code. [optional] # noqa: E501
117124
_check_type (bool): if True, values for parameters in openapi_types
118125
will be type checked and a TypeError will be
119126
raised if the wrong type is input.
@@ -171,7 +178,6 @@ def _from_openapi_data(cls, amounts, *args, **kwargs): # noqa: E501
171178
self._configuration = _configuration
172179
self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
173180

174-
self.amounts = amounts
175181
for var_name, var_value in kwargs.items():
176182
if var_name not in self.attribute_map and \
177183
self._configuration is not None and \
@@ -192,13 +198,12 @@ def _from_openapi_data(cls, amounts, *args, **kwargs): # noqa: E501
192198
])
193199

194200
@convert_js_args_to_python_args
195-
def __init__(self, amounts, *args, **kwargs): # noqa: E501
201+
def __init__(self, *args, **kwargs): # noqa: E501
196202
"""BankAccountVerify - a model defined in OpenAPI
197203
198-
Args:
199-
amounts ([Cents]): In live mode, an array containing the two micro deposits (in cents) placed in the bank account. In test mode, no micro deposits will be placed, so any two integers between `1` and `100` will work.
200-
201204
Keyword Args:
205+
amounts ([Cents]): In live mode, an array containing the two micro deposits (in cents) placed in the bank account. In test mode, no micro deposits will be placed, so any two integers between `1` and `100` will work. [optional] # noqa: E501
206+
descriptor_code (str): The 6-character code (beginning with SM) from the bank statement descriptor of the single $0.01 microdeposit. Required when microdeposit_type is descriptor_code. [optional] # noqa: E501
202207
_check_type (bool): if True, values for parameters in openapi_types
203208
will be type checked and a TypeError will be
204209
raised if the wrong type is input.
@@ -254,7 +259,18 @@ def __init__(self, amounts, *args, **kwargs): # noqa: E501
254259
self._configuration = _configuration
255260
self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
256261

257-
self.amounts = amounts
262+
has_amounts = 'amounts' in kwargs
263+
has_descriptor_code = 'descriptor_code' in kwargs
264+
265+
if not has_amounts and not has_descriptor_code:
266+
raise ApiValueError(
267+
"one of `amounts` or `descriptor_code` must be provided"
268+
)
269+
if has_amounts and has_descriptor_code:
270+
raise ApiValueError(
271+
"only one of `amounts` or `descriptor_code` may be provided"
272+
)
273+
258274
for var_name, var_value in kwargs.items():
259275
if var_name not in self.attribute_map and \
260276
self._configuration is not None and \

‎pyproject.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[build-system]
2+
requires = ["setuptools>=78.1.1,<81"]
3+
build-backend = "setuptools.build_meta"

‎requirements.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
certifi==2022.12.7
1+
certifi==2026.7.22
22
charset-normalizer==2.1.1
3-
idna==3.3
3+
idna==3.19
44
lob==4.5.4
55
python-dateutil==2.8.2
6-
requests==2.28.1
6+
requests==2.34.2
77
six==1.16.0
8-
urllib3==2.6.3
8+
urllib3==2.7.0
99
python-dotenv>=0.21.0

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from setuptools import setup, find_packages # noqa: H301
1212

1313
NAME = "lob-python"
14-
VERSION = "5.1.3"
14+
VERSION = "5.2.1"
1515
# To install the library, run the following
1616
#
1717
# python setup.py install

‎test/Integration/test_addresses_api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def test_create422_addr_too_long(self):
119119
)
120120
with self.assertRaises(Exception) as context:
121121
self.api.create(faulty_address)
122-
self.assertTrue("address_line1 length must be less than or equal to 64 characters long" in context.exception.__str__())
122+
self.assertTrue("address_line1" in context.exception.__str__())
123123

124124
def test_get200(self):
125125
"""Test case for get

‎test/Integration/test_bank_accounts_api.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,21 @@ def test_delete404(self):
271271
self.api.delete("bank_fake")
272272
self.assertTrue("bank account not found" in context.exception.__str__())
273273

274+
def test_verify_with_descriptor_code200(self):
275+
"""Test case for verify using descriptor_code path"""
276+
bank_verify = BankAccountVerify(descriptor_code="SM11AA")
277+
created_bank = self.api.create(self.bank_writable)
278+
verified_bank_acc = self.api.verify(created_bank.id, bank_verify)
279+
self.bank_ids.append(verified_bank_acc.id)
280+
self.assertIsNotNone(verified_bank_acc.id)
281+
282+
def test_bank_account_has_microdeposit_type(self):
283+
"""Test that a freshly created bank account exposes microdeposit_type"""
284+
created_bank = self.api.create(self.bank_writable)
285+
retrieved_bank = self.api.get(created_bank.id)
286+
self.bank_ids.append(created_bank.id)
287+
self.assertIn(retrieved_bank.microdeposit_type, ["amounts", "descriptor_code", None])
288+
274289

275290
if __name__ == '__main__':
276291
unittest.main()

‎test/Integration/test_checks_api.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ def setUpClass(self):
118118
),
119119
mail_type="usps_first_class",
120120
merge_variables=MergeVariables(),
121-
send_date=now + dt.timedelta(days=30),
122121
memo = "Test Check Memo",
123122
check_number = 2,
124123
logo = "https://s3.us-west-2.amazonaws.com/public.lob.com/assets/check_logo.png",
@@ -297,7 +296,7 @@ def test_list200(self):
297296
# perform test with after query param
298297
if next:
299298
listed_checks_after = self.api.list(limit=2, after=next)
300-
self.assertEqual(len(listed_checks_after.data), 2)
299+
self.assertGreaterEqual(len(listed_checks_after.data), 1)
301300
self.assertIsNotNone(listed_checks_after.data[0]['id'])
302301
prev = listed_checks_after.getPreviousPageToken()
303302
if prev:

‎test/Integration/test_intl_verifications_api.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ def setUpClass(self):
5757
country = CountryExtended("GB")
5858
)
5959
self.mc2 = MultipleComponentsIntl(
60-
primary_line = "10 DOWNING ST",
60+
primary_line = "1 FAKE POTATO LANE",
6161
city = "LONDON",
62-
postal_code = "SW1A 2AB",
62+
postal_code = "ZC4Z 46Z",
6363
country = CountryExtended("GB")
6464
)
6565
self.address_list = IntlVerificationsPayload(
@@ -95,7 +95,7 @@ def test_verifyBulk_valid_addresses(self):
9595
verified_list = self.api.verifyBulk(self.address_list)
9696
self.assertEqual(len(verified_list.addresses), 2)
9797
self.assertEqual(verified_list.addresses[0]['deliverability'], "deliverable")
98-
self.assertEqual(verified_list.addresses[1]['deliverability'], "deliverable_missing_info")
98+
self.assertEqual(verified_list.addresses[1]['deliverability'], "undeliverable")
9999

100100
def test_verifyBulk422(self):
101101
"""Test case for verifyBulk

0 commit comments

Comments
 (0)