new utils module, tidy imports

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020
+Copyright (c) 2021
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,3 @@
-
 [![](https://img.shields.io/pypi/v/foliantcontrib.swaggerdoc.svg)](https://pypi.org/project/foliantcontrib.swaggerdoc/)  [![](https://img.shields.io/github/v/tag/foliant-docs/foliantcontrib.swaggerdoc.svg?label=GitHub)](https://github.com/foliant-docs/foliantcontrib.swaggerdoc)
 
 # Swagger API Docs Generator for Foliant

changelog.md

@@ -1,3 +1,7 @@
+# 1.2.4
+
+- New utils module.
+
 # 1.2.3
 
 - Fix: build failed when spec referenced to other files with $ref.

foliant/preprocessors/swaggerdoc/swaggerdoc.py

@@ -3,27 +3,31 @@
 Generates documentation from Swagger.
 '''
 
-import os
-import traceback
 import json
-from ruamel import yaml
-from pathlib import Path, PosixPath
-from urllib.request import urlretrieve
-from urllib.error import HTTPError, URLError
+import os
+
 from distutils.dir_util import remove_tree
-from shutil import copyfile
-from jinja2 import Environment, FileSystemLoader
+from pathlib import Path
+from pathlib import PosixPath
 from pkg_resources import resource_filename
-from subprocess import run, PIPE
-
-from foliant.preprocessors.utils.preprocessor_ext import (BasePreprocessorExt,
-                                                          allow_fail)
-from foliant.preprocessors.utils.combined_options import (Options,
-                                                          CombinedOptions,
-                                                          validate_exists,
-                                                          validate_in,
-                                                          rel_path_convertor)
-from foliant.utils import output
+from shutil import copyfile
+from subprocess import PIPE
+from subprocess import run
+from urllib.error import HTTPError
+from urllib.error import URLError
+from urllib.request import urlretrieve
+
+from jinja2 import Environment
+from jinja2 import FileSystemLoader
+from ruamel import yaml
+
+from foliant.contrib.combined_options import CombinedOptions
+from foliant.contrib.combined_options import Options
+from foliant.contrib.combined_options import rel_path_convertor
+from foliant.contrib.combined_options import validate_exists
+from foliant.contrib.combined_options import validate_in
+from foliant.preprocessors.utils.preprocessor_ext import BasePreprocessorExt
+from foliant.preprocessors.utils.preprocessor_ext import allow_fail
 
 
 class Preprocessor(BasePreprocessorExt):

setup.py

@@ -16,7 +16,7 @@
     description=SHORT_DESCRIPTION,
     long_description=LONG_DESCRIPTION,
     long_description_content_type='text/markdown',
-    version='1.2.3',
+    version='1.2.4',
     author='Daniil Minukhin',
     author_email='[email protected]',
     packages=['foliant.preprocessors.swaggerdoc'],
@@ -27,8 +27,7 @@
         'foliant>=1.0.5',
         'jinja2',
         'ruamel.yaml',
-        'foliantcontrib.utils.combined_options>=1.0.7',
-        'foliantcontrib.utils.preprocessor_ext',
+        'foliantcontrib.utils>=1.0.2',
     ],
     classifiers=[
         "Development Status :: 5 - Production/Stable",