-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
buildchain, docs, salt, tests: run
pip-compile
Due to changes in `pluggy` (a dependency of `pytest`) using the `importlib.metadata` module from the standard library instead of the `importlib-metadata` package when running on Python >= 3.8, we need to pin the `basepython` used in the `pip-compile` Tox env to the version that's actually used in CI, otherwise `pip` complains during installation of dependencies the `importlib-metadata` package is not listed (with hashes) in some `requirements.txt`. As such, setting `basepython` to `python3.6`, similar to 8a9104b. Also, update the versions of `pip` and `pip-tools` used in the `pip-compile` `tox` target, and use the `--allow-unsafe` flag which is supposedly not really unsafe at all (and will become the default). Finally, since we're currently unable to properly update the MacOS X platform-specific dependencies for the buildchain (in `buildchain/requirements-Darwin.txt`), the updates to `buildchain/requirements-Linux.txt` are manually reverted (after running `tox -e pip-compile` on a Linux host) to ensure both `buildchain/requirements-Linux.txt` and `buildchain/requirements-Darwin.txt` remain in sync (except for `pyinotify` and `macfsevents`, as usual). See: 8a9104b Closes: #2897 Closes: #2898 See: pytest-dev/pluggy#222 See: https://github.com/pytest-dev/pluggy/pull/223/files#diff-60f61ab7a8d1910d86d9fda2261620314edcae5894d5aaa236b821c7256badd7 See: jazzband/pip-tools#806 (comment) See: #2986 (comment)
- Loading branch information
Showing
5 changed files
with
383 additions
and
303 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,46 +4,50 @@ | |
# | ||
# tox -e pip-compile | ||
# | ||
-e git+https://github.com/scality/[email protected]#egg=sphinx_scality | ||
-e git+https://github.com/scality/[email protected]#egg=sphinx_scality # via -r docs/requirements.in | ||
alabaster==0.7.12 # via sphinx | ||
babel==2.9.0 # via sphinx | ||
certifi==2020.11.8 # via requests | ||
chardet==3.0.4 # via doc8, requests | ||
colorama==0.4.4 | ||
doc8==0.8.1 | ||
certifi==2020.12.5 # via requests | ||
chardet==4.0.0 # via doc8, requests | ||
colorama==0.4.4 # via -r docs/requirements.in | ||
doc8==0.8.1 # via -r docs/requirements.in | ||
docutils==0.16 # via doc8, restructuredtext-lint, sphinx, sphinxcontrib-github-alt | ||
httplib2==0.18.1 # via plantuml | ||
idna==2.10 # via requests | ||
imagesize==1.2.0 # via sphinx | ||
importlib-metadata==3.1.0 # via sphinxcontrib-spelling, stevedore | ||
importlib-metadata==3.3.0 # via sphinxcontrib-spelling, stevedore | ||
jinja2==2.11.2 # via sphinx | ||
livereload==2.6.3 # via sphinx-autobuild | ||
markupsafe==1.1.1 # via jinja2 | ||
packaging==20.4 # via sphinx | ||
packaging==20.8 # via sphinx | ||
pbr==5.5.1 # via stevedore | ||
plantuml==0.3.0 | ||
pyenchant==3.1.1 # via sphinxcontrib-spelling | ||
pygments==2.7.2 # via doc8, sphinx | ||
plantuml==0.3.0 # via -r docs/requirements.in | ||
pyenchant==3.2.0 # via sphinxcontrib-spelling | ||
pygments==2.7.3 # via doc8, sphinx | ||
pyparsing==2.4.7 # via packaging | ||
pytz==2020.4 # via babel | ||
pyyaml==5.3.1 | ||
requests==2.25.0 # via sphinx | ||
pyyaml==5.3.1 # via -r docs/requirements.in | ||
requests==2.25.1 # via sphinx | ||
restructuredtext-lint==1.3.2 # via doc8 | ||
six==1.15.0 # via doc8, livereload, packaging | ||
six==1.15.0 # via doc8, livereload | ||
snowballstemmer==2.0.0 # via sphinx | ||
sphinx-autobuild==2020.9.1 | ||
sphinx-rtd-theme==0.5.0 | ||
sphinx==3.3.1 | ||
sphinx-autobuild==2020.9.1 # via -r docs/requirements.in | ||
sphinx-rtd-theme==0.5.0 # via -r docs/requirements.in | ||
sphinx==3.3.1 # via -r docs/requirements.in, sphinx-autobuild, sphinx-rtd-theme, sphinx-scality, sphinxcontrib-github-alt, sphinxcontrib-plantuml, sphinxcontrib-spelling | ||
sphinxcontrib-applehelp==1.0.2 # via sphinx | ||
sphinxcontrib-devhelp==1.0.2 # via sphinx | ||
sphinxcontrib-github-alt==1.2 | ||
sphinxcontrib-github-alt==1.2 # via -r docs/requirements.in | ||
sphinxcontrib-htmlhelp==1.0.3 # via sphinx | ||
sphinxcontrib-jsmath==1.0.1 # via sphinx | ||
sphinxcontrib-plantuml==0.19 | ||
sphinxcontrib-plantuml==0.19 # via -r docs/requirements.in | ||
sphinxcontrib-qthelp==1.0.3 # via sphinx | ||
sphinxcontrib-serializinghtml==1.1.4 # via sphinx | ||
sphinxcontrib-spelling==7.1.0 | ||
stevedore==3.2.2 # via doc8 | ||
sphinxcontrib-spelling==7.1.0 # via -r docs/requirements.in | ||
stevedore==3.3.0 # via doc8 | ||
tornado==6.1 # via livereload | ||
typing-extensions==3.7.4.3 # via importlib-metadata | ||
urllib3==1.26.2 # via requests | ||
zipp==3.4.0 # via importlib-metadata | ||
|
||
# The following packages are considered to be unsafe in a requirements file: | ||
setuptools==51.0.0 # via sphinx |
Oops, something went wrong.