This is an automated email from the ASF dual-hosted git repository.

tvb pushed a commit to branch tristan/fix-test-bst-init
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit e6dc54e71961e4761e02540b612a19bd69c5f736
Author: Tristan van Berkom <[email protected]>
AuthorDate: Tue Oct 10 13:32:27 2023 +0900

    _frontend/cli.py: Fix default version after 2.1 release
    
    And remove some test code which we can delete after 2.0 release.
    
    This fixes tests which were broken as a consequence of releasing 2.1
---
 src/buildstream/_frontend/cli.py | 2 +-
 tests/frontend/init.py           | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/buildstream/_frontend/cli.py b/src/buildstream/_frontend/cli.py
index 8d8276a81..39a64df38 100644
--- a/src/buildstream/_frontend/cli.py
+++ b/src/buildstream/_frontend/cli.py
@@ -408,7 +408,7 @@ def help_command(ctx, command):
 @click.option(
     "--min-version",
     type=click.STRING,
-    default="2.0",
+    default="2.1",
     show_default=True,
     help="The required format version",
 )
diff --git a/tests/frontend/init.py b/tests/frontend/init.py
index 5adbc5c62..b08643c0f 100644
--- a/tests/frontend/init.py
+++ b/tests/frontend/init.py
@@ -28,15 +28,6 @@ from buildstream.exceptions import ErrorDomain, 
LoadErrorReason
 def get_default_min_version():
     bst_major, bst_minor = utils.get_bst_version()
 
-    # For the version check, artificially set the version to at least
-    # version 2.0
-    #
-    # TODO: Remove this code block after releasing 2.0
-    #
-    if bst_major < 2:
-        bst_major = 2
-        bst_minor = 0
-
     return "{}.{}".format(bst_major, bst_minor)
 
 

Reply via email to