diff --git a/checkouts.cfg b/checkouts.cfg index 441f7ba5d7..41a4eb8bf9 100644 --- a/checkouts.cfg +++ b/checkouts.cfg @@ -18,5 +18,6 @@ auto-checkout = plone.app.layout plone.app.robotframework # This is for Playwright integration development + collective.recipe.vscode plone.app.robotframework robotsuite diff --git a/core.cfg b/core.cfg index 624a4a8636..db992ef9b8 100644 --- a/core.cfg +++ b/core.cfg @@ -103,6 +103,7 @@ eggs = [vscode] recipe = collective.recipe.vscode eggs = ${test:eggs} +robot-enabled = true flake8-enabled = false black-enabled = true generate-envfile = true diff --git a/requirements.txt b/requirements.txt index 12c96130f1..cf0bf86f1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,3 +9,8 @@ pywin32 ; platform_system == 'Windows' # SSL Certs on windows, because Python is missing them otherwise: certifi ; platform_system == 'Windows' + +# VSCode robotframework-lsp requires robotframework directly in venv +robotframework==6.0.2 +# robotframework >= 6.1 is only supported with robotframwork-lsp >= 1.11.0, +# but https://github.com/robocorp/robotframework-lsp/issues/947 diff --git a/sources.cfg b/sources.cfg index d4d38249c6..39cf18d8d1 100644 --- a/sources.cfg +++ b/sources.cfg @@ -36,6 +36,7 @@ plone.themepreview = git ${remotes:plone}/plone.themepreview.gi borg.localrole = git ${remotes:plone}/borg.localrole.git pushurl=${remotes:plone_push}/borg.localrole.git branch=master collective.monkeypatcher = git ${remotes:plone}/collective.monkeypatcher.git pushurl=${remotes:plone_push}/collective.monkeypatcher.git branch=master collective.recipe.omelette = git ${remotes:collective}/collective.recipe.omelette.git pushurl=${remotes:collective_push}/collective.recipe.omelette.git branch=master +collective.recipe.vscode = git https://github.com/datakurre/collective.recipe.vscode.git pushurl=git@github.com/datakurre:collective.recipe.vscode.git branch=master collective.xmltestreport = git ${remotes:collective}/collective.xmltestreport.git pushurl=${remotes:collective_push}/collective.xmltestreport.git branch=master diazo = git ${remotes:plone}/diazo.git pushurl=${remotes:plone_push}/diazo.git branch=master five.customerize = git ${remotes:zope}/five.customerize.git pushurl=${remotes:zope_push}/five.customerize.git branch=master diff --git a/tests.cfg b/tests.cfg index 7132c5f4ea..af63cb4552 100644 --- a/tests.cfg +++ b/tests.cfg @@ -140,4 +140,4 @@ scripts = robot robot-debug robot-server - rfbrowser + rfbrowser \ No newline at end of file diff --git a/versions.cfg b/versions.cfg index 11f2df5be8..8b39ad3e5d 100644 --- a/versions.cfg +++ b/versions.cfg @@ -218,7 +218,10 @@ python-dateutil = 2.8.2 python-dotenv = 1.0.0 PyYAML = 6.0 responses = 0.23.1 -robotframework = 6.1 +robotframework = 6.0.2 +# robotframework >= 6.1 is only supported with robotframwork-lsp >= 1.11.0, +# but https://github.com/robocorp/robotframework-lsp/issues/947 +robotframework-lsp = 1.10.1 robotframework-assertion-engine = 1.0.0 robotframework-browser = 16.2.0 robotframework-debuglibrary = 2.3.0