Skip to content

Commit b32574a

Browse files
authored
Merge pull request #1379 from mathbunnyru/asalikhov/docs_long_lines
Limit markdown line length to 200
2 parents 34992fe + 532bf47 commit b32574a

File tree

22 files changed

+465
-307
lines changed

22 files changed

+465
-307
lines changed

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ Example: Add a package [altair](https://altair-viz.github.io).
2020

2121
**How does this change will affect users?**
2222

23-
Example: Altair is a declarative statistical visualization library for Python, based on Vega and Vega-Lite, and the source is available on GitHub. With Altair, you can spend more time understanding your data and its meaning. Altair’s API is simple, friendly and consistent and built on top of the powerful Vega-Lite visualization grammar. This elegant simplicity produces beautiful and effective visualizations with a minimal amount of code.
23+
Example: Altair is a declarative statistical visualization library for Python, based on Vega and Vega-Lite, and the source is available on GitHub.
24+
With Altair, you can spend more time understanding your data and its meaning.
25+
Altair’s API is simple, friendly and consistent and built on top of the powerful Vega-Lite visualization grammar.
26+
This elegant simplicity produces beautiful and effective visualizations with a minimal amount of code.

.markdownlint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ default: true
44
# MD013/line-length - Line length
55
MD013:
66
# Number of characters
7-
line_length: 1000
7+
line_length: 200

README.md

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,45 @@ containing Jupyter applications and interactive computing tools.
1212

1313
## Quick Start
1414

15-
You can try a
16-
[relatively recent build of the jupyter/base-notebook image on mybinder.org](https://mybinder.org/v2/gh/jupyter/docker-stacks/master?filepath=README.ipynb)
17-
by simply clicking the preceding link. The image used in binder was last updated on 22 May 2021.
18-
Otherwise, the two examples below may help you get started if
19-
you [have Docker installed](https://docs.docker.com/install/) know
20-
[which Docker image](https://jupyter-docker-stacks.readthedocs.io/en/latest/using/selecting.html) you
21-
want to use, and want to launch a single Jupyter Notebook server in a container.
22-
23-
The [User Guide on ReadTheDocs](https://jupyter-docker-stacks.readthedocs.io/) describes additional
24-
uses and features in detail.
25-
26-
**Example 1:** This command pulls the `jupyter/scipy-notebook` image tagged `33add21fab64` from
27-
Docker Hub if it is not already present on the local host. It then starts a container running a
28-
Jupyter Notebook server and exposes the server on host port 8888. The server logs appear in the
29-
terminal. Visiting `http://<hostname>:8888/?token=<token>` in a browser loads the Jupyter Notebook
30-
dashboard page, where `hostname` is the name of the computer running docker and `token` is the
31-
secret token printed in the console. The container remains intact for restart after the notebook
32-
server exits.
33-
34-
docker run -p 8888:8888 jupyter/scipy-notebook:33add21fab64
35-
36-
**Example 2:** This command performs the same operations as **Example 1**, but it exposes the server
37-
on host port 10000 instead of port 8888. Visiting `http://<hostname>:10000/?token=<token>` in a
38-
browser loads JupyterLab, where `hostname` is the name of the computer running docker and `token` is
39-
the secret token printed in the console.::
40-
41-
docker run -p 10000:8888 jupyter/scipy-notebook:33add21fab64
42-
43-
**Example 3:** This command pulls the `jupyter/datascience-notebook` image tagged `33add21fab64`
44-
from Docker Hub if it is not already present on the local host. It then starts an _ephemeral_
45-
container running a Jupyter Notebook server and exposes the server on host port 10000. The command
46-
mounts the current working directory on the host as `/home/jovyan/work` in the container. The server
47-
logs appear in the terminal. Visiting `http://<hostname>:10000/?token=<token>` in a browser loads
48-
JupyterLab, where `hostname` is the name of the computer running docker and `token` is the secret
49-
token printed in the console. Docker destroys the container after notebook server exit, but any
50-
files written to `~/work` in the container remain intact on the host.
51-
52-
docker run --rm -p 10000:8888 -e JUPYTER_ENABLE_LAB=yes -v "${PWD}":/home/jovyan/work jupyter/datascience-notebook:33add21fab64
15+
You can try a [relatively recent build of the jupyter/base-notebook image on mybinder.org](https://mybinder.org/v2/gh/jupyter/docker-stacks/master?filepath=README.ipynb)
16+
by simply clicking the preceding link.
17+
The image used in binder was last updated on 22 May 2021.
18+
Otherwise, the two examples below may help you get started if you [have Docker installed](https://docs.docker.com/install/),
19+
know [which Docker image](https://jupyter-docker-stacks.readthedocs.io/en/latest/using/selecting.html) you want to use
20+
and want to launch a single Jupyter Notebook server in a container.
21+
22+
The [User Guide on ReadTheDocs](https://jupyter-docker-stacks.readthedocs.io/) describes additional uses and features in detail.
23+
24+
**Example 1:** This command pulls the `jupyter/scipy-notebook` image tagged `33add21fab64` from Docker Hub if it is not already present on the local host.
25+
It then starts a container running a Jupyter Notebook server and exposes the server on host port 8888.
26+
The server logs appear in the terminal.
27+
Visiting `http://<hostname>:8888/?token=<token>` in a browser loads the Jupyter Notebook dashboard page,
28+
where `hostname` is the name of the computer running docker and `token` is the secret token printed in the console.
29+
The container remains intact for restart after the notebook server exits.
30+
31+
```bash
32+
docker run -p 8888:8888 jupyter/scipy-notebook:33add21fab64
33+
```
34+
35+
**Example 2:** This command performs the same operations as **Example 1**, but it exposes the server on host port 10000 instead of port 8888.
36+
Visiting `http://<hostname>:10000/?token=<token>` in a browser loads JupyterLab,
37+
where `hostname` is the name of the computer running docker and `token` is the secret token printed in the console.
38+
39+
```bash
40+
docker run -p 10000:8888 jupyter/scipy-notebook:33add21fab64
41+
```
42+
43+
**Example 3:** This command pulls the `jupyter/datascience-notebook` image tagged `33add21fab64` from Docker Hub if it is not already present on the local host.
44+
It then starts an _ephemeral_ container running a Jupyter Notebook server and exposes the server on host port 10000.
45+
The command mounts the current working directory on the host as `/home/jovyan/work` in the container.
46+
The server logs appear in the terminal.
47+
Visiting `http://<hostname>:10000/?token=<token>` in a browser loads JupyterLab,
48+
where `hostname` is the name of the computer running docker and `token` is the secret token printed in the console.
49+
Docker destroys the container after notebook server exit, but any files written to `~/work` in the container remain intact on the host.
50+
51+
```bash
52+
docker run --rm -p 10000:8888 -e JUPYTER_ENABLE_LAB=yes -v "${PWD}":/home/jovyan/work jupyter/datascience-notebook:33add21fab64
53+
```
5354

5455
## Contributing
5556

@@ -59,23 +60,21 @@ maintained stacks.
5960

6061
## Maintainer Help Wanted
6162

62-
We value all positive contributions to the Docker stacks project, from
63-
[bug reports](https://jupyter-docker-stacks.readthedocs.io/en/latest/contributing/issues.html) to
64-
[pull requests](https://jupyter-docker-stacks.readthedocs.io/en/latest/contributing/packages.html)
65-
to
66-
[translations](https://jupyter-docker-stacks.readthedocs.io/en/latest/contributing/translations.html)
67-
to help answering questions. We'd also like to invite members of the community to help with two
68-
maintainer activities:
63+
We value all positive contributions to the Docker stacks project,
64+
from [bug reports](https://jupyter-docker-stacks.readthedocs.io/en/latest/contributing/issues.html)
65+
to [pull requests](https://jupyter-docker-stacks.readthedocs.io/en/latest/contributing/packages.html)
66+
to [translations](https://jupyter-docker-stacks.readthedocs.io/en/latest/contributing/translations.html)
67+
to help answering questions.
68+
We'd also like to invite members of the community to help with two maintainer activities:
6969

7070
- Issue triage: Reading and providing a first response to issues, labeling issues appropriately,
7171
redirecting cross-project questions to Jupyter Discourse
7272
- Pull request reviews: Reading proposed documentation and code changes, working with the submitter
7373
to improve the contribution, deciding if the contribution should take another form (e.g., a recipe
7474
instead of a permanent change to the images)
7575

76-
Anyone in the community can jump in and help with these activities at any time. We will happily
77-
grant additional permissions (e.g., ability to merge PRs) to anyone who shows an on-going interest
78-
in working on the project.
76+
Anyone in the community can jump in and help with these activities at any time
77+
We will happily grant additional permissions (e.g., ability to merge PRs) to anyone who shows an on-going interest in working on the project.
7978

8079
## Jupyter Notebook Deprecation Notice
8180

@@ -85,7 +84,8 @@ more information is available in the [documentation](https://jupyter-docker-stac
8584

8685
At some point, JupyterLab will become the default for all of the Jupyter Docker stack images, however a new environment variable will be introduced to switch back to Jupyter Notebook if needed.
8786

88-
After the change of default, and according to the Jupyter Notebook project status and its compatibility with JupyterLab, these Docker images may remove the classic Jupyter Notebook interface altogether in favor of another _classic-like_ UI built atop JupyterLab.
87+
After the change of default, and according to the Jupyter Notebook project status and its compatibility with JupyterLab,
88+
these Docker images may remove the classic Jupyter Notebook interface altogether in favor of another _classic-like_ UI built atop JupyterLab.
8989

9090
This change is tracked in the issue [#1217](https://github.com/jupyter/docker-stacks/issues/1217), please check its content for more information.
9191

docs/contributing/features.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,14 @@ Roughly speaking, we evaluate new features based on the following criteria:
3737
If there's agreement that the feature belongs in one or more of the core stacks:
3838

3939
1. Implement the feature in a local clone of the `jupyter/docker-stacks` project.
40-
2. Please build the image locally before submitting a pull request. Building the image locally
41-
shortens the debugging cycle by taking some load off GitHub Actions, which graciously provide
42-
free build services for open source projects like this one. If you use `make`, call:
40+
2. Please build the image locally before submitting a pull request
41+
Building the image locally shortens the debugging cycle by taking some load off GitHub Actions, which graciously provide free build services for open source projects like this one.
42+
If you use `make`, call:
4343

4444
```bash
4545
make build/somestack-notebook
4646
```
4747

48-
3. [Submit a pull request](https://github.com/PointCloudLibrary/pcl/wiki/A-step-by-step-guide-on-preparing-and-submitting-a-pull-request)
49-
(PR) with your changes.
48+
3. [Submit a pull request](https://github.com/PointCloudLibrary/pcl/wiki/A-step-by-step-guide-on-preparing-and-submitting-a-pull-request)(PR) with your changes.
5049
4. Watch for GitHub to report a build success or failure for your PR on GitHub.
5150
5. Discuss changes with the maintainers and address any build issues.

docs/contributing/issues.md

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
11
# Project Issues
22

3-
We appreciate your taking the time to report an issue you encountered using the
4-
Jupyter Docker Stacks. Please review the following guidelines when reporting
5-
your problem.
3+
We appreciate your taking the time to report an issue you encountered using the Jupyter Docker Stacks.
4+
Please review the following guidelines when reporting your problem.
65

7-
- If you believe you’ve found a security vulnerability in any of the Jupyter
8-
projects included in Jupyter Docker Stacks images, please report it to
9-
[[email protected]](mailto:[email protected]), not in the issue trackers
10-
on GitHub. If you prefer to encrypt your security reports, you can use [this
11-
PGP public
12-
key](https://github.com/jupyter/jupyter.github.io/blob/master/assets/ipython_security.asc).
6+
- If you believe you’ve found a security vulnerability in any of the Jupyter projects included in Jupyter Docker Stacks images,
7+
please report it to [[email protected]](mailto:[email protected]), not in the issue trackers on GitHub.
8+
If you prefer to encrypt your security reports, you can use [this PGP public key](https://github.com/jupyter/jupyter.github.io/blob/master/assets/ipython_security.asc).
139
- If you think your problem is unique to the Jupyter Docker Stacks images,
14-
please search the [jupyter/docker-stacks issue
15-
tracker](https://github.com/jupyter/docker-stacks/issues) to see if someone
16-
else has already reported the same problem. If not, please open a [new
17-
issue](https://github.com/jupyter/docker-stacks/issues/new) and provide all of
18-
the information requested in the issue template.
19-
- If the issue you're seeing is with one of the open source libraries included
20-
in the Docker images and is reproducible outside the images, please file a bug
21-
with the appropriate open source project.
22-
- If you have a general question about how to use the Jupyter Docker Stacks in
23-
your environment, in conjunction with other tools, with customizations, and so
24-
on, please post your question on the [Jupyter Discourse
25-
site](https://discourse.jupyter.org).
10+
please search the [jupyter/docker-stacks issue tracker](https://github.com/jupyter/docker-stacks/issues)
11+
to see if someone else has already reported the same problem.
12+
If not, please open a [new issue](https://github.com/jupyter/docker-stacks/issues/new) and provide all of the information requested in the issue template.
13+
- If the issue you're seeing is with one of the open source libraries included in the Docker images and is reproducible outside the images,
14+
please file a bug with the appropriate open source project.
15+
- If you have a general question about how to use the Jupyter Docker Stacks in your environment,
16+
in conjunction with other tools, with customizations, and so on,
17+
please post your question on the [Jupyter Discourse site](https://discourse.jupyter.org).

docs/contributing/lint.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ The following rules are ignored by default for all images in the `.hadolint.yaml
5151

5252
For other rules, the preferred way to do it is to flag ignored rules in the `Dockerfile`.
5353

54-
> It is also possible to ignore rules by using a special comment directly above the Dockerfile instruction you want to make an exception for. Ignore rule comments look like `# hadolint ignore=DL3001,SC1081`. For example:
54+
> It is also possible to ignore rules by using a special comment directly above the Dockerfile instruction you want to make an exception for.
55+
> Ignore rule comments look like `# hadolint ignore=DL3001,SC1081`.
56+
> For example:
5557
5658
```dockerfile
5759
FROM ubuntu

docs/contributing/packages.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ Please follow the process below to update a package version:
99
1. Locate the Dockerfile containing the library you wish to update (e.g.,
1010
[base-notebook/Dockerfile](https://github.com/jupyter/docker-stacks/blob/master/base-notebook/Dockerfile),
1111
[scipy-notebook/Dockerfile](https://github.com/jupyter/docker-stacks/blob/master/scipy-notebook/Dockerfile))
12-
2. Adjust the version number for the package. We prefer to pin the major and minor version number of
13-
packages so as to minimize rebuild side-effects when users submit pull requests (PRs). For
14-
example, you'll find the Jupyter Notebook package, `notebook`, installed using conda with
12+
2. Adjust the version number for the package.
13+
We prefer to pin the major and minor version number of packages so as to minimize rebuild side-effects when users submit pull requests (PRs).
14+
For example, you'll find the Jupyter Notebook package, `notebook`, installed using conda with
1515
`notebook=5.4.*`.
16-
3. Please build the image locally before submitting a pull request. Building the image locally
17-
shortens the debugging cycle by taking some load off GitHub Actions, which graciously provide
18-
free build services for open source projects like this one. If you use `make`, call:
16+
3. Please build the image locally before submitting a pull request.
17+
Building the image locally shortens the debugging cycle by taking some load off GitHub Actions, which graciously provide free build services for open source projects like this one.
18+
If you use `make`, call:
1919

2020
```bash
2121
make build/somestack-notebook
@@ -24,13 +24,14 @@ Please follow the process below to update a package version:
2424
4. [Submit a pull request](https://github.com/PointCloudLibrary/pcl/wiki/A-step-by-step-guide-on-preparing-and-submitting-a-pull-request)
2525
(PR) with your changes.
2626
5. Watch for GitHub to report a build success or failure for your PR on GitHub.
27-
6. Discuss changes with the maintainers and address any build issues. Version conflicts are the most
28-
common problem. You may need to upgrade additional packages to fix build failures.
27+
6. Discuss changes with the maintainers and address any build issues.
28+
Version conflicts are the most common problem.
29+
You may need to upgrade additional packages to fix build failures.
2930

3031
## Notes
3132

32-
In order to help identifying packages that can be updated you can use the following helper tool. It
33-
will list all the packages installed in the `Dockerfile` that can be updated -- dependencies are
33+
In order to help identifying packages that can be updated you can use the following helper tool.
34+
It will list all the packages installed in the `Dockerfile` that can be updated -- dependencies are
3435
filtered to focus only on requested packages.
3536

3637
```bash

docs/contributing/recipes.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# New Recipes
22

3-
We welcome contributions of [recipes](../using/recipes.md), short examples of using, configuring, or extending the Docker Stacks, for inclusion in the documentation site. Follow the process below to add a new recipe:
3+
We welcome contributions of [recipes](../using/recipes.md), short examples of using, configuring, or extending the Docker Stacks, for inclusion in the documentation site.
4+
Follow the process below to add a new recipe:
45

56
1. Open the `docs/using/recipes.md` source file.
67
2. Add a second-level Markdown heading naming your recipe at the bottom of the file (e.g., `## Add the RISE extension`)
78
3. Write the body of your recipe under the heading, including whatever command line, Dockerfile, links, etc. you need.
8-
4. [Submit a pull request](https://github.com/PointCloudLibrary/pcl/wiki/A-step-by-step-guide-on-preparing-and-submitting-a-pull-request) (PR) with your changes. Maintainers will respond and work with you to address any formatting or content issues.
9+
4. [Submit a pull request](https://github.com/PointCloudLibrary/pcl/wiki/A-step-by-step-guide-on-preparing-and-submitting-a-pull-request) (PR) with your changes.
10+
Maintainers will respond and work with you to address any formatting or content issues.

0 commit comments

Comments
 (0)