Skip to content

Commit

Permalink
Use isort --profile=google for making ROS folks happy
Browse files Browse the repository at this point in the history
  • Loading branch information
nachovizzo committed Jan 17, 2024
1 parent 2f1b06b commit 0a8eb5d
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 9 deletions.
11 changes: 7 additions & 4 deletions ament_black/ament_black/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,17 @@
import sys
import tempfile
import time
from xml.sax.saxutils import escape, quoteattr
from xml.sax.saxutils import escape
from xml.sax.saxutils import quoteattr

import click
from black import get_sources, re_compile_maybe_verbose
from black import get_sources
from black import main as black
from black import re_compile_maybe_verbose
from black.concurrency import maybe_install_uvloop
from black.const import DEFAULT_EXCLUDES, DEFAULT_INCLUDES
from black.const import DEFAULT_EXCLUDES
from black.const import DEFAULT_INCLUDES
from black.report import Report
import click
from unidiff import PatchSet


Expand Down
10 changes: 10 additions & 0 deletions ament_black/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[tool.ruff]
line-length = 99

[tool.ruff.format]
quote-style = "single"
indent-style = "tab"
docstring-code-format = true

[tool.isort]
profile = "google"
3 changes: 2 additions & 1 deletion ament_black/setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from setuptools import find_packages, setup
from setuptools import find_packages
from setuptools import setup

package_name = 'ament_black'

Expand Down
2 changes: 1 addition & 1 deletion ament_black/test/test_copyright.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import pytest
from ament_copyright.main import main
import pytest


# Remove the `skip` decorator once the source file(s) have a copyright header
Expand Down
2 changes: 1 addition & 1 deletion ament_black/test/test_flake8.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import pytest
from ament_flake8.main import main_with_errors
import pytest


@pytest.mark.flake8
Expand Down
2 changes: 1 addition & 1 deletion ament_black/test/test_pep257.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import pytest
from ament_pep257.main import main
import pytest


@pytest.mark.linter
Expand Down
2 changes: 1 addition & 1 deletion ament_black/test/test_xmllint.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import pytest
from ament_xmllint.main import main
import pytest


@pytest.mark.linter
Expand Down

0 comments on commit 0a8eb5d

Please sign in to comment.