From 665ffd37d9f8377a5873c6622143165e92f79d6d Mon Sep 17 00:00:00 2001 From: Carlos de la Guardia Date: Wed, 28 Oct 2020 16:47:14 -0600 Subject: [PATCH] prevent error on breaking change from newer pydantic version --- questions/cli.py | 8 ++++---- setup.cfg | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/questions/cli.py b/questions/cli.py index 25d2ce3..e6fc858 100644 --- a/questions/cli.py +++ b/questions/cli.py @@ -37,9 +37,9 @@ def download_surveyjs(path, platform, theme): widgets_js = set() widgets_css = set() for question in QUESTION_TYPES: - extra_js = question.__field_defaults__.get("extra_js", []) + extra_js = question.__fields__.get("extra_js").get_default() widgets_js.update(extra_js) - extra_css = question.__field_defaults__.get("extra_css", []) + extra_css = question.__fields__.get("extra_css").get_default() widgets_css.update(extra_css) for url in js + css + list(widgets_js) + list(widgets_css): resource = requests.get(url, allow_redirects=True) @@ -75,7 +75,7 @@ def list_resources(platform, theme, include_widgets): click.echo() click.echo("Widget specific Javascript resources:") for question in QUESTION_TYPES: - extra_js = question.__field_defaults__.get("extra_js", []) + extra_js = question.__fields__.get("extra_js").get_default() if extra_js: click.echo() click.echo(f"{question.__name__}:") @@ -90,7 +90,7 @@ def list_resources(platform, theme, include_widgets): click.echo() click.echo("Widget specific CSS resources:") for question in QUESTION_TYPES: - extra_css = question.__field_defaults__.get("extra_css", []) + extra_css = question.__fields__.get("extra_css").get_default() if extra_css: click.echo() click.echo(f"{question.__name__}:") diff --git a/setup.cfg b/setup.cfg index 20ea94e..88049c3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,7 +20,3 @@ exclude = docs [aliases] # Define setup.py command aliases here test = pytest - -[tool:pytest] -collect_ignore = ['setup.py'] -