Skip to content

Commit

Permalink
doc: move requirements to doc/
Browse files Browse the repository at this point in the history
Zephyr scripts do not require documentation dependencies, so let's
move them from scripts/ to doc/.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
  • Loading branch information
gmarull authored and nashif committed Jul 12, 2023
1 parent b990a5f commit 7f9215d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/doc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
- 'west.yml'
- '.github/workflows/doc-build.yml'
- 'scripts/dts/**'
- 'scripts/requirements-doc.txt'
- 'doc/requirements.txt'

env:
# NOTE: west docstrings will be extracted from the version listed here
Expand Down Expand Up @@ -57,12 +57,12 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: pip-${{ hashFiles('scripts/requirements-doc.txt') }}
key: pip-${{ hashFiles('doc/requirements.txt') }}

- name: install-pip
run: |
sudo pip3 install -U setuptools wheel pip
pip3 install -r scripts/requirements-doc.txt
pip3 install -r doc/requirements.txt
pip3 install west==${WEST_VERSION}
pip3 install cmake==${CMAKE_VERSION}
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: pip-${{ hashFiles('scripts/requirements-doc.txt') }}
key: pip-${{ hashFiles('doc/requirements.txt') }}

- name: setup-venv
run: |
Expand All @@ -148,7 +148,7 @@ jobs:
- name: install-pip
run: |
pip3 install -U setuptools wheel pip
pip3 install -r scripts/requirements-doc.txt
pip3 install -r doc/requirements.txt
pip3 install west==${WEST_VERSION}
pip3 install cmake==${CMAKE_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion doc/contribute/documentation/generation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Our documentation processing has been tested to run with:
* Graphviz 2.43
* Latexmk version 4.56
* All Python dependencies listed in the repository file
``scripts/requirements-doc.txt``
``doc/requirements.txt``

In order to install the documentation tools, first install Zephyr as
described in :ref:`getting_started`. Then install additional tools
Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion scripts/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
-r requirements-base.txt
-r requirements-build-test.txt
-r requirements-doc.txt
-r requirements-run-test.txt
-r requirements-extras.txt
-r requirements-compliance.txt

0 comments on commit 7f9215d

Please sign in to comment.