WIP: update *all* dependencies and regenerate

Author: davidweterings

codegen/generate_services.py

@@ -5,10 +5,6 @@
 import textwrap
 import typing
 from collections import defaultdict
-from re import A
-
-from attr import Attribute
-from black import KEYWORDS
 
 from codegen.generate_abstract import AbstractModuleGenerator
 from codegen.service_processor import (

codegen/main.py

@@ -3,7 +3,6 @@
 from pathlib import Path
 
 import astor
-import astunparse
 import black
 import isort.api
 
@@ -49,7 +48,7 @@ def generate_services_modules(services: ServiceProcessor, types):
 
 
 def generate():
-    raml = parse_raml_file("../commercetools-api-reference/api.raml")
+    raml = parse_raml_file("../commercetools-api-reference/api-specs/api/api.raml")
 
     types = raml["types"].types.values()
     services = raml["services"]
@@ -99,18 +98,18 @@ def write_module(filename, ast):
     reformat_code(filename)
 
 
-def reformat_code(filename):
-
+def reformat_code(filename: str):
     config = isort.api.Config()
     isort.api.sort_file(filename, config=config)
 
     src = Path(filename)
     report = black.Report()
+    mode = black.Mode()
     black.reformat_one(
         src=src,
-        line_length=88,
-        fast=False,
+        # https://github.com/psf/black/issues/1629 known issue
+        fast=True,
         write_back=black.WriteBack.YES,
-        mode=black.FileMode.AUTO_DETECT,
+        mode=mode,
         report=report,
     )

setup.cfg

@@ -7,6 +7,5 @@ per-file-ignores =
 
 
 [tool:pytest]
-minversion = 3.0
-strict = true
+minversion = 6.0
 testpaths = tests

setup.py

@@ -3,24 +3,24 @@
 from setuptools import find_packages, setup
 
 install_requires = [
-    "requests>=2.7.0",
+    "requests>=2.25.1",
     "pytz",
-    "requests-oauthlib>=1.0.0",
-    "requests_mock>=0.7.0",
-    "marshmallow>=3.0.0",
+    "requests-oauthlib>=1.3.0",
+    "requests_mock>=1.8.0",
+    "marshmallow>=3.9.1",
     "marshmallow-enum>=1.5.1",
-    "WebOb>=1.8.0",
-    "Werkzeug>=0.15.2",
-    "wrapt>=1.10.0",
+    "WebOb>=1.8.6",
+    "Werkzeug>=1.0.1",
+    "wrapt>=1.12.1",
 ]
 
 codegen_requires = [
     "astunparse==1.6.3",
     "astor==0.8.1",
-    "attrs>=18.2.0",
-    "black==18.9b0",
-    "isort[pyproject]==5.2.2",
-    "PyYAML==3.13",
+    "attrs>=20.3.0",
+    "black==20.8b1",
+    "isort==5.6.4",
+    "PyYAML==5.3.1",
 ]
 
 docs_require = [
@@ -30,19 +30,19 @@
 ]
 
 tests_require = [
-    "freezegun==0.3.8",
-    "mock==2.0.0",
-    "pretend==1.0.8",
-    "coverage[toml]>=5.0.2",
-    "pytest-cov==2.5.1",
-    "pytest==3.1.3",
+    "freezegun==1.0.0",
+    "mock==4.0.3",
+    "pretend==1.0.9",
+    "coverage[toml]>=5.3",
+    "pytest-cov==2.10.1",
+    "pytest==6.2.1",
     # Linting
-    "isort==5.2.2",
-    "flake8==3.3.0",
+    "isort==5.6.4",
+    "flake8==3.8.4",
     "flake8-blind-except==0.1.1",
     "flake8-debugger==1.4.0",
     "flake8-imports==0.1.1",
-    "mypy==0.761",
+    "mypy==0.790",
 ]
 
 

src/commercetools/_schemas/_cart.py

@@ -571,7 +571,7 @@ class CustomLineItemDraftSchema(marshmallow.Schema):
         data_key="externalTaxRate",
     )
     custom = helpers.LazyNestedField(
-        nested="commercetools._schemas._type.CustomFieldsSchema",
+        nested="commercetools._schemas._type.CustomFieldsDraftSchema",
         unknown=marshmallow.EXCLUDE,
         allow_none=True,
         missing=None,
@@ -1268,22 +1268,14 @@ def post_load(self, data, **kwargs):
 class TaxedPriceDraftSchema(marshmallow.Schema):
     """Marshmallow schema for :class:`commercetools.types.TaxedPriceDraft`."""
 
-    total_net = helpers.Discriminator(
-        discriminator_field=("type", "type"),
-        discriminator_schemas={
-            "centPrecision": "commercetools._schemas._common.CentPrecisionMoneyDraftSchema",
-            "highPrecision": "commercetools._schemas._common.HighPrecisionMoneyDraftSchema",
-        },
+    total_net = helpers.LazyNestedField(
+        nested="commercetools._schemas._common.MoneySchema",
         unknown=marshmallow.EXCLUDE,
         allow_none=True,
         data_key="totalNet",
     )
-    total_gross = helpers.Discriminator(
-        discriminator_field=("type", "type"),
-        discriminator_schemas={
-            "centPrecision": "commercetools._schemas._common.CentPrecisionMoneyDraftSchema",
-            "highPrecision": "commercetools._schemas._common.HighPrecisionMoneyDraftSchema",
-        },
+    total_gross = helpers.LazyNestedField(
+        nested="commercetools._schemas._common.MoneySchema",
         unknown=marshmallow.EXCLUDE,
         allow_none=True,
         data_key="totalGross",

src/commercetools/_schemas/_cart_discount.py

@@ -195,9 +195,9 @@ class CartDiscountSchema(BaseResourceSchema):
     value = helpers.Discriminator(
         discriminator_field=("type", "type"),
         discriminator_schemas={
-            "absolute": "commercetools._schemas._cart_discount.CartDiscountValueAbsoluteSchema",
-            "giftLineItem": "commercetools._schemas._cart_discount.CartDiscountValueGiftLineItemSchema",
-            "relative": "commercetools._schemas._cart_discount.CartDiscountValueRelativeSchema",
+            "absolute": "commercetools._schemas._cart_discount.CartDiscountValueAbsoluteDraftSchema",
+            "giftLineItem": "commercetools._schemas._cart_discount.CartDiscountValueGiftLineItemDraftSchema",
+            "relative": "commercetools._schemas._cart_discount.CartDiscountValueRelativeDraftSchema",
         },
         unknown=marshmallow.EXCLUDE,
         allow_none=True,
@@ -714,20 +714,20 @@ class CartDiscountValueGiftLineItemDraftSchema(CartDiscountValueDraftSchema):
     """Marshmallow schema for :class:`commercetools.types.CartDiscountValueGiftLineItemDraft`."""
 
     product = helpers.LazyNestedField(
-        nested="commercetools._schemas._product.ProductReferenceSchema",
+        nested="commercetools._schemas._product.ProductResourceIdentifierSchema",
         unknown=marshmallow.EXCLUDE,
         allow_none=True,
     )
     variant_id = marshmallow.fields.Integer(allow_none=True, data_key="variantId")
     supply_channel = helpers.LazyNestedField(
-        nested="commercetools._schemas._channel.ChannelReferenceSchema",
+        nested="commercetools._schemas._channel.ChannelResourceIdentifierSchema",
         unknown=marshmallow.EXCLUDE,
         allow_none=True,
         missing=None,
         data_key="supplyChannel",
     )
     distribution_channel = helpers.LazyNestedField(
-        nested="commercetools._schemas._channel.ChannelReferenceSchema",
+        nested="commercetools._schemas._channel.ChannelResourceIdentifierSchema",
         unknown=marshmallow.EXCLUDE,
         allow_none=True,
         missing=None,

src/commercetools/_schemas/_common.py

@@ -812,6 +812,9 @@ class TypedMoneyDraftSchema(MoneySchema):
     """Marshmallow schema for :class:`commercetools.types.TypedMoneyDraft`."""
 
     type = marshmallow_enum.EnumField(types.MoneyType, by_value=True)
+    fraction_digits = marshmallow.fields.Integer(
+        allow_none=True, missing=None, data_key="fractionDigits"
+    )
 
     class Meta:
         unknown = marshmallow.EXCLUDE