From 97e9459c65a0053ad59cc06845eb09bcafbd694a Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 15 Sep 2024 21:16:50 +0200 Subject: [PATCH] Sort imports with isort --- flake.nix | 1 + ros2nix/ros2nix.py | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 7945bdc..d4b062c 100644 --- a/flake.nix +++ b/flake.nix @@ -86,6 +86,7 @@ pkgs.bashInteractive pkgs.python3Packages.flake8 pkgs.python3Packages.flake8-bugbear + pkgs.python3Packages.isort ]; ROSDEP_SOURCE_PATH = "${rosdistro}/rosdep/sources.list.d"; ROSDISTRO_INDEX_URL = "file://${rosdistro}/index-v4.yaml"; diff --git a/ros2nix/ros2nix.py b/ros2nix/ros2nix.py index 8592b23..419c932 100755 --- a/ros2nix/ros2nix.py +++ b/ros2nix/ros2nix.py @@ -3,14 +3,6 @@ # Copyright 2019-2024 Ben Wolsieffer # Copyright 2024 Michal Sojka -from .nix_expression import NixExpression, NixLicense -from catkin_pkg.package import parse_package_string, Package -from superflore.exceptions import UnresolvedDependency -from superflore.generators.nix.nix_package import NixPackage -from superflore.utils import err, ok, warn -from superflore.utils import resolve_dep -from textwrap import dedent, indent -from typing import Iterable, Set import argparse import itertools import json @@ -18,6 +10,16 @@ import os import re import subprocess import sys +from contextlib import contextmanager +from textwrap import dedent, indent +from typing import Iterable, Set + +from catkin_pkg.package import Package, parse_package_string +from superflore.exceptions import UnresolvedDependency +from superflore.generators.nix.nix_package import NixPackage +from superflore.utils import err, ok, resolve_dep, warn + +from .nix_expression import NixExpression, NixLicense def resolve_dependencies(deps: Iterable[str]) -> Set[str]: