Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2.7] bpo-31036: Allow sphinx and blurb to be found automatically. #16638

Merged
merged 1 commit into from Oct 8, 2019
+14 −7
Merged

[2.7] bpo-31036: Allow sphinx and blurb to be found automatically. #16638

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 .gitignore
View file
Open in desktop
@@ -16,10 +16,10 @@
*.profraw
*.dyn
Doc/build/
Doc/tools/docutils/
Doc/tools/jinja2/
Doc/tools/pygments/
Doc/tools/sphinx/
Doc/venv/
Doc/.venv/
Doc/env/
Doc/.env/
Lib/lib2to3/*.pickle
Lib/test/data/*
Makefile
13 Doc/Makefile
View file
Open in desktop
@@ -5,7 +5,9 @@

# You can set these variables from the command line.
PYTHON = python
SPHINXBUILD = sphinx-build
VENVDIR = ./venv
SPHINXBUILD = PATH=$(VENVDIR)/bin:$$PATH sphinx-build
BLURB = PATH=$(VENVDIR)/bin:$$PATH blurb
PAPER =
SOURCES =
DISTVERSION = $(shell $(PYTHON) tools/extensions/patchlevel.py)
@@ -102,7 +104,12 @@ htmlview: html
$(PYTHON) -c "import webbrowser; webbrowser.open('build/html/index.html')"

clean:
-rm -rf build/*
-rm -rf build/* $(VENVDIR)/*

venv:
$(PYTHON) -m venv $(VENVDIR)
$(VENVDIR)/bin/python3 -m pip install -U Sphinx blurb
@echo "The venv has been created in the $(VENVDIR) directory"

dist:
rm -rf dist
@@ -148,7 +155,7 @@ dist:
cp -pPR build/epub/Python.epub dist/python-$(DISTVERSION)-docs.epub

check:
$(PYTHON)2 tools/rstlint.py -i tools
$(PYTHON)2 tools/rstlint.py -i tools -i $(VENVDIR)

serve:
../Tools/scripts/serve.py build/html