Skip to content

Commit b33ad32

Browse files
committed
html docs build
1 parent df0414a commit b33ad32

File tree

3 files changed

+39
-56
lines changed

3 files changed

+39
-56
lines changed

.github/workflows/ci.yaml

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -47,47 +47,43 @@ jobs:
4747
with:
4848
python-version: ${{ matrix.python-version }}
4949

50-
- name: Deploy Information
51-
if: ${{ github.event.inputs.deploy && env.python_version == env.python_deploy_version }}
52-
run: |
53-
echo "The HTML NeXus Wiki will be pushed to"
54-
echo " https://github.com/nexusformat/wiki/tree/gh-pages"
55-
echo "The HTML NeXus Wiki will be deployed on"
56-
echo " https://nexusformat.github.io/wiki/"
50+
# - name: Deploy Information
51+
# if: ${{ github.event.inputs.deploy && env.python_version == env.python_deploy_version }}
52+
# run: |
53+
# echo "The HTML NeXus Wiki will be pushed to"
54+
# echo " https://github.com/nexusformat/wiki/tree/gh-pages"
55+
# echo "The HTML NeXus Wiki will be deployed on"
56+
# echo " https://nexusformat.github.io/wiki/"
5757

5858
- name: Install Requirements
5959
run: |
6060
python3 -m pip install --upgrade pip setuptools
6161
make install
6262
python3 -m pip list
6363
64-
- name: Check Code Style
65-
run: |
66-
make style
67-
68-
- name: Install LaTeX
69-
run: |
70-
sudo apt-get update -y && \
71-
sudo apt-get install -y \
72-
latexmk \
73-
texlive-latex-recommended \
74-
texlive-latex-extra \
75-
texlive-fonts-recommended
76-
tex --version
77-
78-
- name: Generate build files
79-
env:
80-
GH_TOKEN: ${{ (env.python_version == env.python_deploy_version && (github.event.inputs.deploy || github.event.inputs.upload)) || 'NONE' }}
81-
run: |
82-
make prepare
64+
# - name: Install LaTeX
65+
# run: |
66+
# sudo apt-get update -y && \
67+
# sudo apt-get install -y \
68+
# latexmk \
69+
# texlive-latex-recommended \
70+
# texlive-latex-extra \
71+
# texlive-fonts-recommended
72+
# tex --version
8373

74+
# - name: Build Wiki
75+
# run: |
76+
# make pdf
77+
# make html
78+
# ls -lAFgh build/manual/build/html/index.html
79+
# mkdir -p build/html
80+
# mv build/manual/build/html/* build/html
8481
- name: Build Wiki
8582
run: |
86-
make pdf
8783
make html
88-
ls -lAFgh build/manual/build/html/index.html
84+
ls -lAFgh wiki/source/build/html/index.html
8985
mkdir -p build/html
90-
mv build/manual/build/html/* build/html
86+
mv wiki/source/build/html/* build/html
9187
9288
# - name: Deploy Wiki
9389
# if: ${{ github.event.inputs.deploy && env.python_version == env.python_deploy_version }}

Makefile

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# File: Makefile
22

33
# purpose:
4-
# build resources in NeXus definitions tree
4+
# build resources in NeXus Wiki
55

66
PYTHON = python3
77
SPHINX = sphinx-build
@@ -15,13 +15,10 @@ help ::
1515
@echo ""
1616

1717
@echo "make install Install all requirements to run tests and builds."
18-
@echo "make style Check python coding style."
19-
@echo "make autoformat Format all files to the coding style conventions."
20-
@echo "make test Run documentation tests."
2118
@echo "make clean Remove all build files."
22-
@echo "make prepare (Re)create all build files."
19+
# @echo "make prepare (Re)create all build files."
2320
@echo "make html Build HTML version of manual. Requires prepare first."
24-
@echo "make pdf Build PDF version of manual. Requires prepare first."
21+
# @echo "make pdf Build PDF version of manual. Requires prepare first."
2522
@echo "make fetch-logo Copy the official logo files from the manual repository."
2623
@echo "make all Builds complete web site for the wiki (in build directory)."
2724
@echo "make local (Developer use) Test, prepare and build the HTML wiki."
@@ -35,32 +32,22 @@ help ::
3532
install ::
3633
$(PYTHON) -m pip install -r requirements.txt
3734

38-
style ::
39-
$(PYTHON) -m black --check dev_tools
40-
$(PYTHON) -m flake8 dev_tools
41-
$(PYTHON) -m isort --check dev_tools
42-
43-
autoformat ::
44-
$(PYTHON) -m black dev_tools
45-
$(PYTHON) -m isort dev_tools
46-
4735
clean ::
4836
$(RM) -rf ./wiki/source/$(BUILD_DIR)
4937

50-
prepare ::
51-
$(PYTHON) -m dev_tools wiki --prepare --build-root $(BUILD_DIR)
38+
#prepare ::
39+
# $(PYTHON) -m wiki --prepare --build-root $(BUILD_DIR)
5240

53-
# pdf ::
54-
# $(SPHINX) -M latexpdf $(BUILD_DIR)/wiki/source/ $(BUILD_DIR)/wiki/build
55-
# cp $(BUILD_DIR)/manual/build/latex/nexus.pdf $(BUILD_DIR)/wiki/source/_static/NeXusManual.pdf
41+
pdf ::
42+
$(SPHINX) -M latexpdf ./wiki/source/ ./wiki/$(BUILD_DIR)
43+
cp $(BUILD_DIR)/wiki/build/latex/nexus.pdf $(BUILD_DIR)/wiki/source/_static/NeXusWiki.pdf
5644

5745
html: fetch-logo
5846
$(SPHINX) -b html -W ./wiki/source/ ./wiki/source/$(BUILD_DIR)/html
5947

6048
# for developer's use on local build host
6149
local ::
62-
$(MAKE) test
63-
$(MAKE) prepare
50+
# $(MAKE) prepare
6451
$(MAKE) html
6552

6653
fetch-logo:
@@ -71,10 +58,10 @@ fetch-logo:
7158

7259
all ::
7360
$(MAKE) clean
74-
$(MAKE) prepare
75-
$(MAKE) pdf
61+
# $(MAKE) prepare
62+
# $(MAKE) pdf
7663
$(MAKE) html
77-
@echo "HTML built: `ls -lAFgh $(BUILD_DIR)/wiki/build/html/index.html`"
64+
@echo "HTML built: `ls -lAFgh wiki/build/html/index.html`"
7865

7966

8067

@@ -98,4 +85,4 @@ all ::
9885
# License along with this library; if not, write to the Free Software
9986
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
10087
#
101-
# For further information, see http://www.nexusformat.org
88+
# For further information, see http://www.nexusformat.org

wiki/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
# Add any paths that contain custom static files (such as style sheets) here,
7373
# relative to this directory. They are copied after the builtin static files,
7474
# so a file named "default.css" will overwrite the builtin "default.css".
75-
html_static_path = ["_static"]
75+
# html_static_path = ["_static"]
7676
# html_extra_path = ['md']
7777

7878
# Add extra files

0 commit comments

Comments
 (0)