deps: replace black, isort, pylint and flake8 with Ruff

.github/workflows/lint_test_coverage.yml

@@ -39,8 +39,7 @@ jobs:
 
       - name: lint-code
         run: |
-          make flake
-          make lint
+          make check-lint
 
       - name: semgrep
         run: |

Makefile

@@ -9,27 +9,21 @@ version := $(shell poetry version | awk '{ print $$2 }')
 pypi_usr := $(shell grep username ~/.pypirc | awk -F"= " '{ print $$2 }')
 pypi_pwd := $(shell grep password ~/.pypirc | awk -F"= " '{ print $$2 }')
 
-.PHONY: flake
-flake:
-	@poetry run flake8 --ignore=F821,E501,W503,E704 .
-
 .PHONY: lint
-lint: flake
-	@echo "$(OK_COLOR)==> Linting code ...$(NO_COLOR)"
-	@poetry run pylint $(name)/ ./tests -rn -f colorized
+lint:
+	@poetry run ruff check --fix ./$(name) ./tests ./examples
 
-.PHONY: isort
-isort:
-	@poetry run isort --atomic --verbose ./$(name) ./tests ./examples
+.PHONY: check-lint
+check-lint:
+	@poetry run ruff check --diff ./$(name) ./tests ./examples
 
 .PHONY: fmt
-fmt: isort
-	@poetry run black ./$(name) ./tests ./examples
+fmt:
+	@poetry run ruff format ./$(name) ./tests ./examples
 
 .PHONY: check-fmt
 check-fmt:
-	@poetry run isort --check ./$(name) ./tests ./examples
-	@poetry run black --check ./$(name) ./tests ./examples
+	@poetry run ruff format --check ./$(name) ./tests ./examples
 
 .PHONY: spellcheck
 spellcheck:
@@ -49,7 +43,7 @@ clean-pyc:
 	@find . -name '*~' -exec rm -f {} +
 
 .PHONY: test
-test: clean-pyc flake
+test: clean-pyc
 	@echo "$(OK_COLOR)==> Runnings tests ...$(NO_COLOR)"
 	@poetry run py.test -n auto -v
 
@@ -69,7 +63,7 @@ build: rm-build
 	@poetry build
 
 .PHONY: publish
-publish: flake build
+publish: build
 	@echo "$(OK_COLOR)==> Publishing...$(NO_COLOR)"
 	@poetry publish -u $(pypi_usr) -p $(pypi_pwd)
 

README.md

