Revert "update pydir call and fix format"

This reverts commit 7468883dc0.
This commit is contained in:
ch3ll 2020-04-20 09:35:13 -04:00
parent 2586f716b2
commit 5994376c11
No known key found for this signature in database
GPG key ID: 1124C6796EBDBD8D
2 changed files with 2 additions and 4 deletions

View file

@ -6,8 +6,6 @@ This changelog follows [keepachangelog](https://keepachangelog.com/en/1.0.0/) fo
This project versioning is _similar_ to [Semantic Versioning](https://semver.org), and is documented in [SEP 14](https://github.com/saltstack/salt-enhancement-proposals/pull/20/files).
Versions are `MAJOR.PATCH`.
# Changelog
## 3001 - Sodium
### Removed

View file

@ -1091,7 +1091,7 @@ def docs_html(session, compress):
if pydir == "py3.4":
session.error("Sphinx only runs on Python >= 3.5")
requirements_file = "requirements/static/docs.in"
distro_constraints = ["requirements/static/{}/docs.txt".format(pydir)]
distro_constraints = ["requirements/static/{}/docs.txt".format(_get_pydir(session))]
install_command = ["--progress-bar=off", "-r", requirements_file]
for distro_constraint in distro_constraints:
install_command.extend(["--constraint", distro_constraint])
@ -1115,7 +1115,7 @@ def docs_man(session, compress, update):
if pydir == "py3.4":
session.error("Sphinx only runs on Python >= 3.5")
requirements_file = "requirements/static/docs.in"
distro_constraints = ["requirements/static/{}/docs.txt".format(pydir)]
distro_constraints = ["requirements/static/{}/docs.txt".format(_get_pydir(session))]
install_command = ["--progress-bar=off", "-r", requirements_file]
for distro_constraint in distro_constraints:
install_command.extend(["--constraint", distro_constraint])