Update linters

Author: Zac-HD

deps/check.in

@@ -1,12 +1,17 @@
 # Top-level dependencies for `tox -e check`
 flake8
+flake8-2020
 flake8-bandit
 flake8-bugbear
 flake8-builtins
 flake8-comprehensions
+flake8-datetimez
 flake8-docstrings
+flake8-mutable
+# flake8-noqa  # See https://github.com/JBKahn/flake8-print/issues/50
 flake8-print
+flake8-simplify
+flake8-strftime
 mypy
 pep8-naming
 shed
-com2ann  # via shed; workaround for missing python_requires

deps/check.txt

@@ -4,6 +4,8 @@
 #
 #    pip-compile --output-file=deps/check.txt deps/check.in
 #
+astor==0.8.1
+    # via flake8-simplify
 attrs==21.2.0
     # via flake8-bugbear
 autoflake==1.4
@@ -12,50 +14,70 @@ bandit==1.7.0
     # via flake8-bandit
 black==21.9b0
     # via shed
-click==8.0.1
+click==8.0.3
     # via black
 colorama==0.4.4
     # via
     #   bandit
     #   click
-com2ann==0.1.1
-    # via -r deps/check.in
-flake8==3.9.2
+com2ann==0.3.0
+    # via shed
+flake8==4.0.1
     # via
     #   -r deps/check.in
+    #   flake8-2020
     #   flake8-bandit
     #   flake8-bugbear
     #   flake8-builtins
     #   flake8-comprehensions
+    #   flake8-datetimez
     #   flake8-docstrings
+    #   flake8-helper
+    #   flake8-mutable
     #   flake8-polyfill
     #   flake8-print
+    #   flake8-simplify
+    #   flake8-strftime
     #   pep8-naming
+flake8-2020==1.6.0
+    # via -r deps/check.in
 flake8-bandit==2.1.2
     # via -r deps/check.in
 flake8-bugbear==21.9.2
     # via -r deps/check.in
 flake8-builtins==1.5.3
     # via -r deps/check.in
-flake8-comprehensions==3.6.1
+flake8-comprehensions==3.7.0
+    # via -r deps/check.in
+flake8-datetimez==20.10.0
     # via -r deps/check.in
 flake8-docstrings==1.6.0
     # via -r deps/check.in
+flake8-helper==0.1.1
+    # via flake8-strftime
+flake8-mutable==1.2.0
+    # via -r deps/check.in
 flake8-polyfill==1.0.2
     # via
     #   flake8-bandit
     #   pep8-naming
 flake8-print==4.0.0
     # via -r deps/check.in
-gitdb==4.0.7
+flake8-simplify==0.14.2
+    # via -r deps/check.in
+flake8-strftime==0.3.2
+    # via -r deps/check.in
+gitdb==4.0.9
     # via gitpython
 gitpython==3.1.24
     # via bandit
-importlib-metadata==4.8.1
+importlib-metadata==4.2.0
     # via
     #   click
     #   flake8
+    #   flake8-2020
     #   flake8-comprehensions
+    #   flake8-simplify
     #   stevedore
 isort==5.9.3
     # via shed
@@ -78,42 +100,42 @@ pep8-naming==0.12.1
     # via -r deps/check.in
 platformdirs==2.4.0
     # via black
-pycodestyle==2.7.0
+pycodestyle==2.8.0
     # via
     #   flake8
     #   flake8-bandit
     #   flake8-print
 pydocstyle==6.1.1
     # via flake8-docstrings
-pyflakes==2.3.1
+pyflakes==2.4.0
     # via
     #   autoflake
     #   flake8
 pyupgrade==2.29.0
     # via shed
-pyyaml==5.4.1
+pyyaml==6.0
     # via
     #   bandit
     #   libcst
-regex==2021.9.30
+regex==2021.10.23
     # via black
-shed==0.5.0
+shed==0.5.3
     # via -r deps/check.in
 six==1.16.0
     # via
     #   bandit
     #   flake8-print
-smmap==4.0.0
+smmap==5.0.0
     # via gitdb
 snowballstemmer==2.1.0
     # via pydocstyle
-stevedore==3.4.0
+stevedore==3.5.0
     # via bandit
