Skip to content
Snippets Groups Projects
Commit 53326b7d authored by David Douard's avatar David Douard
Browse files

Put swh dependencies in a dedicated extra requirements

to prevent weird race condition when both requirements-swh.txt and
requirements-swh-dev.txt are added as requirements.

This is needed to make:

  tox -e sphinx-dev

work as expected, ie. with swh packages installed from sources rather than
from pypi.
parent 248cfec0
No related branches found
No related tags found
1 merge request!13Put swh dependencies in a dedicated extra requirements
...@@ -29,9 +29,10 @@ setup( ...@@ -29,9 +29,10 @@ setup(
url='https://forge.softwareheritage.org/source/swh-docs/', url='https://forge.softwareheritage.org/source/swh-docs/',
packages=find_packages(), packages=find_packages(),
scripts=[], scripts=[],
install_requires=parse_requirements() + parse_requirements('swh'), install_requires=parse_requirements(),
setup_requires=['vcversioner'], setup_requires=['vcversioner'],
extras_require={'testing': parse_requirements('test')}, extras_require={'testing': parse_requirements('test'),
'building': parse_requirements('swh')},
vcversioner={}, vcversioner={},
include_package_data=True, include_package_data=True,
) )
...@@ -8,10 +8,10 @@ passenv = SPHINXOPTS ...@@ -8,10 +8,10 @@ passenv = SPHINXOPTS
[testenv:sphinx] [testenv:sphinx]
deps = deps =
django < 2 django < 2
.[testing] .[building]
pifpaf pifpaf
commands = commands =
{envpython} -m pifpaf run postgresql -- make -C docs html {envpython} -m pifpaf run postgresql -- make -C docs {posargs:html}
[testenv:sphinx-dev] [testenv:sphinx-dev]
deps = deps =
...@@ -19,7 +19,7 @@ deps = ...@@ -19,7 +19,7 @@ deps =
-rrequirements-swh-dev.txt -rrequirements-swh-dev.txt
pifpaf pifpaf
commands = commands =
{envpython} -m pifpaf run postgresql -- make -C docs html {envpython} -m pifpaf run postgresql -- make -C docs {posargs:html}
[testenv:flake8] [testenv:flake8]
skip_install = true skip_install = true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment