Skip to content

Commit 476ca22

Browse files
authored
docs: Add ASF attribution (#580)
* Add ASF attribution and update docs README * Fix formatting * Fix unit test * Undo changes in functions & tests and requirements.txt
1 parent 5296c0c commit 476ca22

File tree

5 files changed

+57
-19
lines changed

5 files changed

+57
-19
lines changed

docs/README.md

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,31 @@ when changes are merged to the main branch.
2828
It's recommended to install build dependencies and build the documentation
2929
inside a Python `venv`.
3030

31-
```bash
32-
python -m pip install -r requirements-310.txt
33-
```
31+
To prepare building the documentation run the following on the root level of the project:
32+
33+
1. Set up virtual environment if it was not already created
34+
```bash
35+
python3 -m venv venv
36+
```
37+
1. Activate virtual environment
38+
```bash
39+
source venv/bin/activate
40+
```
41+
1. Install Datafusion's Python dependencies
42+
```bash
43+
pip install -r requirements-310.txt
44+
```
45+
1. Install documentation dependencies
46+
```bash
47+
pip install -r docs/requirements.txt
48+
```
3449
3550
## Build & Preview
3651
3752
Run the provided script to build the HTML pages.
3853
3954
```bash
55+
cd docs
4056
./build.sh
4157
```
4258
@@ -50,14 +66,15 @@ firefox build/html/index.html
5066
5167
## Release Process
5268
53-
The documentation is served through the
54-
[arrow-site](https://github.com/apache/arrow-site/) repo. To release a new
55-
version of the docs, follow these steps:
56-
57-
1. Run `./build.sh` inside `docs` folder to generate the docs website inside the `build/html` folder.
58-
2. Clone the arrow-site repo
59-
3. Checkout to the `asf-site` branch (NOT `master`)
60-
4. Copy build artifacts into `arrow-site` repo's `datafusion` folder with a command such as
61-
- `cp -rT ./build/html/ ../../arrow-site/datafusion/` (doesn't work on mac)
62-
- `rsync -avzr ./build/html/ ../../arrow-site/datafusion/`
63-
5. Commit changes in `arrow-site` and send a PR.
69+
This documentation is hosted at https://arrow.apache.org/datafusion-python/
70+
71+
When the PR is merged to the `main` branch of the DataFusion
72+
repository, a [github workflow](https://github.com/apache/arrow-datafusion-python/blob/main/.github/workflows/docs.yaml) which:
73+
74+
1. Builds the html content
75+
2. Pushes the html content to the [`asf-site`](https://github.com/apache/arrow-datafusion-python/tree/asf-site) branch in this repository.
76+
77+
The Apache Software Foundation provides https://arrow.apache.org/,
78+
which serves content based on the configuration in
79+
[.asf.yaml](https://github.com/apache/arrow-datafusion-python/blob/main/.asf.yaml),
80+
which specifies the target as https://arrow.apache.org/datafusion-python/.

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
sphinx==5.3.0
18+
sphinx
1919
pydata-sphinx-theme==0.8.0
2020
myst-parser
2121
maturin

docs/source/_templates/docs-sidebar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
<a class="navbar-brand" href="{{ pathto(master_doc) }}">
3-
<img src="{{ pathto('_static/images/' + logo, 1) }}" class="logo" alt="logo">
3+
<img src="{{ pathto('_static/images/DataFusion-Logo-Background-White.png', 1) }}" class="logo" alt="logo">
44
</a>
55

66
<form class="bd-search d-flex align-items-center" action="{{ pathto('search') }}" method="get">

docs/source/_templates/layout.html

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,24 @@
33
{# Silence the navbar #}
44
{% block docs_navbar %}
55
{% endblock %}
6+
7+
<!--
8+
Custom footer
9+
-->
10+
{% block footer %}
11+
<!-- Based on pydata_sphinx_theme/footer.html -->
12+
<footer class="footer mt-5 mt-md-0">
13+
<div class="container">
14+
{% for footer_item in theme_footer_items %}
15+
<div class="footer-item">
16+
{% include footer_item %}
17+
</div>
18+
{% endfor %}
19+
<div class="footer-item">
20+
<p>Apache Arrow DataFusion, Arrow DataFusion, Apache, the Apache feather logo, and the Apache Arrow DataFusion project logo</p>
21+
<p>are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
22+
</div>
23+
</div>
24+
</footer>
25+
26+
{% endblock %}

docs/source/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333

3434
# -- Project information -----------------------------------------------------
3535

36-
project = "Arrow DataFusion"
37-
copyright = "2022, Apache Software Foundation"
38-
author = "Arrow DataFusion Authors"
36+
project = "Apache Arrow DataFusion"
37+
copyright = "2019-2024, Apache Software Foundation"
38+
author = "Apache Software Foundation"
3939

4040

4141
# -- General configuration ---------------------------------------------------

0 commit comments

Comments
 (0)