Housekeeping

.github/workflows/testing.yml

@@ -58,8 +58,6 @@ jobs:
         run: |
           cd mpcontribs-client
           python${{ matrix.python-version }} -m pip install --no-deps .
-          python${{ matrix.python-version }} -m flake8 --max-line-length 100
-          python${{ matrix.python-version }} -m pycodestyle --max-line-length 100 .
           python${{ matrix.python-version }} -m pytest -n auto -v -s --cov=mpcontribs/client --cov-report=term-missing --cov-report=xml --ignore=bravado
           python${{ matrix.python-version }} -m build --outdir ../dist
 

.pre-commit-config.yaml

@@ -12,6 +12,12 @@ exclude: |
   )
 
 repos:
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.12.0
+    hooks:
+      - id: ruff
+        args: [--fix, --ignore, "D,E501,E741,E402"]
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0
     hooks:

mpcontribs-api/pyproject.toml

@@ -68,7 +68,6 @@ Documentation = "https://docs.materialsproject.org/services/mpcontribs"
 dev = [
     "flake8",
     "pytest",
-    "pytest-flake8",
     "pytest-pycodestyle",
     "pytest-xdist",
 ]

mpcontribs-client/pyproject.toml

@@ -14,6 +14,9 @@ where = ["."]
 exclude = ["tests"]
 include = ["mpcontribs.client"]
 
+[tool.ruff.lint.pycodestyle]
+max-line-length = 100
+
 [project]
 name = "mpcontribs-client"
 dynamic = ["version"]
@@ -53,7 +56,6 @@ Documentation = "https://docs.materialsproject.org/services/mpcontribs"
 dev = [
     "flake8",
     "pytest",
-    "pytest-flake8",
     "pytest-pycodestyle",
     "pytest-cov",
     "pytest-xdist",

mpcontribs-client/tests/test_client.py

@@ -1,10 +1,11 @@
-import pytest
 import logging
+from unittest.mock import MagicMock, patch
 
-from unittest.mock import patch, MagicMock
-from mpcontribs.client import validate_email, Client, email_format
+import pytest
 from swagger_spec_validator.common import SwaggerValidationError
 
+from mpcontribs.client import Client, email_format, validate_email
+
 logger = logging.Logger(__name__)
 logger.propagate = True
 

mpcontribs-lux/mpcontribs/lux/autogen.py

@@ -100,7 +100,7 @@ def pydantic_model(self) -> Type[BaseModel]:
                         self.file_name, orient=orient, lines=self.fmt == "jsonl"
                     )
                     break
-                except Exception as exc:
+                except Exception:
                     continue
             else:
                 raise ValueError(

mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py

@@ -2,7 +2,6 @@
 
 import gzip
 import json
-from pathlib import Path
 
 import numpy as np
 import pytest

mpcontribs-portal/pyproject.toml

@@ -56,7 +56,6 @@ Documentation = "https://docs.materialsproject.org/services/mpcontribs"
 dev = [
     "flake8",
     "pytest",
-    "pytest-flake8",
     "pytest-pycodestyle",
     "pytest-xdist",
 ]