Skip to content
Snippets Groups Projects
Commit cd6d7d22 authored by Yaroslav Halchenko's avatar Yaroslav Halchenko
Browse files

Merge branch 'releases' into dfsg

* releases:
  REL: Release 0.14.1
  BUG: restore setup.py clean functionality
  MISC: switch line returns back to unix
  DOC: link to documentation, not main page
parents 608cd63c f6c0bd67
No related branches found
No related tags found
No related merge requests found
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<li><a href="{{ pathto('user_guide') }}">User guide</a></li> <li><a href="{{ pathto('user_guide') }}">User guide</a></li>
<li><a href="{{ pathto('modules/classes') }}">API</a></li> <li><a href="{{ pathto('modules/classes') }}">API</a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a href="http://scikit-learn.org/dev/">Development</a></li> <li><a href="http://scikit-learn.org/dev/documentation.html">Development</a></li>
<li><a href="http://scikit-learn.org/0.13/">Scikit-learn 0.13</a></li> <li><a href="http://scikit-learn.org/0.13/">Scikit-learn 0.13</a></li>
<li><a href="http://scikit-learn.org/0.12/">Scikit-learn 0.12</a></li> <li><a href="http://scikit-learn.org/0.12/">Scikit-learn 0.12</a></li>
<li><a href="http://scikit-learn.org/0.11/">Scikit-learn 0.11</a></li> <li><a href="http://scikit-learn.org/0.11/">Scikit-learn 0.11</a></li>
......
.. currentmodule:: sklearn .. currentmodule:: sklearn
0.14.1
=======
0.14.1 is a minor bug-fix release that fixed a small regression in the
setup.py
.. _changes_0_14: .. _changes_0_14:
0.14 0.14
......
...@@ -8,7 +8,7 @@ descr = """A set of python modules for machine learning and data mining""" ...@@ -8,7 +8,7 @@ descr = """A set of python modules for machine learning and data mining"""
import sys import sys
import os import os
import shutil import shutil
from distutils.core import Command from distutils.command.clean import clean as Clean
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
import __builtin__ as builtins import __builtin__ as builtins
...@@ -56,18 +56,11 @@ else: ...@@ -56,18 +56,11 @@ else:
############################################################################### ###############################################################################
class CleanCommand(Command): class CleanCommand(Clean):
description = "Remove build directories, and compiled file in the source tree" description = "Remove build directories, and compiled file in the source tree"
user_options = []
def initialize_options(self):
self.cwd = None
def finalize_options(self):
self.cwd = os.getcwd()
def run(self): def run(self):
assert os.getcwd() == self.cwd, 'Must be in package root: %s' % self.cwd Clean.run(self)
if os.path.exists('build'): if os.path.exists('build'):
shutil.rmtree('build') shutil.rmtree('build')
for dirpath, dirnames, filenames in os.walk('sklearn'): for dirpath, dirnames, filenames in os.walk('sklearn'):
......
...@@ -13,7 +13,7 @@ machine-learning as a versatile tool for science and engineering. ...@@ -13,7 +13,7 @@ machine-learning as a versatile tool for science and engineering.
See http://scikit-learn.org for complete documentation. See http://scikit-learn.org for complete documentation.
""" """
import sys import sys
__version__ = '0.14' __version__ = '0.14.1'
try: try:
# This variable is injected in the __builtins__ by the build # This variable is injected in the __builtins__ by the build
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment