8000 address new comments. · scikit-learn/scikit-learn@123d59f · GitHub
[go: up one dir, main page]
Skip to content

Commit 123d59f

Browse files
cmarmocmarmo
committed
address new comments.
1 parent 16a5b45 commit 123d59f

File tree

2 files changed

+27
-23
lines changed

2 files changed

+27
-23
lines changed

‎doc/developers/advanced_installation.rst

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@
55
Advanced installation instructions
66
===================================
77

8-
.. _install_nightly_builds:
9-
10-
Installing nightly builds
11-
=========================
12-
13-
The continuous integration servers of the scikit-learn project build, test
14-
and upload wheel packages for the most recent Python version on a nightly
15-
basis to help users test bleeding edge features or bug fixes::
16-
17-
pip install --pre -f https://sklearn-nightly.scdn8.secure.raxcdn.com scikit-learn
18-
19-
208
.. _install_bleeding_edge:
219

2210
Building from source

‎doc/install.rst

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ There are different ways to get scikit-learn installed:
99
* :ref:`Install the latest official release <install_official_release>`. This
1010
is the best approach for most users. It will provide a stable version
1111
and pre-build packages are available for most platforms.
12+
Note that :ref:`nightly builds <install_nightly_builds>` are also
13+
distributed.
1214

1315
* Install the version of scikit-learn provided by your
1416
:ref:`operating system or Python distribution <install_by_distribution>`.
@@ -49,7 +51,9 @@ scikit-image >= 0.12.3, a few examples require pandas >= 0.18.0.
4951
Scikit-learn now requires Python 3.5 or newer.
5052

5153
If you already have a working installation of numpy and scipy,
52-
the easiest way to install scikit-learn is using ``conda``::
54+
the easiest way to install scikit-learn is using ``conda`` (see the
55+
`instructions for downloading conda
56+
<https://docs.conda.io/projects/conda/en/latest/user-guide/install/download.html>`_)::
5357

5458
conda install scikit-learn
5559

@@ -59,22 +63,18 @@ recommended to use python3 ``virtualenv``
5963
(see `python3 virtualenv documentation
6064
<https://docs.python.org/3/tutorial/venv.html>`_).
6165

62-
That gives, on Linux::
63-
64-
python3 -m venv .myenv
65-
source .myenv/bin/activate
66-
pip install -U scikit-learn
67-
68-
or on Windows::
66+
That gives, on Windows::
6967

7068
python -m venv .myenv
7169
.myenv\Scripts\activate
7270
pip install -U scikit-learn
7371

74-
.. note::
72+
or on Linux::
73+
74+
python3 -m venv .myenv
75+
source .myenv/bin/activate
76+
pip install -U scikit-learn
7577

76-
Some OSes still link Python v3 executable as ``python3``. Previous commands
77-
need to be changed accordingly.
7878

7979
If you have not installed NumPy or SciPy yet, you can also install these using
8080
conda or pip. When using pip, please ensure that *binary wheels* are used,
@@ -90,6 +90,22 @@ it as ``scikit-learn[alldeps]``.
9090
For installing on PyPy, PyPy3-v5.10+, Numpy 1.14.0+, and scipy 1.1.0+
9191
are required.
9292

93+
.. _install_nightly_builds:
94+
95+
Installing nightly builds
96+
=========================
97+
98+
The continuous integration servers of the scikit-learn project build, test
99+
and upload wheel packages for the most recent Python version on a nightly
100+
basis to help users test bleeding edge features or bug fixes::
101+
102+
pip install --pre -f https://sklearn-nightly.scdn8.secure.raxcdn.com scikit-learn
103+
104+
Again, in order to avoid any OS dependent issue it is strongly
105+
recommended to use python3 ``virtualenv``
106+
(see `python3 virtualenv documentation
107+
<https://docs.python.org/3/tutorial/venv.html>`_).
108+
93109
.. _install_by_distribution:
94110

95111
Third party distributions of scikit-learn

0 commit comments

Comments
 (0)
0