Skip to content

Commit d75cd1a

Browse files
committed
addrress pr comments, add docs build info to CONTRIBUTING
1 parent ec8fe79 commit d75cd1a

File tree

5 files changed

+39
-24
lines changed

5 files changed

+39
-24
lines changed

.github/workflows/linkcheck.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ jobs:
2525
- uses: actions/setup-python@v4
2626
with:
2727
python-version: "3.11"
28-
cache: pip
29-
cache-dependency-path: pyproject.toml
3028

3129
- name: Install deps
32-
run: pip install .[docs]
30+
run: pip install -r docs/requirements.txt
3331

3432
- name: make linkcheck
3533
run: |

.github/workflows/publish.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ jobs:
3939
- uses: actions/setup-python@v4
4040
with:
4141
python-version: "3.11"
42-
cache: pip
43-
cache-dependency-path: pyproject.toml
4442

4543
- uses: actions/setup-node@v3
4644
with:

.github/workflows/test.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ jobs:
4747
- uses: actions/setup-python@v4
4848
with:
4949
python-version: "${{ matrix.python-version }}"
50-
cache: pip
51-
cache-dependency-path: pyproject.toml
5250

5351
- uses: actions/setup-node@v3
5452
with:
@@ -71,18 +69,15 @@ jobs:
7169
#
7270
# Pytest options are set in tests/pytest.ini.
7371
run: |
74-
set -eux
7572
pip install -vv $(ls ./dist/jupyter_server_proxy-*.whl)\[acceptance\] 'jupyterlab~=${{ matrix.jupyterlab-version }}.0'
7673
7774
- name: List Python packages
7875
run: |
79-
set -eux
8076
pip freeze
8177
pip check
8278
8379
- name: Run tests
8480
run: |
85-
set -eux
8681
JUPYTER_TOKEN=secret jupyter-${{ matrix.jupyter-app }} --config=./tests/resources/jupyter_server_config.py &
8782
sleep 5
8883
cd tests
@@ -100,21 +95,18 @@ jobs:
10095
10196
- name: Check the Notebook Server extension is installed
10297
run: |
103-
set -eux
10498
jupyter serverextension list
10599
jupyter serverextension list 2>&1 | grep -iE "jupyter_server_proxy.*OK" -
106100
107101
- name: Check the Jupyter Server extension is installed
108102
run: |
109-
set -eux
110103
pip install jupyter-server
111104
jupyter server extension list
112105
jupyter server extension list 2>&1 | grep -iE "jupyter_server_proxy.*OK" -
113106
114107
- name: Install JupyterLab Extension
115108
if: matrix.jupyterlab-version == '2'
116109
run: |
117-
set -eux
118110
export NODE_OPTIONS=--openssl-legacy-provider
119111
cd labextension
120112
jupyter labextension install . --no-build --debug
@@ -128,14 +120,12 @@ jobs:
128120
#
129121
if: ${{ !(matrix.jupyterlab-version == '2' && startsWith(matrix.python-version, '3.11')) }}
130122
run: |
131-
set -eux
132123
jupyter labextension list
133124
jupyter labextension list 2>&1 | grep -iE '@jupyterhub/jupyter-server-proxy.*OK.*'
134125
python -m jupyterlab.browser_check
135126
136127
- name: Run acceptance tests
137128
run: |
138-
set -eux
139129
pytest -s -k "acceptance"
140130
141131
- name: Upload acceptance test reports

CONTRIBUTING.md

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jupyter server extension enable --sys-prefix jupyter_server_proxy
1919

2020
Before running tests, you need a server that we can test against.
2121

22-
```
22+
```bash
2323
JUPYTER_TOKEN=secret jupyter-lab --config=./tests/resources/jupyter_server_config.py --no-browser
2424
```
2525

@@ -81,3 +81,40 @@ and `jupyter_server_proxy/labextension` folders:
8181
cd labextension
8282
jlpm watch
8383
```
84+
85+
### Documentation
86+
87+
The documentation uses a fairly standard [Sphinx](https://www.sphinx-doc.org)
88+
build chain, and requires `make` on Linux/MacOS, which cannot be installed with
89+
`pip`.
90+
91+
In addition to any system packages, building the documentation requires
92+
additional packages. To install the needed packages:
93+
94+
```bash
95+
pip install -r docs/requirements.txt
96+
```
97+
98+
Once installed, enter the docs folder with:
99+
100+
```bash
101+
cd docs
102+
```
103+
104+
... then build the HTML site:
105+
106+
```bash
107+
make
108+
```
109+
110+
... or check that all hyperlinks can be resolved:
111+
112+
```bash
113+
make linkcheck
114+
```
115+
116+
... or start an auto-reloading server and open a web browser:
117+
118+
```bash
119+
make devenv
120+
```

pyproject.toml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,6 @@ acceptance = [
5555
"notebook <7",
5656
"robotframework-jupyterlibrary >=0.4.2",
5757
]
58-
docs = [
59-
"myst-parser",
60-
"sphinx-autobuild",
61-
"sphinx-book-theme",
62-
"sphinx-copybutton",
63-
"sphinxext-opengraph",
64-
"sphinxext-rediraffe",
65-
]
6658

6759
[tool.hatch.version]
6860
source = "nodejs"

0 commit comments

Comments
 (0)