Skip to content

Commit 02b605f

Browse files
authored
docs: build the sphinx documentation on windows (#1891)
This commit enables building the sphinx documentation on windows. The make.bat needed to do so was missing and is added in this commit. To build the documentation from a fresh git clone you need to run these commands: pixi install pixi run update-flopy pixi run get-exes pixi run setup builddir pixi run build builddir pixi run benchmark pixi run sphinx Furthermore I added the rtd environment to the pixi.toml. When building sphinx you now don't have to manually pip install the requirements.rtd.txt. Instead the task will automatically use the rtd environment Finally i updated the github pipeline files. The newly generated pixi.lock is using version 5 which needs a newer pixi version. I also removed the pixi run install as this is no longer required.
1 parent ba29c04 commit 02b605f

File tree

11 files changed

+14600
-2223
lines changed

11 files changed

+14600
-2223
lines changed

.build_rtd_docs/make.bat

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
@ECHO OFF
2+
3+
pushd %~dp0
4+
5+
REM Command file for Sphinx documentation
6+
7+
if "%SPHINXBUILD%" == "" (
8+
set SPHINXBUILD=sphinx-build
9+
)
10+
set SOURCEDIR=.
11+
set BUILDDIR=_build
12+
13+
if "%1" == "" goto help
14+
15+
%SPHINXBUILD% >NUL 2>NUL
16+
if errorlevel 9009 (
17+
echo.
18+
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
19+
echo.installed, then set the SPHINXBUILD environment variable to point
20+
echo.to the full path of the 'sphinx-build' executable. Alternatively you
21+
echo.may add the Sphinx directory to PATH.
22+
echo.
23+
echo.If you don't have Sphinx installed, grab it from
24+
echo.http://sphinx-doc.org/
25+
exit /b 1
26+
)
27+
28+
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
29+
goto end
30+
31+
:help
32+
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
33+
34+
:end
35+
popd

.build_rtd_docs/requirements.rtd.txt

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

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151

5252
- uses: prefix-dev/[email protected]
5353
with:
54-
pixi-version: v0.19.1
54+
pixi-version: v0.24.2
5555

5656
- name: Check Fortran source formatting
5757
run: pixi run check-format
@@ -81,7 +81,7 @@ jobs:
8181

8282
- uses: prefix-dev/[email protected]
8383
with:
84-
pixi-version: v0.19.1
84+
pixi-version: v0.24.2
8585

8686
- name: Meson setup
8787
run: pixi run setup -Dwerror=true builddir
@@ -126,7 +126,7 @@ jobs:
126126
- name: Setup pixi
127127
uses: prefix-dev/[email protected]
128128
with:
129-
pixi-version: v0.19.1
129+
pixi-version: v0.24.2
130130
manifest-path: "modflow6/pixi.toml"
131131

132132
- name: Custom pixi install
@@ -225,7 +225,7 @@ jobs:
225225
- name: Setup pixi
226226
uses: prefix-dev/[email protected]
227227
with:
228-
pixi-version: v0.19.1
228+
pixi-version: v0.24.2
229229
manifest-path: "modflow6/pixi.toml"
230230

231231
- name: Custom pixi install
@@ -364,7 +364,7 @@ jobs:
364364
- name: Setup pixi
365365
uses: prefix-dev/[email protected]
366366
with:
367-
pixi-version: v0.19.1
367+
pixi-version: v0.24.2
368368
manifest-path: "modflow6/pixi.toml"
369369

370370
- name: Custom pixi install
@@ -455,7 +455,7 @@ jobs:
455455
- name: Setup pixi
456456
uses: prefix-dev/[email protected]
457457
with:
458-
pixi-version: v0.19.1
458+
pixi-version: v0.24.2
459459
manifest-path: "modflow6/pixi.toml"
460460

461461
- name: Custom pixi install

.github/workflows/compilers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
- name: Setup pixi
141141
uses: prefix-dev/[email protected]
142142
with:
143-
pixi-version: v0.19.1
143+
pixi-version: v0.24.2
144144
manifest-path: "modflow6/pixi.toml"
145145

146146
- name: Custom pixi install

.github/workflows/docs.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
- uses: prefix-dev/[email protected]
3030
with:
31-
pixi-version: v0.19.1
31+
pixi-version: v0.24.2
3232

3333
- name: Check spelling
3434
run: pixi run check-spelling
@@ -65,17 +65,13 @@ jobs:
6565
- name: Setup pixi
6666
uses: prefix-dev/[email protected]
6767
with:
68-
pixi-version: v0.19.1
68+
pixi-version: v0.24.2
6969
manifest-path: "modflow6/pixi.toml"
7070

7171
- name: Custom pixi install
7272
working-directory: modflow6
7373
run: pixi run install
7474

75-
- name: Install additional packages for Sphinx using pip
76-
working-directory: modflow6/.build_rtd_docs
77-
run: pixi run pip install -r requirements.rtd.txt
78-
7975
- name: Print python package versions
8076
working-directory: modflow6
8177
run: pixi run pip list
@@ -230,7 +226,7 @@ jobs:
230226
- name: Setup pixi
231227
uses: prefix-dev/[email protected]
232228
with:
233-
pixi-version: v0.19.1
229+
pixi-version: v0.24.2
234230

235231
- name: Custom pixi install
236232
run: pixi run install

.github/workflows/large.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
- name: Setup pixi
7070
uses: prefix-dev/[email protected]
7171
with:
72-
pixi-version: v0.19.1
72+
pixi-version: v0.24.2
7373
manifest-path: "modflow6/pixi.toml"
7474

7575
- name: Custom pixi install

.github/workflows/pixi_auto_update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515
- uses: prefix-dev/[email protected]
1616
with:
17-
pixi-version: v0.19.1
17+
pixi-version: v0.24.2
1818
cache: false
1919

2020
- name: Update pixi lock file

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
- name: Setup pixi
111111
uses: prefix-dev/[email protected]
112112
with:
113-
pixi-version: v0.19.1
113+
pixi-version: v0.24.2
114114
manifest-path: "modflow6/pixi.toml"
115115

116116
- name: Custom pixi install

.readthedocs.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,3 @@ sphinx:
2020

2121
# Optionally build your docs in additional formats such as PDF and ePub
2222
formats: all
23-
24-
# Optionally set the version of Python and requirements required to build your docs
25-
python:
26-
install:
27-
- requirements: .build_rtd_docs/requirements.rtd.txt

0 commit comments

Comments
 (0)