[style] Fix init isort and align makefile and CI (#43260)

Cyrilvallez · web-flow · commit 38022fd89120 · 2026-01-13T18:08:07.000+01:00
* add other folders to CI style check

* fix init_sort

* match the rules

* improve

* date

* oupsi revert

* fix doc
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -154,13 +154,10 @@ jobs:
                 command: pip freeze | tee installed.txt
             - store_artifacts:
                   path: ~/transformers/installed.txt
-            - run: python -c "from transformers import *" || (echo '🚨 import failed, this means you introduced unprotected imports! 🚨'; exit 1)
-            - run: ruff check examples tests src utils
-            - run: ruff format examples tests src utils --check
+            - run: ruff check examples tests src utils scripts benchmark benchmark_v2 setup.py conftest.py
+            - run: ruff format --check examples tests src utils scripts benchmark benchmark_v2 setup.py conftest.py
             - run: python utils/custom_init_isort.py --check_only
             - run: python utils/sort_auto_mappings.py --check_only
-            - run: python utils/check_doc_toc.py
-            - run: python utils/check_docstrings.py --check_all
 
     check_repository_consistency:
         working_directory: ~/transformers
@@ -179,8 +176,11 @@ jobs:
                 command: pip freeze | tee installed.txt
             - store_artifacts:
                   path: ~/transformers/installed.txt
+            - run: python -c "from transformers import *" || (echo '🚨 import failed, this means you introduced unprotected imports! 🚨'; exit 1)
             - run: python utils/check_copies.py
             - run: python utils/check_modular_conversion.py
+            - run: python utils/check_doc_toc.py
+            - run: python utils/check_docstrings.py
             - run: python utils/check_dummies.py
             - run: python utils/check_repo.py
             - run: python utils/check_modeling_structure.py
@@ -189,13 +189,13 @@ jobs:
             - run: python utils/check_config_docstrings.py
             - run: python utils/check_config_attributes.py
             - run: python utils/check_doctest_list.py
+            - run: python utils/update_metadata.py --check-only
+            - run: python utils/add_dates.py --check-only
             - run: > 
                 md5sum src/transformers/dependency_versions_table.py > md5sum.saved;
                 python setup.py deps_table_update;
-                md5sum -c --quiet md5sum.saved || (printf "\nError: the version dependency table is outdated.\nPlease run 'make style' and commit the changes.\n\n" && exit 1);
+                md5sum -c --quiet md5sum.saved || (printf "Error: the version dependency table is outdated.\nPlease run 'make fix-repo' and commit the changes.\n" && exit 1);
                 rm md5sum.saved
-            - run: python utils/update_metadata.py --check-only
-            - run: python utils/check_docstrings.py
 
 workflows:
     version: 2
diff --git a/Makefile b/Makefile
@@ -11,21 +11,22 @@ exclude_folders :=  ""
 style:
 	ruff check $(check_dirs) setup.py conftest.py --fix --exclude $(exclude_folders)
 	ruff format $(check_dirs) setup.py conftest.py --exclude $(exclude_folders)
-	python setup.py deps_table_update
+	python utils/custom_init_isort.py
 	python utils/sort_auto_mappings.py
-	python utils/check_doc_toc.py --fix_and_overwrite
 
 
-# Check that the repo is in a good state
+# Check that the repo is in a good state (both style and consistency CI checks)
 # Note: each line is run in its own shell, and doing `-` before the command ignores the errors if any, continuing with next command
 check-repo:
 	ruff check $(check_dirs) setup.py conftest.py
 	ruff format --check $(check_dirs) setup.py conftest.py
-	python -c "from transformers import *" || (echo '🚨 import failed, this means you introduced unprotected imports! 🚨'; exit 1)
+	-python utils/custom_init_isort.py --check_only
 	-python utils/sort_auto_mappings.py --check_only
-	-python utils/check_doc_toc.py
+	-python -c "from transformers import *" || (echo '🚨 import failed, this means you introduced unprotected imports! 🚨'; exit 1)
 	-python utils/check_copies.py
 	-python utils/check_modular_conversion.py
+	-python utils/check_doc_toc.py
+	-python utils/check_docstrings.py
 	-python utils/check_dummies.py
 	-python utils/check_repo.py
 	-python utils/check_modeling_structure.py
@@ -34,14 +35,21 @@ check-repo:
 	-python utils/check_config_docstrings.py
 	-python utils/check_config_attributes.py
 	-python utils/check_doctest_list.py
-	-python utils/update_metadata.py --check-only 
-	-python utils/check_docstrings.py 
-	-python utils/add_dates.py --check-only 
+	-python utils/update_metadata.py --check-only  
+	-python utils/add_dates.py --check-only
+	-@{ \
+		md5sum src/transformers/dependency_versions_table.py > md5sum.saved; \
+		python setup.py deps_table_update; \
+		md5sum -c --quiet md5sum.saved || (printf "Error: the version dependency table is outdated.\nPlease run 'make fix-repo' and commit the changes.\n" && exit 1); \
+		rm md5sum.saved; \
+	}
 
 
 # Run all repo checks for which there is an automatic fix, most notably modular conversions
 # Note: each line is run in its own shell, and doing `-` before the command ignores the errors if any, continuing with next command
 fix-repo: style
+	-python setup.py deps_table_update
+	-python utils/check_doc_toc.py --fix_and_overwrite
 	-python utils/check_copies.py --fix_and_overwrite
 	-python utils/check_modular_conversion.py --fix_and_overwrite
 	-python utils/check_dummies.py --fix_and_overwrite
diff --git a/docs/source/en/model_doc/minimax_m2.md b/docs/source/en/model_doc/minimax_m2.md
@@ -16,6 +16,7 @@ limitations under the License.
 ⚠️ Note that this file is in Markdown but contain specific syntax for our doc-builder (similar to MDX) that may not be rendered properly in your Markdown viewer.
 
 -->
+*This model was released on {release_date} and added to Hugging Face Transformers on 2026-01-09.*
 
 
 # MiniMax-M2
diff --git a/setup.py b/setup.py
@@ -212,7 +212,7 @@ def run(self):
         content = [
             "# THIS FILE HAS BEEN AUTOGENERATED. To update:",
             "# 1. modify the `_deps` dict in setup.py",
-            "# 2. run `make style``",
+            "# 2. run `make fix-repo``",
             "deps = {",
             entries,
             "}",
diff --git a/src/transformers/__init__.py b/src/transformers/__init__.py
@@ -178,15 +178,15 @@
     "testing_utils": [],
     "tokenization_python": ["PreTrainedTokenizer", "PythonBackend"],
     "tokenization_utils": [],
-    "tokenization_utils_fast": [],
-    "tokenization_utils_sentencepiece": ["SentencePieceBackend"],
     "tokenization_utils_base": [
         "AddedToken",
         "BatchEncoding",
         "CharSpan",
         "PreTrainedTokenizerBase",
         "TokenSpan",
     ],
+    "tokenization_utils_fast": [],
+    "tokenization_utils_sentencepiece": ["SentencePieceBackend"],
     "trainer_callback": [
         "DefaultFlowCallback",
         "EarlyStoppingCallback",
@@ -243,6 +243,8 @@
         "is_vision_available",
         "logging",
     ],
+    "utils.import_utils": ["requires_backends"],
+    "utils.kernel_config": ["KernelConfig"],
     "utils.quantization_config": [
         "AqlmConfig",
         "AutoRoundConfig",
@@ -253,20 +255,18 @@
         "EetqConfig",
         "FbgemmFp8Config",
         "FineGrainedFP8Config",
+        "FPQuantConfig",
         "GPTQConfig",
         "HiggsConfig",
         "HqqConfig",
         "Mxfp4Config",
         "QuantoConfig",
         "QuarkConfig",
-        "FPQuantConfig",
         "SpQRConfig",
         "TorchAoConfig",
         "VptqConfig",
     ],
     "video_utils": [],
-    "utils.kernel_config": ["KernelConfig"],
-    "utils.import_utils": ["requires_backends"],
 }
 
 # tokenizers-backed objects
@@ -282,8 +282,8 @@
 else:
     # Fast tokenizers structure
     _import_structure["tokenization_utils_tokenizers"] = [
-        "TokenizersBackend",
         "PreTrainedTokenizerFast",
+        "TokenizersBackend",
     ]
 
 
@@ -386,6 +386,7 @@
             "EncoderRepetitionPenaltyLogitsProcessor",
             "EosTokenCriteria",
             "EpsilonLogitsWarper",
+            "MinPLogitsWarper",
             "EtaLogitsWarper",
             "ExponentialDecayLengthPenalty",
             "ForcedBOSTokenLogitsProcessor",
@@ -399,7 +400,6 @@
             "MaxTimeCriteria",
             "MinLengthLogitsProcessor",
             "MinNewTokensLengthLogitsProcessor",
-            "MinPLogitsWarper",
             "NoBadWordsLogitsProcessor",
             "NoRepeatNGramLogitsProcessor",
             "PrefixConstrainedLogitsProcessor",
diff --git a/src/transformers/dependency_versions_table.py b/src/transformers/dependency_versions_table.py
@@ -1,6 +1,6 @@
 # THIS FILE HAS BEEN AUTOGENERATED. To update:
 # 1. modify the `_deps` dict in setup.py
-# 2. run `make style``
+# 2. run `make fix-repo``
 deps = {
     "Pillow": "Pillow>=10.0.1,<=15.0",
     "accelerate": "accelerate>=1.1.0",
diff --git a/utils/check_doc_toc.py b/utils/check_doc_toc.py
@@ -23,7 +23,7 @@
 python utils/check_doc_toc.py
 ```
 
-Auto-sort the table of content if it is not properly sorted (used in `make style`):
+Auto-sort the table of content if it is not properly sorted (used in `make fix-repo`):
 
 ```bash
 python utils/check_doc_toc.py --fix_and_overwrite
diff --git a/utils/custom_init_isort.py b/utils/custom_init_isort.py
@@ -244,7 +244,7 @@ def sort_imports(file: str, check_only: bool = True):
         code = f.read()
 
     # If the file is not a custom init, there is nothing to do.
-    if "_import_structure" not in code or "define_import_structure" in code:
+    if "_import_structure = {" not in code:
         return
 
     # Blocks of indent level 0
