Update documentation with new julia support

pull/595/head
David Anthoff 2019-03-02 17:27:58 -08:00
rodzic 2320f5cf0e
commit 5790933d8c
3 zmienionych plików z 26 dodań i 17 usunięć

Wyświetl plik

@ -71,15 +71,30 @@ To install your repository like a Python package, you may include a
``setup.py`` file. repo2docker installs ``setup.py`` files by running
``pip install -e .``.
.. _Project.toml:
``Project.toml`` - Install a Julia environment
==============================================
A ``Project.toml`` (or ``JuliaProject.toml``) file can specify both the
version of Julia to be used and a list of Julia packages to be installed.
If a ``Manifest.toml`` is present, it will determine the exact versions
of the Julia packages that are installed.
.. _REQUIRE:
``REQUIRE`` - Install a Julia environment
=========================================
``REQUIRE`` - Install a Julia environment (legacy)
==================================================
This specifies a list of Julia packages. To see an example of a
Julia repository with ``REQUIRE`` and ``environment.yml``,
visit `binder-examples/julia-python <https://github.com/binder-examples/julia-python>`_.
A ``REQUIRE`` file can specify both the version of Julia to be used and
which Julia packages should be used. The use of ``REQUIRE`` is only
recommended for pre 1.0 Julia versions, the recommended way of installing
a Julia environment that uses Julia 1.0 or newer is to use a ``Project.toml``
file. If both a ``REQUIRE`` and a ``Project.toml`` file are detected,
the ``REQUIRE`` file is ignored. To see an example of a Julia repository
with ``REQUIRE`` and ``environment.yml``, visit
`binder-examples/julia-python <https://github.com/binder-examples/julia-python>`_.
.. _install.R:
@ -186,7 +201,7 @@ For these cases, we have a special file, ``runtime.txt``.
``runtime.txt`` is only supported when used with environment specifications
that do not already support specifying the runtime
(e.g. when using ``environment.yml`` for conda or ``REQUIRE`` for Julia,
(e.g. when using ``environment.yml`` for conda or ``Project.toml`` for Julia,
``runtime.txt`` will be ignored).
To use python-2.7: add ``python-2.7`` in runtime.txt file.

Wyświetl plik

@ -42,12 +42,9 @@ environment.
Julia
~~~~~
The following versions of Julia are supported (specified in the
:ref:`REQUIRE <REQUIRE>` configuration file):
- 1.0 (added in 0.7)
- 0.7 (added in 0.7)
- 0.6 (default)
All Julia versions since Julia 0.7.0 are supported via a ``Project.toml``
file, and this is the recommended way to install Julia environments.
Julia 0.6.x is supported via a ``REQUIRE`` file.
R
~

Wyświetl plik

@ -72,11 +72,8 @@ Julia
=====
To build an environment with Julia, include a configuration file called
``REQUIRE``. Each line of this file should include a package that you wish
to have installed with Julia. For example, the following contents of ``REQURE``
would install the ``PyPlot`` package with your Julia environment.::
PyPlot
``Project.toml``. The format of this file is documented at
`the Julia Pkg.jl documentation <https://julialang.github.io/Pkg.jl/stable/>`_.
Languages not covered here
==========================