Merge branch 'main' into bugfix/ordering-file-groups-with-suite-comma…

…nd-line-args

release.sh

@@ -1,5 +1,5 @@
 cd ..
 git clone [email protected]:mkorpela/pabot.git pabotrelease
 cd pabotrelease
-python setup.py sdist
+python -m build
 twine upload -r robotframework-pabot dist/*.*

src/pabot/__init__.py

@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 
 from .pabotlib import PabotLib
-__version__ = "3.0.1"
+__version__ = "3.1.0"

src/pabot/pabot.py

@@ -1152,14 +1152,15 @@ def generate_suite_names_with_builder(outs_dir, datasources, options):
     settings = RobotSettings(opts)
 
     # Note: first argument (included_suites) is deprecated from RobotFramework 6.1
-    if ROBOT_VERSION < "6.1":
+    if ROBOT_VERSION >= "6.1":
         builder = TestSuiteBuilder(
-            settings["SuiteNames"], settings.extension, rpa=settings.rpa
+            included_extensions=settings.extension, rpa=settings.rpa, lang=opts.get("language")
         )
     else:
         builder = TestSuiteBuilder(
-            included_extensions=settings.extension, rpa=settings.rpa
-        )
+            settings["SuiteNames"], settings.extension, rpa=settings.rpa
+        ) 
+
     suite = builder.build(*datasources)
     settings.rpa = builder.rpa
     suite.configure(**settings.suite_config)