8000 REL changes for release in 0.18.X branch (#7414) · scikit-learn/scikit-learn@8e3f888 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8e3f888

Browse files
amuelleramueller
authored
REL changes for release in 0.18.X branch (#7414)
1 parent 01edccb commit 8e3f888

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

‎doc/documentation.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<div class="container-index">
44

5-
Documentation of scikit-learn 0.18.dev0
6-
=======================================
5+
Documentation of scikit-learn 0.18
6+
==================================
77

88
.. raw:: html
99

@@ -28,8 +28,9 @@ Documentation of scikit-learn 0.18.dev0
2828
<!-- doc versions -->
2929
<h2>Other Versions</h2>
3030
<ul>
31-
<li>scikit-learn 0.18 (development)</li>
32-
<li><a href="http://scikit-learn.org/stable/documentation.html">scikit-learn 0.17 (stable)</a></li>
31+
<li>scikit-learn 0.18 (stable)</li>
32+
<li><a href="http://scikit-learn.org/dev/documentation.html">scikit-learn 0.19 (development)</a></li>
33+
<li><a href="http://scikit-learn.org/0.17/documentation.html">scikit-learn 0.17</a></li>
3334
<li><a href="http://scikit-learn.org/0.16/documentation.html">scikit-learn 0.16</a></li>
3435
<li><a href="http://scikit-learn.org/0.15/documentation.html">scikit-learn 0.15</a></li>
3536
</ul>

‎doc/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@
207207
<li><em>On-going development:</em>
208208
<a href="/dev/whats_new.html"><em>What's new</em> (Changelog)</a>
209209
</li>
210+
<li><em>September 2016.</em> scikit-learn 0.18.0 is available for download (<a href="whats_new.html#version-0-18">Changelog</a>).
211+
</li>
210212
<li><em>November 2015.</em> scikit-learn 0.17.0 is available for download (<a href="whats_new.html#version-0-17">Changelog</a>).
211213
</li>
212214
<li><em>March 2015.</em> scikit-learn 0.16.0 is available for download (<a href="whats_new.html#version-0-16">Changelog</a>).

‎doc/themes/scikit-learn/layout.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,15 @@
7979
<span class="caret"></span>
8080
</a>
8181
<ul class="dropdown-menu">
82-
<li class="link-title">Scikit-learn 0.18 (development)</li>
82+
<li class="link-title">Scikit-learn 0.18 (stable)</li>
8383
<li><a href="{{ pathto('tutorial/index') }}">Tutorials</a></li>
8484
<li><a href="{{ pathto('user_guide') }}">User guide</a></li>
8585
<li><a href="{{ pathto('modules/classes') }}">API</a></li>
8686
<li><a href="{{ pathto('faq') }}">FAQ</a></li>
8787
<li><a href="{{ pathto('developers/contributing') }}">Contributing</a></li>
8888
<li class="divider"></li>
89-
<li><a href="http://scikit-learn.org/stable/documentation.html">Scikit-learn 0.17 (stable)</a></li>
89+
<li><a href="http://scikit-learn.org/dev/documentation.html">Scikit-learn 0.19-dev (development)</a></li>
90+
<li><a href="http://scikit-learn.org/0.17/documentation.html">Scikit-learn 0.17</a></li>
9091
<li><a href="http://scikit-learn.org/0.16/documentation.html">Scikit-learn 0.16</a></li>
9192
<li><a href="http://scikit-learn.org/0.15/documentation.html">Scikit-learn 0.15</a></li>
9293
<li><a href="{{ pathto('_downloads/scikit-learn-docs.pdf', 1) }}">PDF documentation</a></li>

‎sklearn/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
# Dev branch marker is: 'X.Y.dev' or 'X.Y.devN' where N is an integer.
3838
# 'X.Y.dev0' is the canonical version of 'X.Y.dev'
3939
#
40-
__version__ = '0.18rc2'
40+
__version__ = '0.18'
4141

4242

4343
try:
@@ -70,6 +70,7 @@
7070
# Non-modules:
7171
'clone']
7272

73+
7374
def setup_module(module):
7475
"""Fixture for the tests to assure globally controllable seeding of RNGs"""
7576
import os

0 commit comments

Comments
 (0)
0