Skip to content

Commit 8ce918e

Browse files
authored
Merge pull request #2896 from nexB/fix-doc-builds
Fix doc builds
2 parents 0084a7d + 6063a08 commit 8ce918e

File tree

10 files changed

+405
-187
lines changed

10 files changed

+405
-187
lines changed

.github/workflows/ci-docs.yml renamed to .github/workflows/docs-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
max-parallel: 4
1111
matrix:
12-
python-version: [3.7]
12+
python-version: [3.9]
1313

1414
steps:
1515
- name: Checkout code
@@ -24,14 +24,14 @@ jobs:
2424
run: chmod +x ./docs/scripts/doc8_style_check.sh
2525

2626
- name: Install Dependencies
27-
working-directory: ./docs
28-
run: pip install -r requirements.txt
27+
run: pip install -e .[docs]
2928

3029
- name: Check Sphinx Documentation build minimally
3130
working-directory: ./docs
32-
run: sphinx-build -E source build
31+
run: sphinx-build -E -W source build
3332

3433
- name: Check for documentation style errors
3534
working-directory: ./docs
3635
run: ./scripts/doc8_style_check.sh
3736

37+

configure

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ CLI_ARGS=$1
3030
# Requirement arguments passed to pip and used by default or with --dev.
3131
REQUIREMENTS="--editable . --constraint requirements.txt"
3232
DEV_REQUIREMENTS="--editable .[testing,packages] --constraint requirements.txt --constraint requirements-dev.txt"
33+
DOCS_REQUIREMENTS="--editable .[docs] --constraint requirements.txt"
3334

3435
# where we create a virtualenv
3536
VIRTUALENV_DIR=venv
@@ -178,6 +179,7 @@ while getopts :-: optchar; do
178179
help ) cli_help;;
179180
clean ) find_python && clean;;
180181
dev ) CFG_REQUIREMENTS="$DEV_REQUIREMENTS";;
182+
docs ) CFG_REQUIREMENTS="$DOCS_REQUIREMENTS";;
181183
esac;;
182184
esac
183185
done

configure.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
@rem # Requirement arguments passed to pip and used by default or with --dev.
2929
set "REQUIREMENTS=--editable . --constraint requirements.txt"
3030
set "DEV_REQUIREMENTS=--editable .[testing] --constraint requirements.txt --constraint requirements-dev.txt"
31+
set "DOCS_REQUIREMENTS=--editable .[docs] --constraint requirements.txt"
3132

3233
@rem # where we create a virtualenv
3334
set "VIRTUALENV_DIR=venv"
@@ -78,6 +79,9 @@ if not "%1" == "" (
7879
if "%1" EQU "--dev" (
7980
set "CFG_REQUIREMENTS=%DEV_REQUIREMENTS%"
8081
)
82+
if "%1" EQU "--docs" (
83+
set "CFG_REQUIREMENTS=%DOCS_REQUIREMENTS%"
84+
)
8185
shift
8286
goto again
8387
)

docs/requirements.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

docs/skeleton-usage.rst

Lines changed: 0 additions & 158 deletions
This file was deleted.

0 commit comments

Comments
 (0)