From 840983f36ee246dfb62647cfde682ce9caff8c50 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Wed, 29 Apr 2020 20:25:55 +0200 Subject: [PATCH] Fixed wrong inheritance --- jeeves/core/actions/docker.py | 5 ++--- jeeves/core/actions/shell.py | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/jeeves/core/actions/docker.py b/jeeves/core/actions/docker.py index d1a1bc3..18bc6dc 100644 --- a/jeeves/core/actions/docker.py +++ b/jeeves/core/actions/docker.py @@ -2,7 +2,6 @@ import os.path from typing import Text, Optional import docker -import pydantic import requests from jeeves.core.objects import Result @@ -16,7 +15,7 @@ class DockerBuildAction(Action): id = "contrib/docker/build" verbose_name = "Build docker image" - class Parameters(pydantic.BaseModel): + class Parameters(Action.Parameters): """ """ @@ -42,7 +41,7 @@ class DockerRunAction(Action): id = "contrib/docker/run" verbose_name = "Execute docker container" - class Parameters(pydantic.BaseModel): + class Parameters(Action.Parameters): """ +----------------------+------+-----------+--------------------------------------------------------------+ | Parameter name | Type | Mandatory | Description | diff --git a/jeeves/core/actions/shell.py b/jeeves/core/actions/shell.py index ac0f54a..b7726bd 100644 --- a/jeeves/core/actions/shell.py +++ b/jeeves/core/actions/shell.py @@ -3,8 +3,6 @@ import tempfile import subprocess from typing import Text -import pydantic - from jeeves.core.objects import Result from jeeves.core.actions.base import Action @@ -29,7 +27,7 @@ class ScriptAction(Action): id = "contrib/script" verbose_name = "Execute script" - class Parameters(pydantic.BaseModel): + class Parameters(Action.Parameters): """ +----------------+------+-----------+---------------------------+ | Parameter name | Type | Mandatory | Description |