-tokenize-rt==4.1.0
+tokenize-rt==4.2.1
     # via pyupgrade
 toml==0.10.2
     # via mypy
-tomli==1.2.1
+tomli==1.2.2
     # via black
 typed-ast==1.4.3
     # via
@@ -129,5 +151,3 @@ typing-extensions==3.10.0.2
     #   typing-inspect
 typing-inspect==0.7.1
     # via libcst
-zipp==3.6.0
-    # via importlib-metadata

deps/test.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile --output-file=deps/test.txt deps/test.in setup.py
 #
-arrow==1.2.0
+arrow==1.2.1
     # via isoduration
 atomicwrites==1.4.0
     # via pytest
@@ -17,15 +17,15 @@ cached-property==1.5.2
     # via fqdn
 colorama==0.4.4
     # via pytest
-coverage==6.0
+coverage[toml]==6.0.2
     # via pytest-cov
 execnet==1.9.0
     # via pytest-xdist
 fqdn==1.5.1
     # via jsonschema
-hypothesis==6.23.1
+hypothesis==6.24.0
     # via hypothesis-jsonschema (setup.py)
-idna==3.2
+idna==3.3
     # via jsonschema
 importlib-metadata==4.8.1
     # via
@@ -38,7 +38,7 @@ isoduration==20.11.0
     # via jsonschema
 jsonpointer==2.1
     # via jsonschema
-jsonschema[format]==4.0.1
+jsonschema[format]==4.1.2
     # via
     #   -r deps/test.in
     #   hypothesis-jsonschema (setup.py)
@@ -50,7 +50,7 @@ py==1.10.0
     # via
     #   pytest
     #   pytest-forked
-pyparsing==2.4.7
+pyparsing==3.0.1
     # via packaging
 pyrsistent==0.18.0
     # via jsonschema
@@ -60,7 +60,7 @@ pytest==6.2.5
     #   pytest-cov
     #   pytest-forked
     #   pytest-xdist
-pytest-cov==2.12.1
+pytest-cov==3.0.0
     # via -r deps/test.in
 pytest-forked==1.3.0
     # via pytest-xdist
@@ -79,9 +79,9 @@ six==1.16.0
 sortedcontainers==2.4.0
     # via hypothesis
 toml==0.10.2
-    # via
-    #   pytest
-    #   pytest-cov
+    # via pytest
+tomli==1.2.2
+    # via coverage
 typing-extensions==3.10.0.2
     # via
     #   arrow

setup.py

@@ -1,4 +1,5 @@
 import os
+import pathlib
 
 import setuptools
 
@@ -46,7 +47,7 @@ def local_file(name: str) -> str:
         "Topic :: Software Development :: Testing",
         "Typing :: Typed",
     ],
-    long_description=open(README).read(),
+    long_description=pathlib.Path(README).read_text(),
     long_description_content_type="text/markdown",
     keywords="python testing fuzzing property-based-testing json-schema",
 )

src/hypothesis_jsonschema/_canonicalise.py

