From dcb0b26683bd337254fdeb165d2c1a9317120715 Mon Sep 17 00:00:00 2001 From: Samuel Gaist <samuel.gaist@idiap.ch> Date: Thu, 21 Mar 2024 14:07:37 +0100 Subject: [PATCH] [ruff] Add missing lines-between-types settings from isort --- doc/conf.py | 1 + pyproject.toml | 4 ++++ src/idiap_devtools/gitlab/__init__.py | 1 + src/idiap_devtools/gitlab/release.py | 2 ++ tests/test_release.py | 1 + 5 files changed, 9 insertions(+) diff --git a/doc/conf.py b/doc/conf.py index 2a9689c..a1c4873 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -4,6 +4,7 @@ import pathlib import time + from importlib.metadata import distribution # -- General configuration ----------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index a18dee2..efff5fe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -131,6 +131,10 @@ ignore = [ "ISC001", # https://docs.astral.sh/ruff/rules/single-line-implicit-string-concatenation/ ] +[tool.ruff.lint.isort] +# Use a single line between direct and from import. +lines-between-types = 1 + [tool.ruff.lint.pydocstyle] convention = "numpy" diff --git a/src/idiap_devtools/gitlab/__init__.py b/src/idiap_devtools/gitlab/__init__.py index 977b1f0..cc14423 100644 --- a/src/idiap_devtools/gitlab/__init__.py +++ b/src/idiap_devtools/gitlab/__init__.py @@ -9,6 +9,7 @@ import pathlib import shutil import tarfile import tempfile + from io import BytesIO import gitlab diff --git a/src/idiap_devtools/gitlab/release.py b/src/idiap_devtools/gitlab/release.py index ecbb498..e14656a 100644 --- a/src/idiap_devtools/gitlab/release.py +++ b/src/idiap_devtools/gitlab/release.py @@ -7,12 +7,14 @@ import difflib import logging import re import time + from distutils.version import StrictVersion import gitlab import gitlab.v4.objects import packaging.version import tomlkit + from git import Repo from pkg_resources import Requirement diff --git a/tests/test_release.py b/tests/test_release.py index f7808b6..1b5099c 100644 --- a/tests/test_release.py +++ b/tests/test_release.py @@ -3,6 +3,7 @@ # SPDX-License-Identifier: BSD-3-Clause import pytest + from idiap_devtools.gitlab import release from pkg_resources import Requirement -- GitLab