Merge remote-tracking branch 'upstream/main' into format/hex-code-lit…

…erals

.pre-commit-config.yaml

@@ -31,8 +31,8 @@ repos:
         files: '(CHANGES\.md|the_basics\.md)$'
         additional_dependencies: *version_check_dependencies
 
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+  - repo: https://github.com/pycqa/flake8
+    rev: 4.0.1
     hooks:
       - id: flake8
         additional_dependencies:
@@ -41,7 +41,7 @@ repos:
           - flake8-simplify
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.910-1
+    rev: v0.940
     hooks:
       - id: mypy
         exclude: ^docs/conf.py
@@ -60,7 +60,7 @@ repos:
         exclude: \.github/workflows/diff_shades\.yml
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace

CHANGES.md

@@ -50,6 +50,8 @@
 
 - On Python 3.11 and newer, use the standard library's `tomllib` instead of `tomli`
   (#2903)
+- `black-primer`, the deprecated internal devtool, has been removed and copied to a
+  [separate repository](https://github.com/cooperlees/black-primer) (#2924)
 
 ### Parser
 

docs/contributing/gauging_changes.md

@@ -7,12 +7,6 @@ It's recommended you evaluate the quantifiable changes your _Black_ formatting
 modification causes before submitting a PR. Think about if the change seems disruptive
 enough to cause frustration to projects that are already "black formatted".
 
-## black-primer
-
-`black-primer` is an obsolete tool (now replaced with `diff-shades`) that was used to
-gauge the impact of changes in _Black_ on open-source code. It is no longer used
-internally and will be removed from the _Black_ repository in the future.
-
 ## diff-shades
 
 diff-shades is a tool that runs _Black_ across a list of Git cloneable OSS projects

mypy.ini

@@ -39,11 +39,3 @@ cache_dir=/dev/null
 # The following is because of `patch_click()`. Remove when
 # we drop Python 3.6 support.
 warn_unused_ignores=False
-
-[mypy-black_primer.*]
-# Until we're not supporting 3.6 primer needs this
-disallow_any_generics=False
-
-[mypy-tests.test_primer]
-# Until we're not supporting 3.6 primer needs this
-disallow_any_generics=False

setup.py

@@ -58,7 +58,7 @@ def find_python_files(base: Path) -> List[Path]:
         "black/__main__.py",
     ]
     discovered = []
-    # black-primer and blackd have no good reason to be compiled.
+    # There's no good reason for blackd to be compiled.
     discovered.extend(find_python_files(src / "black"))
     discovered.extend(find_python_files(src / "blib2to3"))
     mypyc_targets = [
@@ -92,7 +92,6 @@ def find_python_files(base: Path) -> List[Path]:
     package_data={
         "blib2to3": ["*.txt"],
         "black": ["py.typed"],
-        "black_primer": ["primer.json"],
     },
     python_requires=">=3.6.2",
     zip_safe=False,
@@ -132,7 +131,6 @@ def find_python_files(base: Path) -> List[Path]:
         "console_scripts": [
             "black=black:patched_main",
             "blackd=blackd:patched_main [d]",
-            "black-primer=black_primer.cli:main",
         ]
     },
 )

src/black/mode.py

@@ -127,7 +127,6 @@ class Preview(Enum):
     """Individual preview style features."""
 
     string_processing = auto()
-    hug_simple_powers = auto()
     hex_codes_in_unicode_sequences = auto()