diff --git a/conanfile.py b/conanfile.py index 1f5d68de..a2189cd9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -20,15 +20,17 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +import os +import re + from conan import ConanFile -from conan.tools.cmake import CMakeToolchain, CMakeDeps, CMake +from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain from conan.tools.files import copy, load, rmdir from conan.tools.scm import Version -from conans.tools import ( - get_env, +from conans.tools import ( # TODO replace with new tools for Conan 2.0 check_min_cppstd, -) # TODO replace with new tools for Conan 2.0 -import os, re + get_env, +) required_conan_version = ">=1.48.0" diff --git a/docs/conf.py b/docs/conf.py index 1dbe5187..9c997601 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -10,30 +10,30 @@ """ import re -import sphinx_rtd_theme +import sphinx_rtd_theme from pygments.lexer import ( RegexLexer, - include, bygroups, - using, - this, - inherit, default, + include, + inherit, + this, + using, words, ) -from pygments.util import get_bool_opt from pygments.token import ( - Text, Comment, - Operator, + Error, Keyword, Name, - String, Number, + Operator, Punctuation, - Error, + String, + Text, ) +from pygments.util import get_bool_opt from sphinx.highlighting import lexers @@ -482,7 +482,9 @@ lexers["cpp"] = MyCppLexer(startinline=True) # For a full list see the documentation: # https://www.sphinx-doc.org/en/master/usage/configuration.html -import subprocess, os, re +import os +import re +import subprocess def get_version(): diff --git a/test_package/conanfile.py b/test_package/conanfile.py index 9a98ad73..bad61ec8 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -20,8 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from conans import ConanFile, tools from conan.tools.cmake import CMake +from conans import ConanFile, tools class TestPackageConan(ConanFile):