Skip to content

Commit f4041d4

Browse files
kawa-marcinkawa-marcin
authored
Upgrade the Marshmallow dependency to be >=3.10.0 (#38) (#39)
Co-authored-by: Marcin Kawa <[email protected]>
1 parent cde9524 commit f4041d4

18 files changed

+73
-70
lines changed

‎chartmogul/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"""
3131

3232
__title__ = 'chartmogul'
33-
__version__ = '1.4.1'
33+
__version__ = '1.5.0'
3434
__build__ = 0x000000
3535
__author__ = 'ChartMogul Ltd'
3636
__license__ = 'MIT'

‎chartmogul/api/activity.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ class Activity(Resource):
1313

1414
class _Schema(Schema):
1515
id = fields.Int()
16-
activity_arr = fields.Number(load_from='activity-arr')
17-
activity_mrr = fields.Number(load_from='activity-mrr')
18-
activity_mrr_movement = fields.Number(load_from='activity-mrr-movement')
16+
activity_arr = fields.Number(data_key='activity-arr')
17+
activity_mrr = fields.Number(data_key='activity-mrr')
18+
activity_mrr_movement = fields.Number(data_key='activity-mrr-movement')
1919
currency = fields.String()
20-
currency_sign = fields.String(load_from='currency-sign')
20+
currency_sign = fields.String(data_key='currency-sign')
2121
date = fields.DateTime()
2222
description = fields.String()
2323
type = fields.String()
2424

2525
@post_load
26-
def make(self, data):
26+
def make(self, data, **kwargs):
2727
return Activity(**data)
2828

29-
_schema = _Schema(strict=True)
29+
_schema = _Schema()

‎chartmogul/api/attributes.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class _Schema(Schema):
1414
custom = fields.Dict()
1515

1616
@post_load
17-
def make(self, data):
17+
def make(self, data, **kwargs):
1818
return Attributes(**data)
1919

20-
_schema = _Schema(strict=True)
20+
_schema = _Schema()

‎chartmogul/api/custom_attrs.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ class _Schema(Schema):
1414
custom = fields.Dict()
1515

1616
@post_load
17-
def make(self, data):
17+
def make(self, data, **kwargs):
1818
return CustomAttributes(**data)
1919

2020
_customers = namedtuple('Customers', ['entries'])
21-
_schema = _Schema(strict=True)
21+
_schema = _Schema()
2222

2323
@classmethod
2424
def _load(cls, response):
@@ -31,7 +31,7 @@ def _load(cls, response):
3131
return None
3232
jsonObj = response.json()
3333
if 'entries' in jsonObj:
34-
customers = Customer._schema.load(jsonObj['entries'], many=True).data
34+
customers = Customer._schema.load(jsonObj['entries'], many=True)
3535
return cls._customers(customers)
3636
else:
37-
return cls._schema.load(jsonObj).data
37+
return cls._schema.load(jsonObj)

‎chartmogul/api/customer.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class _Schema(Schema):
2020
state = fields.String(allow_none=True)
2121

2222
@post_load
23-
def make(self, data):
23+
def make(self, data, **kwargs):
2424
return Address(**data)
2525

2626

@@ -56,21 +56,21 @@ class _Schema(Schema):
5656
external_ids = fields.List(fields.String())
5757
data_source_uuids = fields.List(fields.String())
5858
status = fields.String()
59-
customer_since = fields.DateTime(load_from="customer-since", allow_none=True)
59+
customer_since = fields.DateTime(data_key="customer-since", allow_none=True)
6060
mrr = fields.Number()
6161
arr = fields.Number()
62-
billing_system_url = fields.String(load_from="billing-system-url", allow_none=True)
63-
chartmogul_url = fields.String(load_from="chartmogul-url")
64-
billing_system_type = fields.String(load_from="billing-system-type")
62+
billing_system_url = fields.String(data_key="billing-system-url", allow_none=True)
63+
chartmogul_url = fields.String(data_key="chartmogul-url")
64+
billing_system_type = fields.String(data_key="billing-system-type")
6565
currency = fields.String()
66-
currency_sign = fields.String(load_from="currency-sign")
66+
currency_sign = fields.String(data_key="currency-sign")
6767
address = fields.Nested(Address._Schema, allow_none=True)
6868

6969
@post_load
70-
def make(self, data):
70+
def make(self, data, **kwargs):
7171
return Customer(**data)
7272

73-
_schema = _Schema(strict=True)
73+
_schema = _Schema()
7474

7575

7676
Customer.search = Customer._method('all', 'get', '/customers/search')

‎chartmogul/api/data_source.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class _Schema(Schema):
1919
system = fields.Str()
2020

2121
@post_load
22-
def make(self, data):
22+
def make(self, data, **kwargs):
2323
return DataSource(**data)
2424

25-
_schema = _Schema(strict=True)
25+
_schema = _Schema()

‎chartmogul/api/invoice.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ class _Schema(Schema):
2424
tax_amount_in_cents = fields.Int()
2525
transaction_fees_in_cents = fields.Int()
2626
account_code = fields.String(allow_none=True)
27+
description = fields.String(allow_none=True)
2728

2829
@post_load
29-
def make(self, data):
30+
def make(self, data, **kwargs):
3031
return LineItem(**data)
3132

3233

@@ -54,10 +55,10 @@ class _Schema(Schema):
5455
transactions = fields.Nested(Transaction._Schema, many=True)
5556

5657
@post_load
57-
def make(self, data):
58+
def make(self, data, **kwargs):
5859
return Invoice(**data)
5960

60-
_schema = _Schema(strict=True)
61+
_schema = _Schema()
6162

6263
@classmethod
6364
def all(cls, config, **kwargs):

‎chartmogul/api/metrics.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ class Summary(DataObject):
1010
class _Schema(Schema):
1111
current = fields.Number()
1212
previous = fields.Number()
13-
percentage_change = fields.Number(load_from='percentage-change')
13+
percentage_change = fields.Number(data_key='percentage-change')
1414

1515
@post_load
16-
def make(self, data):
16+
def make(self, data, **kwargs):
1717
return Summary(**data)
1818

19-
_schema = _Schema(strict=True)
19+
_schema = _Schema()
2020

2121

2222
class Metrics(Resource):
@@ -33,31 +33,31 @@ class _Schema(Schema):
3333
Fields are optional, so a subset present is good enough
3434
"""
3535
date = fields.Date()
36-
customer_churn_rate = fields.Number(load_from='customer-churn-rate')
37-
mrr_churn_rate = fields.Number(load_from='mrr-churn-rate')
36+
customer_churn_rate = fields.Number(data_key='customer-churn-rate')
37+
mrr_churn_rate = fields.Number(data_key='mrr-churn-rate')
3838
ltv = fields.Number()
3939
customers = fields.Number()
4040
asp = fields.Number()
4141
arpa = fields.Number()
4242
arr = fields.Number()
4343
mrr = fields.Number()
4444
# MRR only
45-
mrr_new_business = fields.Number(load_from='mrr-new-business')
46-
mrr_expansion = fields.Number(load_from='mrr-expansion')
47-
mrr_contraction = fields.Number(load_from='mrr-contraction')
48-
mrr_churn = fields.Number(load_from='mrr-churn')
49-
mrr_reactivation = fields.Number(load_from='mrr-reactivation')
45+
mrr_new_business = fields.Number(data_key='mrr-new-business')
46+
mrr_expansion = fields.Number(data_key='mrr-expansion')
47+
mrr_contraction = fields.Number(data_key='mrr-contraction')
48+
mrr_churn = fields.Number(data_key='mrr-churn')
49+
mrr_reactivation = fields.Number(data_key='mrr-reactivation')
5050

5151
@post_load
52-
def make(self, data):
52+
def make(self, data, **kwargs):
5353
return Metrics(**data)
5454

55-
_schema = _Schema(strict=True)
55+
_schema = _Schema()
5656

5757
@classmethod
5858
def _many(cls, entries, **kwargs):
5959
if 'summary' in kwargs:
60-
kwargs['summary'] = Summary._schema.load(kwargs['summary']).data
60+
kwargs['summary'] = Summary._schema.load(kwargs['summary'])
6161
return cls._many_cls(entries, **kwargs)
6262

6363

‎chartmogul/api/ping.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ class _Schema(Schema):
1313
data = fields.String()
1414

1515
@post_load
16-
def make(self, data):
16+
def make(self, data, **kwargs):
1717
return Ping(**data)
1818

19-
_schema = _Schema(strict=True)
19+
_schema = _Schema()
2020

2121

2222
_add_method(Ping, "ping", "get")

‎chartmogul/api/plan.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class _Schema(Schema):
2020
external_id = fields.String()
2121

2222
@post_load
23-
def make(self, data):
23+
def make(self, data, **kwargs):
2424
return Plan(**data)
2525

26-
_schema = _Schema(strict=True)
26+
_schema = _Schema()

0 commit comments

Comments
 (0)