mirror of
https://github.com/clearlinux/clear-linux-documentation.git
synced 2026-11-21 19:15:51 +00:00
In top Makefile, adds venv target to use virtualenv: (#741)
- Contributors may run `make venv` and install requirements.txt without modifying host OS - Innermost `requirements.txt`, 2 dependencies, moved to uppermost requirements.txt - Adds `venv` to .gitignore in case contributors/developer forget to remove. - Reverts source/conf.py to original. - Replaces python command with python3 in innermost _python/Makefile Signed-off-by: Michael Vincerra <michael.vincerra@intel.com>
This commit is contained in:
@@ -14,3 +14,6 @@ source/_build
|
||||
# ignore artifacts generated by running make py
|
||||
cloned_repo
|
||||
bundles.html.txt
|
||||
|
||||
# ignore the venv, used for running make py
|
||||
venv
|
||||
|
||||
+3
-4
@@ -4,12 +4,11 @@ python:
|
||||
- "3.6"
|
||||
|
||||
# command to install dependencies
|
||||
install:
|
||||
install:
|
||||
- pip3 install -q -r requirements.txt
|
||||
- pip3 install -q -r source/_scripts/_python/requirements.txt
|
||||
|
||||
# command to run tests
|
||||
script:
|
||||
script:
|
||||
- make py
|
||||
- make htmlall
|
||||
|
||||
@@ -52,4 +51,4 @@ deploy:
|
||||
|
||||
after_deploy:
|
||||
- wget $PUBLISH_URL
|
||||
- cat clearlinux-latest
|
||||
- cat clearlinux-latest
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
# Makefile for Sphinx documentation
|
||||
#
|
||||
|
||||
SHELL := /bin/bash
|
||||
|
||||
PY_VERSION ?= 3.6
|
||||
|
||||
all:
|
||||
make -C source html
|
||||
@@ -28,4 +31,10 @@ help:
|
||||
|
||||
clean:
|
||||
make -C source clean
|
||||
rm -rf venv
|
||||
|
||||
venv:
|
||||
virtualenv -p python$(PY_VERSION) venv;
|
||||
source venv/bin/activate; \
|
||||
pip3 install -r requirements.txt;
|
||||
|
||||
|
||||
+3
-1
@@ -3,4 +3,6 @@ sphinx==1.8
|
||||
docutils==0.14
|
||||
sphinx_rtd_theme
|
||||
sphinx-intl==2.0.0
|
||||
sphinx-sitemap==1.0.2
|
||||
sphinx-sitemap==1.0.2
|
||||
Jinja2==2.10.1
|
||||
GitPython==2.1.11
|
||||
|
||||
+2
-1
@@ -53,8 +53,9 @@ help:
|
||||
|
||||
clean:
|
||||
rm -rf $(BUILDDIR)/*
|
||||
rm -rf reference/bundles/*.txt
|
||||
|
||||
htmlall:
|
||||
htmlall:
|
||||
$(SPHINXBUILD) -b html $(ERROROPTS) $(ALLSPHINXOPTS) $(BUILDDIR)/html
|
||||
$(SPHINXBUILD) -b html $(ERROROPTS) -D language='zh_CN' $(ALLSPHINXOPTS) $(BUILDDIR)/zh_CN
|
||||
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
|
||||
py:
|
||||
python bundle_lister.py
|
||||
python3 bundle_lister.py
|
||||
cp bundles.html.txt ../../reference/bundles
|
||||
rm -rf bundle_lister/cloned_repo/*
|
||||
rm -rf ./cloned_repo/*
|
||||
rm bundles.html.txt
|
||||
@echo "Python script finished successfully!"
|
||||
|
||||
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
Jinja2==2.10.1
|
||||
GitPython==2.1.11
|
||||
+2
-1
@@ -330,4 +330,5 @@ texinfo_documents = [
|
||||
locale_dirs = ['../locale/'] # path for lang-specific po files.
|
||||
gettext_compact = False # optional.
|
||||
|
||||
html_baseurl = 'https://docs.01.org/clearlinux/'
|
||||
html_baseurl = 'https://docs.01.org/clearlinux/'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user