Use pre-commit hook from jsonschema-gentypes

camptocamp · Apr 4, 2023 · e9fa87a · e9fa87a
1 parent 0715a3d
commit e9fa87a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 67 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -28,6 +28,15 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: mixed-line-ending
+  - repo: https://github.com/camptocamp/jsonschema-gentypes
+    rev: 1.6.0
+    hooks:
+      - id: jsonschema-gentypes
+        files: |-
+          (?x)(
+            ĵsonschema-gentypes.yaml$
+            |^c2cciutils/schema.*\.json$
+          )
   - repo: https://github.com/sbrunner/hooks
     rev: 0.5.0
     hooks:

diff --git a/c2cciutils/configuration.py b/c2cciutils/configuration.py
@@ -82,10 +82,6 @@ class Audit(TypedDict, total=False):
     outdated_versions: "AuditOutdatedVersions"
     snyk: "AuditWithSnyk"
     print_versions: "PrintVersions"
-    """
-    WARNING: The required are not correctly taken in account,
-    See: https://github.com/camptocamp/jsonschema-gentypes/issues/6
-    """
 
 
 AuditOutdatedVersions = bool
@@ -358,10 +354,6 @@ class Checks(TypedDict, total=False):
     snyk_fix: "ChecksWithSnykFix"
     prettier: "ChecksPrettier"
     print_versions: "PrintVersions"
-    """
-    WARNING: The required are not correctly taken in account,
-    See: https://github.com/camptocamp/jsonschema-gentypes/issues/6
-    """
 
 
 ChecksBlack = Union["ChecksBlackConfig", bool]
@@ -628,23 +620,11 @@ class ChecksSnykIacConfiguration(TypedDict, total=False):
 Configuration = TypedDict(
     "Configuration",
     {
-        # WARNING: The required are not correctly taken in account,
-        # See: https://github.com/camptocamp/jsonschema-gentypes/issues/6
         "audit": "Audit",
-        # WARNING: The required are not correctly taken in account,
-        # See: https://github.com/camptocamp/jsonschema-gentypes/issues/6
         "checks": "Checks",
-        # WARNING: The required are not correctly taken in account,
-        # See: https://github.com/camptocamp/jsonschema-gentypes/issues/6
         "pr-checks": "PullRequestChecks",
-        # WARNING: The required are not correctly taken in account,
-        # See: https://github.com/camptocamp/jsonschema-gentypes/issues/6
         "publish": "Publish",
-        # WARNING: The required are not correctly taken in account,
-        # See: https://github.com/camptocamp/jsonschema-gentypes/issues/6
         "version": "Version",
-        # WARNING: The required are not correctly taken in account,
-        # See: https://github.com/camptocamp/jsonschema-gentypes/issues/6
         "k8s": "K8SConfiguration",
     },
     total=False,
@@ -755,16 +735,7 @@ class K8SConfiguration(TypedDict, total=False):
     """
 
     k3d: "K3DConfiguration"
-    """
-    WARNING: The required are not correctly taken in account,
-    See: https://github.com/camptocamp/jsonschema-gentypes/issues/6
-    """
-
     db: "DbConfiguration"
-    """
-    WARNING: The required are not correctly taken in account,
-    See: https://github.com/camptocamp/jsonschema-gentypes/issues/6
-    """
 
 
 K8S_CONFIGURATION_DEFAULT: Dict[str, Any] = {}
@@ -931,10 +902,6 @@ class Publish(TypedDict, total=False):
     helm: "PublishHelm"
     google_calendar: "PublishGoogleCalendar"
     print_versions: "PrintVersions"
-    """
-    WARNING: The required are not correctly taken in account,
-    See: https://github.com/camptocamp/jsonschema-gentypes/issues/6
-    """
 
 
 PublishDocker = Union["PublishDockerConfig", Literal[False]]
@@ -993,10 +960,6 @@ class PublishDockerConfig(TypedDict, total=False):
     """
 
     snyk: "_PublishDockerConfigSnyk"
-    """
-    WARNING: The required are not correctly taken in account,
-    See: https://github.com/camptocamp/jsonschema-gentypes/issues/6
-    """
 
 
 class PublishDockerImage(TypedDict, total=False):

diff --git a/jsonschema-gentypes.yaml b/jsonschema-gentypes.yaml
@@ -2,9 +2,12 @@ headers: |
   """
   Automatically generated file from a JSON schema.
   """
-callbacks:
-  - - black
-  - - isort
+
+pre_commit:
+  enabled: true
+  arguments:
+    - --color=never
+
 generate:
   - source: c2cciutils/schema.json
     destination: c2cciutils/configuration.py

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -90,7 +90,6 @@ google-auth-httplib2 = { version = "0.1.0", optional = true }
 google-auth-oauthlib = { version = "1.0.0", optional = true }
 "ruamel.yaml" = "0.17.21"
 jsonschema = "4.17.3"
-jsonschema-gentypes = "1.5.0"
 node-vm2 = "0.4.5"
 defusedxml = "0.7.1"
 black = { version = "22.12.0", optional = true }