]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Soft comparison of --required-version (#2832)
authorFrédérik Paradis <frederik.paradis.1@ulaval.ca>
Sun, 30 Jan 2022 21:42:56 +0000 (16:42 -0500)
committerGitHub <noreply@github.com>
Sun, 30 Jan 2022 21:42:56 +0000 (13:42 -0800)
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Co-authored-by: Felix Hildén <felix.hilden@gmail.com>
CHANGES.md
src/black/__init__.py
tests/test_black.py

index a840e013041d6de802f76cef9b2f95dcaee0fbe2..7d74e56ce4e194074748c5571a53fb1b42798bc5 100644 (file)
@@ -5,6 +5,7 @@
 ### Configuration
 
 - Do not format `__pypackages__` directories by default (#2836)
 ### Configuration
 
 - Do not format `__pypackages__` directories by default (#2836)
+- Add support for specifying stable version with `--required-version` (#2832).
 
 ## 22.1.0
 
 
 ## 22.1.0
 
index 6a703e450462220d960fa5ae7b7f6cac6a058bff..8c28b6ba18b9dfa82e2a985297d13287bd9e2779 100644 (file)
@@ -291,7 +291,8 @@ def validate_regex(
     type=str,
     help=(
         "Require a specific version of Black to be running (useful for unifying results"
     type=str,
     help=(
         "Require a specific version of Black to be running (useful for unifying results"
-        " across many environments e.g. with a pyproject.toml file)."
+        " across many environments e.g. with a pyproject.toml file). It can be"
+        " either a major version number or an exact version."
     ),
 )
 @click.option(
     ),
 )
 @click.option(
@@ -474,7 +475,11 @@ def main(
                 out(f"Using configuration in '{config}'.", fg="blue")
 
     error_msg = "Oh no! 💥 💔 💥"
                 out(f"Using configuration in '{config}'.", fg="blue")
 
     error_msg = "Oh no! 💥 💔 💥"
-    if required_version and required_version != __version__:
+    if (
+        required_version
+        and required_version != __version__
+        and required_version != __version__.split(".")[0]
+    ):
         err(
             f"{error_msg} The required version `{required_version}` does not match"
             f" the running version `{__version__}`!"
         err(
             f"{error_msg} The required version `{required_version}` does not match"
             f" the running version `{__version__}`!"
index 2dd284f2cd6ed176f030e986f1aacaf13d4dc823..b04c0a66fe9e4120c69121c8fd7dbbf033dec4dd 100644 (file)
@@ -1198,6 +1198,20 @@ class BlackTestCase(BlackBaseTestCase):
             ignore_config=True,
         )
 
             ignore_config=True,
         )
 
+    def test_required_version_matches_partial_version(self) -> None:
+        self.invokeBlack(
+            ["--required-version", black.__version__.split(".")[0], "-c", "0"],
+            exit_code=0,
+            ignore_config=True,
+        )
+
+    def test_required_version_does_not_match_on_minor_version(self) -> None:
+        self.invokeBlack(
+            ["--required-version", black.__version__.split(".")[0] + ".999", "-c", "0"],
+            exit_code=1,
+            ignore_config=True,
+        )
+
     def test_required_version_does_not_match_version(self) -> None:
         result = BlackRunner().invoke(
             black.main,
     def test_required_version_does_not_match_version(self) -> None:
         result = BlackRunner().invoke(
             black.main,