Skip to content

Commit ba71070

Browse files
committed
Review "Configuration files supported" page
1 parent e3d3e2b commit ba71070

File tree

4 files changed

+22
-19
lines changed

4 files changed

+22
-19
lines changed

docs/source/conf.py

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

6161
from repo2docker.buildpacks.conda import CondaBuildPack
6262

63-
default_python = f"`Python {CondaBuildPack.major_pythons['3']}`"
63+
default_python = f"Python {CondaBuildPack.major_pythons['3']}"
6464
myst_substitutions = {
6565
"default_python": default_python,
6666
"default_python_version": default_python,

docs/source/configuration/development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ both kinds.
2121

2222
This specifies a list of Python packages that should be installed in your
2323
environment. Our
24-
[requirements.txt example](https://github.com/binder-examples/requirements/blob/HEAD/requirements.txt)
24+
[example `requirements.txt` file](https://github.com/binder-examples/requirements/blob/HEAD/requirements.txt)
2525
on GitHub shows a typical requirements file.
2626

2727
(setup-py)=

docs/source/configuration/research.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
that lets you install any kind of package,
99
including Python, R, and C/C++ packages.
1010
`repo2docker` does not use your `environment.yml` to create and activate a new conda environment.
11-
Rather, it updates a base conda environment [defined here](https://github.com/jupyterhub/repo2docker/blob/HEAD/repo2docker/buildpacks/conda/environment.yml) with the packages listed in your `environment.yml`.
11+
Rather, it updates a [pre-defined base conda environment](https://github.com/jupyterhub/repo2docker/blob/HEAD/repo2docker/buildpacks/conda/environment.yml) with the packages listed in your `environment.yml`.
1212
This means that the environment will always have the same default name, not the name
1313
specified in your `environment.yml`.
1414

1515
:::{note}
16-
You can install files from pip in your `environment.yml` as well.
17-
For example, see the [binder-examples environment.yml](https://github.com/binder-examples/python-conda_pip/blob/HEAD/environment.yml) file. See [the `conda` environment management instructions](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#creating-an-environment-file-manually) for more information.
16+
You can install files from [PyPI](https://pypi.org/) in your `environment.yml` as well.
17+
For example, see the [example `environment.yml` file](https://github.com/binder-examples/python-conda_pip/blob/HEAD/environment.yml) file. See [the `conda` environment management instructions](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#creating-an-environment-file-manually) for more information.
1818
:::
1919

2020
You can also specify which Python version to install in your built environment with `environment.yml`.
2121
By default, `repo2docker` installs {{ default_python }} with your `environment.yml` unless you include the version of Python in the `environment.yml` of your Git repository.
22-
`conda` should support all versions of Python, though `repo2docker` support is best with `Python 3.7-3.11`.
22+
`conda` should support all versions of Python, though `repo2docker` support is best with Python 3.7-3.11.
2323

2424
:::{warning}
2525
If you include a Python version in a `runtime.txt` file in addition to your
@@ -28,7 +28,7 @@ If you include a Python version in a `runtime.txt` file in addition to your
2828

2929
(install-r)=
3030

31-
## `install.R` - Install packages with R/RStudio
31+
## `install.R` - Install R packages
3232

3333
This is used to install R libraries pinned to a specific snapshot on
3434
[Posit Package Manager](https://packagemanager.posit.co/).
@@ -38,7 +38,7 @@ To set the date of the snapshot, or to specify a specific version of R, add a [r
3838

3939
(description)=
4040

41-
## `DESCRIPTION` - Install an R package
41+
## `DESCRIPTION` - Install as an R package
4242

4343
To install your repository like an R package, you may include a `DESCRIPTION` file.
4444
`repo2docker` installs the package and dependencies from the `DESCRIPTION` by running `devtools::install_local(getwd())`.

docs/source/configuration/system.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,23 @@
22

33
(apt-txt)=
44

5-
## `apt.txt` - Install packages with apt-get
5+
## `apt.txt` - Install packages with `apt-get`
66

7-
A list of Debian packages that should be installed. The base image used is usually the latest released
8-
version of Ubuntu.
7+
A list of packages in the [`.deb`](<https://en.wikipedia.org/wiki/Deb_(file_format)>) format that should be installed. The `.deb` files are downloaded from the server configured in the Docker base image.
8+
9+
```{note}
10+
If a `Dockerfile` is not used to change the Docker base image, the base image is [Ubuntu](https://ubuntu.com/) [22.04 LTS (Jammy Jellyfish)](https://releases.ubuntu.com/jammy/). All `.deb` files availables are listed in [Ubuntu Packages](https://packages.ubuntu.com/jammy/).
11+
```
912

1013
We use `apt.txt`, for example, to install LaTeX in our
11-
[example apt.txt for LaTeX](https://github.com/binder-examples/latex/blob/HEAD/apt.txt).
14+
[example `apt.txt` file for LaTeX](https://github.com/binder-examples/latex/blob/HEAD/apt.txt).
1215

1316
(runtime-txt)=
1417

1518
## `runtime.txt` - Specifying runtimes
1619

1720
Sometimes you want to specify the version of the runtime (e.g. the version of Python or R), but the environment specification format will not let you specify this information (e.g. `requirements.txt` or `install.R`).
18-
For these cases, we have a special file, `runtime.txt`.
21+
For these cases, we have a special `runtime.txt` file.
1922

2023
:::{warning}
2124
`runtime.txt` is only supported when used with environment specifications
@@ -25,23 +28,23 @@ that do not already support specifying the runtime
2528

2629
### Set the Python version
2730

28-
Add the line `python-x.y` in `runtime.txt` to run the repository with Python version x.y.
31+
Add the line `python-x.y` in `runtime.txt` to run the repository with Python version `x.y`.
2932
See our [Python2 example repository](https://github.com/binder-examples/python2_runtime/blob/HEAD/runtime.txt).
3033

3134
### Set the R version
3235

33-
Add the line `r-<RVERSION>-<YYYY>-<MM>-<DD>` in `runtime.txt` to run the repository with R version `RVERSION` and libraries from a `YYYY-MM-DD` snapshot of the [Posit Package Manager](https://packagemanager.posit.co/client/#/repos/2/overview).
36+
Add the line `r-x.y-YYYY-MM-DD` in `runtime.txt` to run the repository with R version `x.y` and libraries from a `YYYY-MM-DD` snapshot of the [Posit Package Manager](https://packagemanager.posit.co/client/#/repos/2/overview).
3437

35-
`RVERSION` can be set to 3.4, 3.5, 3.6, or to patch releases for the 3.5 and 3.6 series.
38+
The version of R, i.e. `x.y`, can be set to 3.4, 3.5, 3.6, or to patch releases for the 3.5 and 3.6 series.
3639
If you do not specify a version, the latest release will be used.
3740

3841
See our [R example repository](https://github.com/binder-examples/r/blob/HEAD/runtime.txt).
3942

4043
(default-nix)=
4144

42-
## `default.nix` - the nix package manager
45+
## `default.nix` - the `nix` package manager
4346

44-
Specify packages to be installed by the [nix package manager](https://github.com/NixOS/nixpkgs).
47+
Specify packages to be installed by the [`nix` package manager](https://github.com/NixOS/nixpkgs).
4548
When you use this config file all other configuration files (like `requirements.txt`)
4649
that specify packages are ignored. When using `nix` you have to specify all
4750
packages and dependencies explicitly, including the Jupyter notebook package that
@@ -54,7 +57,7 @@ a `nix` expression written in a `default.nix` file. Make sure to
5457
to produce a reproducible environment.
5558

5659
To see an example repository visit
57-
[nix binder example](https://github.com/binder-examples/nix).
60+
[nix example repository](https://github.com/binder-examples/nix).
5861

5962
(dockerfile)=
6063

0 commit comments

Comments
 (0)