Merge pull request #161 from Flared/fix-deprecation-warnings

Author: desert-bot

.github/workflows/ci.yml

@@ -18,7 +18,6 @@ jobs:
         os:
           - ubuntu-latest
         toxenv:
-          - py36,report,codecov
           - py37,report,codecov
           - py38,report,codecov
           - py39,report,codecov

changelog.d/161.breaking.rst

@@ -0,0 +1,2 @@
+Update all project dependencies and fix all deprecated warnings. Python 3.6
+support was dropped to allow updating deprecated dependencies.

dev-requirements.txt

@@ -1,32 +1,34 @@
 #
-# This file is autogenerated by pip-compile with python 3.6
+# This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
 #    python pycli lock
 #
-attrs==21.2.0 \
-    --hash=sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1 \
-    --hash=sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
+attrs==22.1.0 \
+    --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \
+    --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c
     # via -r requirements.in
-dataclasses==0.8 ; python_version < "3.7" \
-    --hash=sha256:0201d89fa866f68c8ebd9d08ee6ff50c0b255f8ec63a71c16fda7af82bb887bf \
-    --hash=sha256:8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97
-    # via -r requirements.in
-marshmallow==3.13.0 \
-    --hash=sha256:c67929438fd73a2be92128caa0325b1b5ed8b626d91a094d2f7f2771bf1f1c0e \
-    --hash=sha256:dd4724335d3c2b870b641ffe4a2f8728a1380cd2e7e2312756715ffeaa82b842
+marshmallow==3.18.0 \
+    --hash=sha256:35e02a3a06899c9119b785c12a22f4cda361745d66a71ab691fd7610202ae104 \
+    --hash=sha256:6804c16114f7fce1f5b4dadc31f4674af23317fcc7f075da21e35c1a35d781f7
     # via -r requirements.in
 mypy-extensions==0.4.3 \
     --hash=sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d \
     --hash=sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8
     # via typing-inspect
-typing-extensions==3.10.0.0 \
-    --hash=sha256:0ac0f89795dd19de6b97debb0c6af1c70987fd80a2d62d1958f7e56fcc31b497 \
-    --hash=sha256:50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342 \
-    --hash=sha256:779383f6086d90c99ae41cf0ff39aac8a7937a9283ce0a414e5dd782f4c94a84
+packaging==21.3 \
+    --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
+    --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522
+    # via marshmallow
+pyparsing==3.0.9 \
+    --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \
+    --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc
+    # via packaging
+typing-extensions==4.3.0 \
+    --hash=sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02 \
+    --hash=sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6
     # via typing-inspect
-typing-inspect==0.7.1 \
-    --hash=sha256:047d4097d9b17f46531bf6f014356111a1b6fb821a24fe7ac909853ca2a782aa \
-    --hash=sha256:3cd7d4563e997719a710a3bfe7ffb544c6b72069b6812a02e9b414a8fa3aaa6b \
-    --hash=sha256:b1f56c0783ef0f25fb064a01be6e5407e54cf4a4bf4f3ba3fe51e0bd6dcea9e5
+typing-inspect==0.8.0 \
+    --hash=sha256:5fbf9c1e65d4fa01e701fe12a5bca6c6e08a4ffd5bc60bfac028253a447c5188 \
+    --hash=sha256:8b1ff0c400943b6145df8119c41c244ca8207f1f10c9c057aeed1560e4806e3d
     # via -r requirements.in

requirements.txt

@@ -14,10 +14,12 @@ python_files =
     tests.py
 addopts =
     -ra
-    --strict
+    --strict-markers
     --doctest-modules
     --doctest-glob=\*.rst
     --tb=short
+filterwarnings =
+    error
 
 [isort]
 force_single_line = True

setup.cfg

@@ -76,9 +76,9 @@ def read_extras(*prefixes):
         "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         # uncomment if you test on these interpreters:

setup.py

@@ -186,7 +186,7 @@ def field_for_schema(
     >>> int_field.__class__
     <class 'marshmallow.fields.Integer'>
 
-    >>> int_field.default
+    >>> int_field.dump_default
     9
     >>> field_for_schema(t.Dict[str,str]).__class__
     <class 'marshmallow.fields.Dict'>
@@ -200,7 +200,7 @@ def field_for_schema(
     <class 'marshmallow_union.Union'>
     >>> field_for_schema(t.NewType('UserId', int)).__class__
     <class 'marshmallow.fields.Integer'>
-    >>> field_for_schema(t.NewType('UserId', int), default=0).default
+    >>> field_for_schema(t.NewType('UserId', int), default=0).dump_default
     0
     >>> class Color(enum.Enum):
     ...   red = 1
@@ -219,9 +219,9 @@ def field_for_schema(
     metadata[_DESERT_SENTINEL] = desert_metadata
 
     if default is not marshmallow.missing:
-        desert_metadata.setdefault("default", default)
+        desert_metadata.setdefault("dump_default", default)
         desert_metadata.setdefault("allow_none", True)
-        desert_metadata.setdefault("missing", default)
+        desert_metadata.setdefault("load_default", default)
 
     field = None
 
@@ -237,7 +237,7 @@ def field_for_schema(
 
     # Base types
     if not field and typ in _native_to_marshmallow:
-        field = _native_to_marshmallow[typ](default=default)
+        field = _native_to_marshmallow[typ](dump_default=default)
 
     # Generic types
     origin = typing_inspect.get_origin(typ)
@@ -279,13 +279,17 @@ def field_for_schema(
         elif typing_inspect.is_optional_type(typ):
             [subtyp] = (t for t in arguments if t is not NoneType)
             # Treat optional types as types with a None default
-            metadata[_DESERT_SENTINEL]["default"] = metadata.get("default", None)
-            metadata[_DESERT_SENTINEL]["missing"] = metadata.get("missing", None)
+            metadata[_DESERT_SENTINEL]["dump_default"] = metadata.get(
+                "dump_default", None
+            )
+            metadata[_DESERT_SENTINEL]["load_default"] = metadata.get(
+                "load_default", None
+            )
             metadata[_DESERT_SENTINEL]["required"] = False
 
             field = field_for_schema(subtyp, metadata=metadata, default=None)
-            field.default = None
-            field.missing = None
+            field.dump_default = None
+            field.load_default = None
             field.allow_none = True
 
         elif typing_inspect.is_union_type(typ):
@@ -315,11 +319,11 @@ def field_for_schema(
 
     field.metadata.update(metadata)
 
-    for key in ["default", "missing", "required", "marshmallow_field"]:
+    for key in ["dump_default", "load_default", "required", "marshmallow_field"]:
         if key in metadata.keys():
             metadata[_DESERT_SENTINEL][key] = metadata.pop(key)
 
-    if field.default == field.missing == default == marshmallow.missing:
+    if field.dump_default == field.load_default == default == marshmallow.missing:
         field.required = True
 
     return field
@@ -346,7 +350,7 @@ def _get_field_default(
     if isinstance(field, dataclasses.Field):
         # misc: https://github.com/python/mypy/issues/10750
         # comparison-overlap: https://github.com/python/typeshed/pull/5900
-        if field.default_factory != dataclasses.MISSING:  # type: ignore[misc,comparison-overlap]
+        if field.default_factory != dataclasses.MISSING:
             return dataclasses.MISSING
         if field.default is dataclasses.MISSING:
             return marshmallow.missing