diff --git a/doc/conf.py b/doc/conf.py index 539229a60..c31f9bb85 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -105,7 +105,7 @@ else: # non-false value, then it is used: #today = '' # Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' +today_fmt = '%B %d, %Y' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. @@ -172,7 +172,7 @@ html_static_path = ['images'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' +html_last_updated_fmt = '%b %d, %Y' # Custom sidebar templates, maps document names to template names. #html_sidebars = {} @@ -198,7 +198,7 @@ html_use_index = False # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the # base URL from which the finished HTML is served. -#html_use_opensearch = '' +html_use_opensearch = 'objects.inv' # If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). #html_file_suffix = '' diff --git a/doc/sphinxext/github_link.py b/doc/sphinxext/github_link.py index 1592b266a..d9dfb8fe7 100644 --- a/doc/sphinxext/github_link.py +++ b/doc/sphinxext/github_link.py @@ -9,6 +9,7 @@ REVISION_CMD = 'git rev-parse --short HEAD' def _get_git_revision(): + return None try: revision = subprocess.check_output(REVISION_CMD.split()).strip() except (subprocess.CalledProcessError, OSError): diff --git a/sklearn/setup.py b/sklearn/setup.py index d90c198ac..6fde30226 100644 --- a/sklearn/setup.py +++ b/sklearn/setup.py @@ -11,7 +11,7 @@ def configuration(parent_package='', top_path=None): from numpy.distutils.misc_util import Configuration import numpy - libraries = [] + libraries = ['lapack'] if os.name == 'posix': libraries.append('m')