ci: switch to ruff

.pre-commit-config.yaml

@@ -6,27 +6,23 @@ repos:
   - id: check-yaml
   - id: end-of-file-fixer
   - id: trailing-whitespace
+
 - repo: local
   hooks:
   - id: system
-    name: black
-    entry: poetry run black
+    name: Lint with Ruff
+    entry: poetry run ruff check
     types: [python]
     language: system
+
   - id: system
-    name: isort
-    entry: poetry run isort
+    name: Lint with Ruff format
+    entry: poetry run ruff format --check
     types: [python]
     language: system
+
   - id: system
-    name: flake8
-    entry: poetry run flake8 peakina tests
-    types: [python]
-    language: system
-  - id: mypy
-    name: mypy
+    name: Lint with Mypy
     entry: poetry run mypy
-    language: system
     types: [python]
-    require_serial: true
-    verbose: true
+    language: system

Makefile

@@ -1,6 +1,8 @@
 .DEFAULT_GOAL := all
-black = poetry run black peakina tests
-isort = poetry run isort peakina tests
+# Commands
+RUFF   = poetry run ruff check peakina tests
+FORMAT = poetry run ruff format peakina tests
+MYPY   = poetry run mypy peakina tests
 
 .PHONY: install_system_deps
 install_system_deps:
@@ -15,13 +17,14 @@ install:
 
 .PHONY: format
 format:
-	poetry run pre-commit run --all-files
+	${RUFF} --fix
+	${FORMAT}
 
 .PHONY: lint
 lint:
-	$(black) --diff --check
-	$(isort) --check-only
-	poetry run flake8 peakina tests
+	${RUFF}
+	${FORMAT} --check
+	${MYPY}
 
 .PHONY: mypy
 mypy:

peakina/io/ftp/ftp_utils.py

@@ -56,7 +56,9 @@ def ntransfercmd(  # type: ignore[override]
         conn, size = ftplib.FTP.ntransfercmd(self, cmd, rest)
         if self._prot_p:  # type: ignore[attr-defined]
             conn = self.context.wrap_socket(
-                conn, server_hostname=self.host, session=self.sock.session  # type: ignore[union-attr]
+                conn,
+                server_hostname=self.host,
+                session=self.sock.session,  # type: ignore[union-attr]
             )  # this is the fix
         return conn, size  # type:ignore[return-value] # size could be None here
 

pyproject.toml

@@ -34,12 +34,9 @@ geopandas = ">=0.11.1,<1"
 pyarrow = ">=11,<17"
 openpyxl = "^3.1.2"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 aiobotocore = {extras = ["boto3"], version = "^2.3.4"}
-black = "^24.4"
 docker = "^7.1.0"
-flake8 = "^7.1.0"
-isort = "^5.13.2"
 mkdocs = "^1.5.3"
 mkdocs-material = "^9.5.18"
 mypy = "^1.10"
@@ -50,6 +47,7 @@ pytest-mock = "^3.14.0"
 pytest-rerunfailures = "^14.0"
 pytest-sugar = ">=0.9.4,<2"
 PyYAML = "^6.0"
+ruff = "^0.4.9"
 
 # types
 types-chardet = "^5.0.4"
@@ -63,13 +61,11 @@ types-PyYAML = "^6.0.12"
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.black]
-target-version = ["py310"]
+[tool.ruff]
+# Assume python 3.10
+target-version = "py310"
 line-length = 100
-
-[tool.isort]
-profile = "black"
-combine_as_imports = true
+exclude = ["__init__.py", ".git", ".direnv"]
 
 [tool.mypy]
 python_version = "3.10"

tests/test_datasource.py

@@ -210,11 +210,14 @@ def test_basic_excel(path):
     ds = DataSource(path("fixture-multi-sheet.xlsx"))
     df = pd.DataFrame({"Month": [1], "Year": [2019]})
     assert ds.get_df().equals(df)
-    assert ds.get_metadata() == {
-        "df_rows": 1,
-        "sheetnames": ["January", "February"],
-        "total_rows": 4,  # we have for rows as total here because january sheet has 1 row and February sheet has 3 (1 + 3)
-    }
+    assert (
+        ds.get_metadata()
+        == {
+            "df_rows": 1,
+            "sheetnames": ["January", "February"],
+            "total_rows": 4,  # we have for rows as total here because january sheet has 1 row and February sheet has 3 (1 + 3)
+        }
+    )
 
     # On match datasources, no metadata is returned:
     assert DataSource(path("fixture-multi-sh*t.xlsx"), match=MatchEnum.GLOB).get_metadata() == {}