From 53326b7d007fd24032e24a478014e95f200f3b02 Mon Sep 17 00:00:00 2001
From: David Douard <david.douard@sdfa3.org>
Date: Thu, 29 Nov 2018 14:40:39 +0100
Subject: [PATCH] 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.
---
setup.py | 5 +++--
tox.ini | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/setup.py b/setup.py
index 172dc4b6..5ad80b5a 100644
--- a/setup.py
+++ b/setup.py
@@ -29,9 +29,10 @@ setup(
url='https://forge.softwareheritage.org/source/swh-docs/',
packages=find_packages(),
scripts=[],
- install_requires=parse_requirements() + parse_requirements('swh'),
+ install_requires=parse_requirements(),
setup_requires=['vcversioner'],
- extras_require={'testing': parse_requirements('test')},
+ extras_require={'testing': parse_requirements('test'),
+ 'building': parse_requirements('swh')},
vcversioner={},
include_package_data=True,
)
diff --git a/tox.ini b/tox.ini
index 31b15554..5be833c5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,10 +8,10 @@ passenv = SPHINXOPTS
[testenv:sphinx]
deps =
django < 2
- .[testing]
+ .[building]
pifpaf
commands =
- {envpython} -m pifpaf run postgresql -- make -C docs html
+ {envpython} -m pifpaf run postgresql -- make -C docs {posargs:html}
[testenv:sphinx-dev]
deps =
@@ -19,7 +19,7 @@ deps =
-rrequirements-swh-dev.txt
pifpaf
commands =
- {envpython} -m pifpaf run postgresql -- make -C docs html
+ {envpython} -m pifpaf run postgresql -- make -C docs {posargs:html}
[testenv:flake8]
skip_install = true
--
GitLab