WIP Switch linting and formatting to ruff

Author: mdellweg

.ci/gen_certs.py

@@ -6,7 +6,6 @@
 
 
 def main() -> None:
-
     parser = argparse.ArgumentParser(prog="gen_certs")
     parser.add_argument(
         "-d",

.ci/scripts/collect_changes.py

@@ -3,8 +3,8 @@
 import itertools
 import os
 import re
-import tomllib
 
+import tomllib
 from git import GitCommandError, Repo
 from packaging.version import parse as parse_version
 

.ci/scripts/pr_labels.py

@@ -4,9 +4,9 @@
 
 import re
 import sys
-import tomllib
 from pathlib import Path
 
+import tomllib
 from git import Repo
 
 

.ci/scripts/validate_commit_message.py

@@ -2,9 +2,9 @@
 import re
 import subprocess
 import sys
-import tomllib
 from pathlib import Path
 
+import tomllib
 from github import Github
 
 with open("pyproject.toml", "rb") as fp:

Makefile

@@ -3,29 +3,28 @@ LANGUAGES=de
 GLUE_PLUGINS=$(notdir $(wildcard pulp-glue/pulp_glue/*))
 CLI_PLUGINS=$(notdir $(wildcard pulpcore/cli/*))
 
+.PHONY: info
 info:
 	@echo Pulp glue
 	@echo plugins: $(GLUE_PLUGINS)
 	@echo Pulp CLI
 	@echo plugins: $(CLI_PLUGINS)
 
+.PHONY: build
 build:
 	cd pulp-glue; pyproject-build -n
 	pyproject-build -n
 
-black: format
-
+.PHONY: format
 format:
-	isort .
-	cd pulp-glue; isort .
-	black .
+	ruff format
+	ruff check --fix
 
+.PHONY: lint
 lint:
 	find tests .ci -name '*.sh' -print0 | xargs -0 shellcheck -x
-	isort -c --diff .
-	cd pulp-glue; isort -c --diff .
-	black --diff --check .
-	flake8
+	ruff format --check --diff
+	ruff check --diff
 	.ci/scripts/check_click_for_mypy.py
 	MYPYPATH=pulp-glue mypy
 	cd pulp-glue; mypy
@@ -35,21 +34,27 @@ tests/cli.toml:
 	cp $@.example $@
 	@echo "In order to configure the tests to talk to your test server, you might need to edit $@ ."
 
+.PHONY: test
 test: | tests/cli.toml
 	python3 -m pytest -v tests pulp-glue/tests cookiecutter/pulp_filter_extension.py
 
+.PHONY: livetest
 livetest: | tests/cli.toml
 	python3 -m pytest -v tests pulp-glue/tests -m live
 
+.PHONY: unittest
 unittest:
 	python3 -m pytest -v tests pulp-glue/tests cookiecutter/pulp_filter_extension.py -m "not live"
 
+.PHONY: unittest_glue
 unittest_glue:
 	python3 -m pytest -v pulp-glue/tests -m "not live"
 
+.PHONY: docs
 docs:
 	pulp-docs build
 
+.PHONY: servedocs
 servedocs:
 	pulp-docs serve -w CHANGES.md -w pulp-glue/pulp_glue -w pulp_cli/generic.py
 
@@ -61,6 +66,7 @@ pulpcore/cli/%/locale/messages.pot: pulpcore/cli/%/*.py
 	xgettext -d $* -o $@ pulpcore/cli/$*/*.py
 	sed -i 's/charset=CHARSET/charset=UTF-8/g' $@
 
+.PHONY: extract_messages
 extract_messages: $(foreach GLUE_PLUGIN,$(GLUE_PLUGINS),pulp-glue/pulp_glue/$(GLUE_PLUGIN)/locale/messages.pot) $(foreach CLI_PLUGIN,$(CLI_PLUGINS),pulpcore/cli/$(CLI_PLUGIN)/locale/messages.pot)
 
 $(foreach LANGUAGE,$(LANGUAGES),pulp-glue/pulp_glue/%/locale/$(LANGUAGE)/LC_MESSAGES/messages.po): pulp-glue/pulp_glue/%/locale/messages.pot
@@ -76,6 +82,7 @@ $(foreach LANGUAGE,$(LANGUAGES),pulpcore/cli/%/locale/$(LANGUAGE)/LC_MESSAGES/me
 %.mo: %.po
 	msgfmt -o $@ $<
 
+.PHONY: compile_messages
 compile_messages: $(foreach LANGUAGE,$(LANGUAGES),$(foreach GLUE_PLUGIN,$(GLUE_PLUGINS),pulp-glue/pulp_glue/$(GLUE_PLUGIN)/locale/$(LANGUAGE)/LC_MESSAGES/messages.mo)) $(foreach LANGUAGE,$(LANGUAGES),$(foreach CLI_PLUGIN,$(CLI_PLUGINS),pulpcore/cli/$(CLI_PLUGIN)/locale/$(LANGUAGE)/LC_MESSAGES/messages.mo))
-.PHONY: build info black lint test docs servedocs
+
 .PRECIOUS: $(foreach LANGUAGE,$(LANGUAGES),$(foreach GLUE_PLUGIN,$(GLUE_PLUGINS),pulp-glue/pulp_glue/$(GLUE_PLUGIN)/locale/$(LANGUAGE)/LC_MESSAGES/messages.po)) $(foreach LANGUAGE,$(LANGUAGES),$(foreach CLI_PLUGIN,$(CLI_PLUGINS),pulpcore/cli/$(CLI_PLUGIN)/locale/$(LANGUAGE)/LC_MESSAGES/messages.po))

cookiecutter/apply_templates.py

@@ -3,10 +3,10 @@
 # This script requires click, cookiecutter, tomlkit and pyyaml
 
 import os
-import tomllib
 from pathlib import Path
 
 import click
+import tomllib
 import yaml
 
 from cookiecutter.main import cookiecutter

cookiecutter/ci/hooks/post_gen_project.py

@@ -1,5 +1,3 @@
-# flake8: noqa
-
 import os
 import shutil
 import sys
@@ -17,6 +15,10 @@
 # Is merging on the tool level appropriate?
 pyproject_toml["tool"].update(pyproject_toml_update["tool"])
 
+# Remove legacy tools.
+for tool in ["flake8", "black", "isort"]:
+    pyproject_toml["tool"].pop(tool, None)
+
 with open("pyproject.toml", "w") as fp:
     tomlkit.dump(pyproject_toml, fp)
 

cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/gen_certs.py

@@ -6,7 +6,6 @@
 
 
 def main() -> None:
-
     parser = argparse.ArgumentParser(prog="gen_certs")
     parser.add_argument(
         "-d",

cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/scripts/collect_changes.py

@@ -3,8 +3,8 @@
 import itertools
 import os
 import re
-import tomllib
 
+import tomllib
 from git import GitCommandError, Repo
 from packaging.version import parse as parse_version
 

cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/scripts/pr_labels.py

@@ -4,9 +4,9 @@
 
 import re
 import sys
-import tomllib
 from pathlib import Path
 
+import tomllib
 from git import Repo