@@ -211,7 +211,7 @@ def canonicalish(schema: JSONType) -> Dict[str, Any]:
     This is obviously incomplete, but improves best-effort recognition of
     equivalent schemas and makes conversion logic simpler.
     """
-    if schema is True:
+    if schema is True:  # noqa: SIM114
         return {}
     elif schema is False:
         return {"not": {}}
@@ -245,13 +245,16 @@ def canonicalish(schema: JSONType) -> Dict[str, Any]:
     if_ = schema.pop("if", None)
     then = schema.pop("then", schema)
     else_ = schema.pop("else", schema)
-    if if_ is not None and (then is not schema or else_ is not schema):
-        if then not in (if_, TRUTHY) or else_ != TRUTHY:
-            alternatives = [
-                {"allOf": [if_, then, schema]},
-                {"allOf": [{"not": if_}, else_, schema]},
-            ]
-            schema = canonicalish({"anyOf": alternatives})
+    if (
+        if_ is not None
+        and (then is not schema or else_ is not schema)
+        and (then not in (if_, TRUTHY) or else_ != TRUTHY)
+    ):
+        alternatives = [
+            {"allOf": [if_, then, schema]},
+            {"allOf": [{"not": if_}, else_, schema]},
+        ]
+        schema = canonicalish({"anyOf": alternatives})
     assert isinstance(schema, dict)
     # Recurse into the value of each keyword with a schema (or list of them) as a value
     for key in SCHEMA_KEYS:
@@ -395,7 +398,7 @@ def canonicalish(schema: JSONType) -> Dict[str, Any]:
         type_.remove("object")
     # Discard dependencies values that don't restrict anything
     for k, v in schema.get("dependencies", {}).copy().items():
-        if v == [] or v == TRUTHY:
+        if v in ([], TRUTHY):
             schema["dependencies"].pop(k)
     # Remove no-op keywords
     for kw, identity in {
@@ -438,15 +441,13 @@ def canonicalish(schema: JSONType) -> Dict[str, Any]:
         max_ = schema.get("maxProperties", float("inf"))
         assert isinstance(max_, (int, float))
         properties = schema.get("properties", {})
-        if len(schema["required"]) > max_:
-            type_.remove("object")
-        elif any(properties.get(name, {}) == FALSEY for name in schema["required"]):
+        propnames_validator = make_validator(schema.get("propertyNames", {})).is_valid
+        if (
+            len(schema["required"]) > max_
+            or any(properties.get(name, {}) == FALSEY for name in schema["required"])
+            or not all(propnames_validator(name) for name in schema["required"])
+        ):
             type_.remove("object")
-        else:
-            propnames = schema.get("propertyNames", {})
-            validator = make_validator(propnames)
-            if not all(validator.is_valid(name) for name in schema["required"]):
-                type_.remove("object")
 
     for t, kw in TYPE_SPECIFIC_KEYS:
         numeric = {"number", "integer"}
@@ -719,7 +720,7 @@ def merged(schemas: List[Any]) -> Optional[Schema]:
         if "contains" in out and "contains" in s and out["contains"] != s["contains"]:
             # If one `contains` schema is a subset of the other, we can discard it.
             m = merged([out["contains"], s["contains"]])
-            if m == out["contains"] or m == s["contains"]:
+            if m in (out["contains"], s["contains"]):
                 out["contains"] = m
                 s.pop("contains")
         if "not" in out and "not" in s and out["not"] != s["not"]:

src/hypothesis_jsonschema/_from_schema.py

@@ -291,9 +291,9 @@ def zfill(width: int) -> Callable[[int], str]:
         return st.one_of(st.just("Z"), rfc3339("time-numoffset"))
     if name == "partial-time":
         return st.times().map(str)
-    if name == "date" or name == "full-date":
+    if name in ("date", "full-date"):
         return st.dates().map(str)
-    if name == "time" or name == "full-time":
+    if name in ("time", "full-time"):
         return st.tuples(rfc3339("partial-time"), rfc3339("time-offset")).map("".join)
     assert name == "date-time"
     return st.tuples(rfc3339("full-date"), rfc3339("full-time")).map("T".join)

tests/fetch.py

@@ -21,6 +21,7 @@ def get_json(url: str) -> Any:
         return json.load(handle)
 
 
+"""
 # Load cached schemas, so we cope with flaky connections and keep deleted entries
 try:
     with open("tests/corpus-schemastore-catalog.json") as f:
@@ -54,6 +55,7 @@ def add_future(name: str, url: str) -> None:
 # Dump them all back to the catalog file.
 with open("tests/corpus-schemastore-catalog.json", mode="w") as f:
     json.dump(schemata, f, indent=4, sort_keys=True)
+"""
 
 
 # Part two: fetch the official jsonschema compatibility test suite

tests/test_version.py

@@ -1,7 +1,7 @@
 """Tests for the hypothesis-jsonschema library."""
 
 import re
-from datetime import date
+from datetime import datetime, timezone
 from functools import lru_cache
 from pathlib import Path
 from typing import NamedTuple
@@ -33,7 +33,7 @@ def get_releases():
 def test_last_release_against_changelog():
     last_version, last_date = get_releases()[0]
     assert last_version == Version.from_string(hypothesis_jsonschema.__version__)
-    assert last_date <= date.today().isoformat()
+    assert last_date <= datetime.now(timezone.utc).date().isoformat()
 
 
 def test_changelog_is_ordered():