@@ -6,12 +6,10 @@
 
 [![Coverage](https://codecov.io/gh/pavdmyt/yaspin/branch/master/graph/badge.svg)](https://codecov.io/gh/pavdmyt/yaspin)
 [![pypi](https://img.shields.io/pypi/v/yaspin.svg)](https://pypi.org/project/yaspin/)
-[![black-fmt](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
-
 [![Versions](https://img.shields.io/pypi/pyversions/yaspin.svg)](https://pypi.org/project/yaspin/)
+
 [![Wheel](https://img.shields.io/pypi/wheel/yaspin.svg)](https://pypi.org/project/yaspin/)
 [![Examples](https://img.shields.io/badge/learn%20by-examples-0077b3.svg)](https://github.com/pavdmyt/yaspin/tree/master/examples)
-
 [![DownloadsTot](https://static.pepy.tech/badge/yaspin)](https://pepy.tech/project/yaspin)
 [![DownloadsW](https://static.pepy.tech/badge/yaspin/week)](https://pepy.tech/project/yaspin)
 

examples/colors.py

@@ -35,7 +35,7 @@ def all_highlights():
             "on_grey",
         )
         for highlight in highlights:
-            text = "On {0} color".format(highlight.split("_")[1])
+            text = "On {} color".format(highlight.split("_")[1])
             sp.on_color, sp.text = highlight, text
             time.sleep(2)
 

examples/demo.py

@@ -47,7 +47,7 @@ def any_spinner_you_like():
         spinner = getattr(Spinners, name)
 
         spaces_qty = max_len - len(name) - len(msg) - len(spinner.frames[0])
-        text = "{0}{1}{2}".format(name, " " * spaces_qty, msg)
+        text = "{}{}{}".format(name, " " * spaces_qty, msg)
 
         with kbi_safe_yaspin(spinner, text=text, color="cyan"):
             time.sleep(period)
@@ -61,7 +61,7 @@ def colors_simple(sleep=0.7):
     with kbi_safe_yaspin(Spinners.dots12) as sp:
         for color in COLORS:
             spaces_qty = max_len - len(color) - len(msg)
-            text = "{0}{1}{2}".format(color, " " * spaces_qty, msg)
+            text = "{}{}{}".format(color, " " * spaces_qty, msg)
 
             sp.color = color
             sp.text = text
@@ -76,9 +76,9 @@ def color_highlights(sleep=0.5):
     with kbi_safe_yaspin(Spinners.bouncingBall) as sp:
         for highlight in HIGHLIGHTS:
             highlight_name = " ".join(highlight.split("_")[1:])
-            name = "On {0} color".format(highlight_name)
+            name = f"On {highlight_name} color"
             spaces_qty = max_len - len(name) - len(msg)
-            text = "{0}{1}{2}".format(name, " " * spaces_qty, msg)
+            text = "{}{}{}".format(name, " " * spaces_qty, msg)
 
             sp.on_color = highlight
             sp.text = text
@@ -102,7 +102,7 @@ def color_attributes(sleep=0.8):
     with kbi_safe_yaspin(Spinners.bouncingBall) as sp:
         for descr in descriptions:
             spaces_qty = max_len - len(descr) - len(msg)
-            text = "{0}{1}{2}".format(descr, " " * spaces_qty, msg)
+            text = "{}{}{}".format(descr, " " * spaces_qty, msg)
 
             attr, color, _ = descr.split()
             sp.attrs, sp.color = [attr.lower()], color
@@ -143,7 +143,7 @@ def parse_attrs(description):
     # the existing list of previous attributes.
     for descr in descriptions:
         spaces_qty = max_len - len(descr) - len(msg)
-        text = "{0}{1}{2}".format(descr, " " * spaces_qty, msg)
+        text = "{}{}{}".format(descr, " " * spaces_qty, msg)
 
         with kbi_safe_yaspin(Spinners.pong, text=text) as sp:
             # Apply all color attributes from description

examples/dynamic_text.py

@@ -5,9 +5,10 @@
 Evaluates text on every spinner frame.
 """
 
-import time
 from datetime import datetime
 
+import time
+
 from yaspin import yaspin
 
 

examples/ellipsis.py

@@ -10,10 +10,10 @@
 from yaspin import yaspin
 
 LONG_TEXT = (
-    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer venenatis lectus quis tincidunt venenatis."
-    "Proin interdum neque eu lectus finibus malesuada. Nunc vel nisl quis tellus porta euismod. Aenean dignissim"
-    "tortor eu sapien gravida efficitur. Aliquam consectetur aliquam ex facilisis tincidunt. Nunc luctus arcu nec"
-    "justo gravida efficitur."
+    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer venenatis lectus quis tincidunt "
+    "venenatis. Proin interdum neque eu lectus finibus malesuada. Nunc vel nisl quis tellus porta euismod. "
+    "Aenean dignissim tortor eu sapien gravida efficitur. Aliquam consectetur aliquam ex facilisis "
+    "tincidunt. Nunc luctus arcu nec justo gravida efficitur."
 )
 
 

examples/signals.py

@@ -65,7 +65,9 @@ def passing_additional_info_into_signal_handler():
     heads = random.randint(0, 1) == 1
     tails = not heads
 
-    def my_handler(signum, frame, spinner, context={"heads": heads, "tails": tails}):
+    def my_handler(signum, frame, spinner, context=None):
+        if context is None:
+            context = {"heads": heads, "tails": tails}
         if context["heads"]:
             spinner.text = "heads!"
             spinner.ok("🌕")
@@ -96,7 +98,7 @@ def my_handler(signum, frame, spinner):
 
     with yaspin(sigmap=sigmap, text="Handling SIGUSR1 and SIGTERM") as sp:
         sp.write("Send signals using `kill` command")
-        sp.write("E.g. $ kill -USR1 {0}".format(os.getpid()))
+        sp.write(f"E.g. $ kill -USR1 {os.getpid()}")
         time.sleep(60)
         sp.write("No signal received")
 
@@ -131,7 +133,7 @@ def unpacker():
     )
     with swirl as sp:
         for p in range(0, 101, 5):
-            sp.text = "{0}% Unpacking".format(p)
+            sp.text = f"{p}% Unpacking"
             time.sleep(random.random())
         sp.green.ok("✔")