From 22ef4f7c8fa047464564c517e72a516095b13cc8 Mon Sep 17 00:00:00 2001
From: Tyler Mathis <35553152+tsmathis@users.noreply.github.com>
Date: Mon, 29 Jun 2026 11:50:06 -0700
Subject: [PATCH 1/2] flake8 -> ruff

pytest-flake8 blocking pytest upgrade
---
 .github/workflows/testing.yml    | 2 --
 .pre-commit-config.yaml          | 6 ++++++
 mpcontribs-api/pyproject.toml    | 1 -
 mpcontribs-client/pyproject.toml | 4 +++-
 mpcontribs-portal/pyproject.toml | 1 -
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 20bdbf43f..5e488957d 100644
--- a/.github/workflows/testing.yml
+++ b/.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
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index eeb6cde65..70b9f4d62 100644
--- a/.pre-commit-config.yaml
+++ b/.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:
diff --git a/mpcontribs-api/pyproject.toml b/mpcontribs-api/pyproject.toml
index d64166fd3..438532317 100644
--- a/mpcontribs-api/pyproject.toml
+++ b/mpcontribs-api/pyproject.toml
@@ -68,7 +68,6 @@ Documentation = "https://docs.materialsproject.org/services/mpcontribs"
 dev = [
     "flake8",
     "pytest",
-    "pytest-flake8",
     "pytest-pycodestyle",
     "pytest-xdist",
 ]
diff --git a/mpcontribs-client/pyproject.toml b/mpcontribs-client/pyproject.toml
index ecf1e0cee..b7cfed683 100644
--- a/mpcontribs-client/pyproject.toml
+++ b/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",
diff --git a/mpcontribs-portal/pyproject.toml b/mpcontribs-portal/pyproject.toml
index 0efca4364..347977253 100644
--- a/mpcontribs-portal/pyproject.toml
+++ b/mpcontribs-portal/pyproject.toml
@@ -56,7 +56,6 @@ Documentation = "https://docs.materialsproject.org/services/mpcontribs"
 dev = [
     "flake8",
     "pytest",
-    "pytest-flake8",
     "pytest-pycodestyle",
     "pytest-xdist",
 ]

From 4f49d85ac9a0ac793d835087e45b4524c56d3d08 Mon Sep 17 00:00:00 2001
From: Tyler Mathis <35553152+tsmathis@users.noreply.github.com>
Date: Mon, 29 Jun 2026 11:50:18 -0700
Subject: [PATCH 2/2] linting

---
 mpcontribs-client/tests/test_client.py                     | 7 ++++---
 mpcontribs-lux/mpcontribs/lux/autogen.py                   | 2 +-
 .../tests/projects/esoteric_ephemera/test_schemas.py       | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mpcontribs-client/tests/test_client.py b/mpcontribs-client/tests/test_client.py
index 8dd7c344c..819490c03 100644
--- a/mpcontribs-client/tests/test_client.py
+++ b/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
 
diff --git a/mpcontribs-lux/mpcontribs/lux/autogen.py b/mpcontribs-lux/mpcontribs/lux/autogen.py
index aeee406c2..95d625566 100644
--- a/mpcontribs-lux/mpcontribs/lux/autogen.py
+++ b/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(
diff --git a/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py b/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py
index 70b6ec801..0d74c5213 100644
--- a/mpcontribs-lux/tests/projects/esoteric_ephemera/test_schemas.py
+++ b/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