From 7f41260e1caa3636bb643280b4d461db107838ff Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Mon, 25 Sep 2023 18:11:25 +0200 Subject: [PATCH 1/2] Use "main" as default branch name --- .github/workflows/doconfly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/doconfly.yml b/.github/workflows/doconfly.yml index a720a66..c256435 100644 --- a/.github/workflows/doconfly.yml +++ b/.github/workflows/doconfly.yml @@ -2,7 +2,7 @@ name: doconfly on: push: branches: - - master + - main tags: - "*" From e3341da3e468f5abf4ad5df2cd18f8ac36d6f37e Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Sat, 16 Mar 2024 11:45:58 +0100 Subject: [PATCH 2/2] Use ruff instead of flake8 and isort --- .github/workflows/tests.yml | 4 +--- pyproject.toml | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 785c1e0..bceedfa 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,6 +26,4 @@ jobs: - name: Launch tests run: python -m pytest - name: Check coding style - run: python -m flake8 - - name: Check imports order - run: python -m isort . --check --diff + run: python -m ruff check diff --git a/pyproject.toml b/pyproject.toml index bf44e32..fd54b5a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ Donation = 'https://opencollective.com/courtbouillon' [project.optional-dependencies] doc = ['sphinx', 'sphinx_rtd_theme'] -test = ['pytest', 'isort', 'flake8'] +test = ['pytest', 'ruff'] [tool.flit.sdist] exclude = ['.*'] @@ -54,6 +54,6 @@ include = ['tests/*', 'pyphen/*'] exclude_lines = ['pragma: no cover', 'def __repr__', 'raise NotImplementedError'] omit = ['.*'] -[tool.isort] -default_section = 'FIRSTPARTY' -multi_line_output = 4 +[tool.ruff.lint] +select = ['E', 'W', 'F', 'I', 'N', 'RUF'] +ignore = ['RUF001', 'RUF002', 'RUF003']