From 81bc4cc04a6e1648a73f19eb01e4a78aff2398a2 Mon Sep 17 00:00:00 2001 From: Sergey Golitsynskiy Date: Fri, 23 Aug 2019 18:01:57 -0400 Subject: [PATCH] Fix linting errors (import stms order) --- lib/galaxy/config/config_manage.py | 2 +- lib/galaxy/config/schema.py | 2 +- lib/galaxy/util/yaml_util.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/config/config_manage.py b/lib/galaxy/config/config_manage.py index 26b3ed3de31..3843fc0f7ee 100644 --- a/lib/galaxy/config/config_manage.py +++ b/lib/galaxy/config/config_manage.py @@ -29,9 +29,9 @@ from galaxy.config.schema import AppSchema, Schema from galaxy.util import safe_makedirs from galaxy.util.properties import nice_config_parser from galaxy.util.yaml_util import ( + OPTION_DEFAULTS, ordered_dump, ordered_load, - OPTION_DEFAULTS, ) diff --git a/lib/galaxy/config/schema.py b/lib/galaxy/config/schema.py index 21f45ef0031..ec9f98eddd6 100644 --- a/lib/galaxy/config/schema.py +++ b/lib/galaxy/config/schema.py @@ -1,6 +1,6 @@ from galaxy.util.yaml_util import ( - ordered_load, OPTION_DEFAULTS, + ordered_load, ) diff --git a/lib/galaxy/util/yaml_util.py b/lib/galaxy/util/yaml_util.py index ed5f1b8795c..9283e147eab 100644 --- a/lib/galaxy/util/yaml_util.py +++ b/lib/galaxy/util/yaml_util.py @@ -1,7 +1,8 @@ import os -import yaml from collections import OrderedDict +import yaml + OPTION_DEFAULTS = { "type": "str",