Skip to content

Commit

Permalink
Merge pull request #3417 from SFDO-Tooling/robotframework-6x
Browse files Browse the repository at this point in the history
bump Robotframework dependency to the current version
  • Loading branch information
boakley authored Oct 28, 2022
2 parents 7d73c72 + e233df2 commit 133a623
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
11 changes: 9 additions & 2 deletions cumulusci/tasks/robotframework/libdoc.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import jinja2
import robot.utils
from robot.libdocpkg.builder import DocumentationBuilder
from robot.libdocpkg.robotbuilder import LibraryDocBuilder
from robot.libdocpkg.robotbuilder import LibraryDocBuilder, ResourceDocBuilder
from robot.libraries.BuiltIn import RobotNotRunningError
from robot.utils import Importer

Expand Down Expand Up @@ -116,7 +116,14 @@ def _run_task(self):
kwfile.add_keywords(libdoc, pobj_name)

else:
libdoc = DocumentationBuilder(library_name).build(library_name)
# this test necessary due to a backwards-incompatible change
# in robot 6.x where .robot files get unconditionally passed
# to SuiteBuilder which then generates an error on keyword
# files since they don't have test cases.
if library_name.endswith(".robot"):
libdoc = ResourceDocBuilder().build(library_name)
else:
libdoc = DocumentationBuilder(library_name).build(library_name)
kwfile.add_keywords(libdoc)

# if we get here, we were able to process the file correctly
Expand Down
2 changes: 1 addition & 1 deletion requirements/prod.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ requests
requests-futures
rich
# check with Bryan about upgrading to v5
robotframework<5
robotframework
robotframework-lint
robotframework-pabot
robotframework-requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/prod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ requests-futures==1.0.0
# via -r requirements/prod.in
rich==12.6.0
# via -r requirements/prod.in
robotframework==4.1.3
robotframework==6.0
# via
# -r requirements/prod.in
# robotframework-lint
Expand Down

0 comments on commit 133a623

Please sign in to comment.