8000 Added the changes to remove the documentation support statements for … · scikit-learn/scikit-learn@e81bcd5 · GitHub
[go: up one dir, main page]

Skip to content

Commit e81bcd5

Browse files
Sriharsha-hatwarrth
authored andcommitted
Added the changes to remove the documentation support statements for Python 2 (#12083)
1 parent 5d30b2d commit e81bcd5

File tree

3 files changed

+12
-36
lines changed

3 files changed

+12
-36
lines changed

doc/developers/advanced_installation.rst

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Building from source
3434

3535
Scikit-learn requires:
3636

37-
- Python (>= 2.7 or >= 3.4),
37+
- Python (>= 3.5),
3838
- NumPy (>= 1.8.2),
3939
- SciPy (>= 0.13.3).
4040

@@ -110,18 +110,11 @@ Linux
110110

111111
Installing from source requires you to have installed the scikit-learn runtime
112112
dependencies, Python development headers and a working C/C++ compiler.
113-
Under Debian-based operating systems, which include Ubuntu, if you have
114-
Python 2 you can install all these requirements by issuing::
115-
116-
sudo apt-get install build-essential python-dev python-setuptools \
117-
python-numpy python-scipy \
118-
libatlas-dev libatlas3-base
119-
120-
If you have Python 3::
121-
113+
Under Debian-based operating systems, which include Ubuntu::
114+
122115
sudo apt-get install build-essential python3-dev python3-setuptools \
123-
python3-numpy python3-scipy \
124-
libatlas-dev libatlas3-base
116+
python3-numpy python3-scipy \
117+
libatlas-dev libatlas3-base
125118

126119
On recent Debian and Ubuntu (e.g. Ubuntu 14.04 or later) make sure that ATLAS
127120
is used to provide the implementation of the BLAS and LAPACK linear algebra
@@ -190,9 +183,7 @@ PATH environment variable.
190183
32-bit Python
191184
-------------
192185

193-
For 32-bit python it is possible use the standalone installers for
194-
`microsoft visual c++ express 2008 <http://download.microsoft.com/download/A/5/4/A54BADB6-9C3F-478D-8657-93B3FC9FE62D/vcsetup.exe>`_
195-
for Python 2 or Microsoft Visual C++ Express 2010 for Python 3.
186+
For 32-bit Python use Microsoft Visual C++ Express 2010.
196187

197188
Once installed you should be able to build scikit-learn without any
198189
particular configuration by running the following command in the scikit-learn
@@ -211,34 +202,27 @@ The Windows SDKs include the MSVC compilers both for 32 and 64-bit
211202
architectures. They come as a ``GRMSDKX_EN_DVD.iso`` file that can be mounted
212203
as a new drive with a ``setup.exe`` installer in it.
213204

214-
- For Python 2 you need SDK **v7.0**: `MS Windows SDK for Windows 7 and .NET
215-
Framework 3.5 SP1
216-
<https://www.microsoft.com/en-us/download/details.aspx?id=18950>`_
217-
218-
- For Python 3 you need SDK **v7.1**: `MS Windows SDK for Windows 7 and .NET
205+
- For Python you need SDK **v7.1**: `MS Windows SDK for Windows 7 and .NET
219206
Framework 4
220207
<https://www.microsoft.com/en-us/download/details.aspx?id=8442>`_
221208

222209
Both SDKs can be installed in parallel on the same host. To use the Windows
223210
SDKs, you need to setup the environment of a ``cmd`` console launched with the
224-
following flags (at least for SDK v7.0)::
211+
following flags ::
225212

226213
cmd /E:ON /V:ON /K
227214

228215
Then configure the build environment with::
229216

230217
SET DISTUTILS_USE_SDK=1
231218
SET MSSdk=1
232-
"C:\Program Files\Microsoft SDKs\Windows\v7.0\Setup\WindowsSdkVer.exe" -q -version:v7.0
233-
"C:\Program Files\Microsoft SDKs\Windows\v7.0\Bin\SetEnv.cmd" /x64 /release
219+
"C:\Program Files\Microsoft SDKs\Windows\v7.1\Setup\WindowsSdkVer.exe" -q -version:v7.1
220+
"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release
234221

235222
Finally you can build scikit-learn in the same ``cmd`` console::
236223

237224
python setup.py install
238225

239-
Replace ``v7.0`` by the ``v7.1`` in the above commands to do the same for
240-
Python 3 instead of Python 2.
241-
242226
Replace ``/x64`` by ``/x86`` to build for 32-bit Python instead of 64-bit
243227
Python.
244228

doc/developers/utilities.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ Graph Routines
175175
Benchmarking
176176
------------
177177

178-
- :func:`bench.total_seconds` (back-ported from ``timedelta.total_seconds``
179-
in Python 2.7). Used in ``benchmarks/bench_glm.py``.
178+
- :func:`bench.total_seconds`: Used in ``benchmarks/bench_glm.py``.
180179

181180

182181
Testing Functions

doc/other_distributions.rst

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,13 @@ Arch Linux
3636

3737
Arch Linux's package is provided through the `official repositories
3838
<https://www.archlinux.org/packages/?q=scikit-learn>`_ as
39-
``python-scikit-learn`` for Python 3 and ``python2-scikit-learn`` for Python 2.
39+
``python-scikit-learn`` for Python.
4040
It can be installed by typing the following command:
4141

4242
.. code-block:: none
4343
4444
# pacman -S python-scikit-learn
4545
46-
or:
47-
48-
.. code-block:: none
49-
50-
# pacman -S python2-scikit-learn
51-
52-
depending on the version of Python you use.
5346
5447
5548
NetBSD

0 commit comments

Comments
 (0)
155B
0