Skip to content

Commit

Permalink
Fix CI: Disable sphinxcontrib_robotframework until upstream fixed.
Browse files Browse the repository at this point in the history
Disable source checkout of sphinxcontrib_robotframework due to an error
with "--install-option='--pre'" in requirement files and recent pip
versions.

As soon this is fixed upstream we can re-enable it.

Ref:

- mxstack/mxdev#30
- collective/sphinxcontrib-robotframework#6
  • Loading branch information
thet committed Apr 21, 2023
1 parent 6276298 commit 91012cf
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 16 deletions.
27 changes: 16 additions & 11 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,23 @@

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = [
"sphinxcontrib_robotframework",
]

# Enable Robot Framework tests during Sphinx compilation.
sphinxcontrib_robotframework_enabled = True
sphinxcontrib_robotframework_quiet = True

# Configure Robot Frameowrk tests to use Chrome
sphinxcontrib_robotframework_variables = {
"BROWSER": "chrome"
}
# TODO: re-enable sphinxcontrib_robotframework when one of the following is
# merged and released:
# - https://github.com/collective/sphinxcontrib-robotframework/pull/6
# - https://github.com/mxstack/mxdev/pull/30
# extensions = [
# "sphinxcontrib_robotframework",
# ]
#
# # Enable Robot Framework tests during Sphinx compilation.
# sphinxcontrib_robotframework_enabled = True
# sphinxcontrib_robotframework_quiet = True
#
# # Configure Robot Frameowrk tests to use Chrome
# sphinxcontrib_robotframework_variables = {
# "BROWSER": "chrome"
# }

# The suffix of source filenames.
source_suffix = '.rst'
Expand Down
8 changes: 4 additions & 4 deletions mx.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ ignores =
setuptools
pip
wheel
sphinxcontrib-robotframework
plone.app.mosaic
# sphinxcontrib-robotframework

version-overrides =
plone.staticresources==2.1.0
Expand Down Expand Up @@ -55,6 +55,6 @@ github = git+https://github.com
# url = ${settings:github}/plone/plone.tiles.git
# branch = master

[sphinxcontrib-robotframework]
url = ${settings:github}/cilq/sphinxcontrib-robotframework.git
branch = fix_codeblock
# [sphinxcontrib-robotframework]
# url = ${settings:github}/cilq/sphinxcontrib-robotframework.git
# branch = fix_codeblock
6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@
"docs": [
"Sphinx",
"sphinx-rtd-theme",
"sphinxcontrib-robotframework",
# TODO: re-enable sphinxcontrib_robotframework when one of the
# following is merged and released:
# - https://github.com/collective/sphinxcontrib-robotframework/pull/6
# - https://github.com/mxstack/mxdev/pull/30
# "sphinxcontrib-robotframework",
],
},
entry_points="""
Expand Down

0 comments on commit 91012cf

Please sign in to comment.