diff --git a/Makefile.local b/Makefile.local --- a/Makefile.local +++ b/Makefile.local @@ -8,9 +8,9 @@ tox -vv -r -e sphinx-dev pip-install-swh-dev: - python3 -m pip install . - python3 -m pip install pifpaf + python3 -m pip install --no-build-isolation . + python3 -m pip install --no-build-isolation setuptools-scm pifpaf sed 's/#.*$$//;/^$$/d' requirements-swh-dev.txt | \ while IFS= read -r package; do \ - python3 -m pip install $$package ; \ + python3 -m pip install --no-build-isolation $$package ; \ done diff --git a/requirements-swh-dev.txt b/requirements-swh-dev.txt --- a/requirements-swh-dev.txt +++ b/requirements-swh-dev.txt @@ -1,34 +1,32 @@ # Add here internal Software Heritage dependencies, one per line. # Dependencies need to be ordered in a way that ensure only # development versions will be used (not the release ones hosted on PyPI). -# -# This is NOT in alphabetical order -../swh-core[http,db,logging] -../swh-auth[django] -../swh-model -../swh-journal -../swh-counters -../swh-objstorage[testing] -../swh-storage -../swh-objstorage-replayer -../swh-scheduler[simulator] -../swh-deposit[server] -../swh-graph -../swh-icinga-plugins -../swh-indexer -../swh-lister -../swh-loader-core -../swh-loader-bzr -../swh-loader-git -../swh-loader-mercurial -../swh-loader-svn -../swh-loader-cvs -../swh-perfecthash -../swh-scrubber -../swh-search -../swh-vault -../swh-web -../swh-web-client -../swh-scanner -../swh-fuse +swh.auth[django] @ file://${ENVDIR}/swh-auth/ +swh.core[http,db,logging] @ file://${ENVDIR}/swh-core/ +swh.counters @ file://${ENVDIR}/swh-counters/ +swh.deposit[server] @ file://${ENVDIR}/swh-deposit/ +swh.fuse @ file://${ENVDIR}/swh-fuse/ +swh.graph @ file://${ENVDIR}/swh-graph/ +swh.icinga.plugins @ file://${ENVDIR}/swh-icinga-plugins/ +swh.indexer @ file://${ENVDIR}/swh-indexer/ +swh.journal @ file://${ENVDIR}/swh-journal/ +swh.lister @ file://${ENVDIR}/swh-lister/ +swh.loader.bzr @ file://${ENVDIR}/swh-loader-bzr/ +swh.loader.core @ file://${ENVDIR}/swh-loader-core/ +swh.loader.cvs @ file://${ENVDIR}/swh-loader-cvs/ +swh.loader.git @ file://${ENVDIR}/swh-loader-git/ +swh.loader.mercurial @ file://${ENVDIR}/swh-loader-mercurial/ +swh.loader.svn @ file://${ENVDIR}/swh-loader-svn/ +swh.model @ file://${ENVDIR}/swh-model/ +swh.objstorage.replayer @ file://${ENVDIR}/swh-objstorage-replayer/ +swh.objstorage[testing] @ file://${ENVDIR}/swh-objstorage/ +swh.perfecthash @ file://${ENVDIR}/swh-perfecthash/ +swh.scanner @ file://${ENVDIR}/swh-scanner/ +swh.scheduler[simulator] @ file://${ENVDIR}/swh-scheduler/ +swh.scrubber @ file://${ENVDIR}/swh-scrubber/ +swh.search @ file://${ENVDIR}/swh-search/ +swh.storage @ file://${ENVDIR}/swh-storage/ +swh.vault @ file://${ENVDIR}/swh-vault/ +swh.web @ file://${ENVDIR}/swh-web/ +swh.web.client @ file://${ENVDIR}/swh-web-client/ diff --git a/tox.ini b/tox.ini --- a/tox.ini +++ b/tox.ini @@ -19,11 +19,11 @@ {envpython} -m pifpaf run postgresql -- make -C docs {posargs:html} [testenv:sphinx-dev] -whitelist_externals = make -# workaround really long dependencies installation due to the -# new pip resolver and its backtracking processes -install_command = make pip-install-swh-dev {packages} +deps = + pifpaf + -r requirements-swh-dev.txt setenv = + ENVDIR = {toxinidir}/.. SWHPKGDIR = {envsitepackagesdir}/swh commands = {envpython} -m pifpaf run postgresql -- make -C sysadm {posargs:html}