Skip to content

Commit 51ed30a

Browse files
houqpjimexist
andcommitted
consolidate datafusion docs with sphinx
* added python doc * combined, cli, user-guide and specification docs into a single datafusion doc Co-authored-by: Jiayu Liu <[email protected]>
1 parent 6f53180 commit 51ed30a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+968
-250
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
# DataFusion
2121

22-
<img src="datafusion/docs/images/DataFusion-Logo-Background-White.svg" width="256"/>
22+
<img src="docs/source/_static/images/DataFusion-Logo-Background-White.svg" width="256"/>
2323

2424
DataFusion is an extensible query execution framework, written in
2525
Rust, that uses [Apache Arrow](https://arrow.apache.org) as its

datafusion/docs/cli.md

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

docs/user-guide/book.toml renamed to docs/.gitignore

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
[book]
19-
authors = ["Apache Arrow"]
20-
language = "en"
21-
multilingual = false
22-
src = "src"
23-
title = "DataFusion User Guide"
18+
build
19+
source/python/generated
20+
venv/

docs/Makefile

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
#
19+
# Minimal makefile for Sphinx documentation
20+
#
21+
22+
# You can set these variables from the command line, and also
23+
# from the environment for the first two.
24+
SPHINXOPTS ?=
25+
SPHINXBUILD ?= sphinx-build
26+
SOURCEDIR = source
27+
BUILDDIR = build
28+
29+
# Put it first so that "make" without argument is like "make help".
30+
help:
31+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
32+
33+
.PHONY: help Makefile
34+
35+
# Catch-all target: route all unknown targets to Sphinx using the new
36+
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
37+
%: Makefile
38+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/user-guide/README.md renamed to docs/README.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,19 @@
1717
under the License.
1818
-->
1919

20-
# DataFusion User Guide Source
20+
# DataFusion docs
2121

22-
This directory contains the sources for the DataFusion user guide.
22+
## Dependencies
2323

24-
## Generate HTML
24+
It's recommended to install build dependencies and build the the documentation
25+
inside a Python virtualenv.
2526

26-
To generate the user guide in HTML format, run the following commands:
27+
- Python
28+
- `pip install -r requirements.txt`
29+
- Datafusion python package. You can install the latest version by running `maturin develop` inside `../python` directory.
2730

28-
```bash
29-
cargo install mdbook
30-
mdbook build
31+
## Build
32+
33+
```
34+
make html
3135
```

docs/make.bat

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
@rem Licensed to the Apache Software Foundation (ASF) under one
2+
@rem or more contributor license agreements. See the NOTICE file
3+
@rem distributed with this work for additional information
4+
@rem regarding copyright ownership. The ASF licenses this file
5+
@rem to you under the Apache License, Version 2.0 (the
6+
@rem "License"); you may not use this file except in compliance
7+
@rem with the License. You may obtain a copy of the License at
8+
@rem
9+
@rem http://www.apache.org/licenses/LICENSE-2.0
10+
@rem
11+
@rem Unless required by applicable law or agreed to in writing,
12+
@rem software distributed under the License is distributed on an
13+
@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
@rem KIND, either express or implied. See the License for the
15+
@rem specific language governing permissions and limitations
16+
@rem under the License.
17+
18+
@ECHO OFF
19+
20+
pushd %~dp0
21+
22+
REM Command file for Sphinx documentation
23+
24+
if "%SPHINXBUILD%" == "" (
25+
set SPHINXBUILD=sphinx-build
26+
)
27+
set SOURCEDIR=source
28+
set BUILDDIR=build
29+
30+
if "%1" == "" goto help
31+
32+
%SPHINXBUILD% >NUL 2>NUL
33+
if errorlevel 9009 (
34+
echo.
35+
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
36+
echo.installed, then set the SPHINXBUILD environment variable to point
37+
echo.to the full path of the 'sphinx-build' executable. Alternatively you
38+
echo.may add the Sphinx directory to PATH.
39+
echo.
40+
echo.If you don't have Sphinx installed, grab it from
41+
echo.http://sphinx-doc.org/
42+
exit /b 1
43+
)
44+
45+
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
46+
goto end
47+
48+
:help
49+
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
50+
51+
:end
52+
popd

docs/requirements.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
sphinx==2.4.4
19+
pydata-sphinx-theme
20+
myst-parser<1

0 commit comments

Comments
 (0)