Skip to content

Commit 223fb8b

Browse files
committed
Merge branch 'development'
Conflicts: autosklearn/util/backend.py
2 parents 6acc1ae + 3f9a99c commit 223fb8b

File tree

347 files changed

+314483
-16130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

347 files changed

+314483
-16130
lines changed

.travis.yml

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,43 @@
11
language: python
2-
python:
3-
- "2.7"
4-
- "3.4"
52

3+
sudo: false
64

75
cache:
6+
apt: true
7+
# We use three different cache directory
8+
# to work around a Travis bug with multi-platform cache
89
directories:
9-
- $HOME/.cache/pip
10+
- $HOME/.cache/pip
11+
- $HOME/download
1012
pip: true
1113

12-
sudo: false
13-
14-
before_cache:
15-
- rm -f $HOME/.cache/pip/log/debug.log
16-
1714
# command to install dependencies
1815
addons:
1916
apt:
17+
sources:
18+
- ubuntu-toolchain-r-test
2019
packages:
20+
- gcc-4.8
21+
- g++-4.8
2122
- libatlas-dev
2223
- liblapack-dev
2324
- libatlas-base-dev
2425
- gfortran
2526

26-
before_install:
27-
- wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
28-
- bash miniconda.sh -b -p $HOME/miniconda
29-
- export PATH="$HOME/miniconda/bin:$PATH"
30-
- conda update --yes conda
27+
env:
28+
global:
29+
# Directory where tests are run from
30+
- TEST_DIR=/tmp/test_dir/
31+
- MODULE=autosklearn
32+
matrix:
33+
- DISTRIB="conda" PYTHON_VERSION="2.7"
34+
- DISTRIB="conda" PYTHON_VERSION="3.4" COVERAGE="true"
35+
- DISTRIB="conda" PYTHON_VERSION="3.5"
3136

3237
install:
33-
- conda install --yes python=$TRAVIS_PYTHON_VERSION pip numpy=1.9 scipy=0.16 nose scikit-learn=0.16.1 Cython pandas
34-
- pip install mock --no-deps
35-
- pip install lockfile==0.10.2 --no-deps
36-
- pip install pep8 python-coveralls
37-
- pip install coverage
38-
- pip install psutil
39-
40-
# Install requirements from other repos
41-
- pip install git+https://github.com/automl/HPOlibConfigSpace.git
42-
43-
- python setup.py install
44-
45-
# command to run tests, e.g. python setup.py test
46-
script:
47-
# - coverage run --source autosklearn setup.py test
48-
- cd test && nosetests -v --with-coverage --cover-package=autosklearn
38+
# Necessary for random forest
39+
- export CXX="g++-4.8" CC="gcc-4.8"
40+
- source ci_scripts/install.sh
41+
script: bash ci_scripts/test.sh
42+
after_success: source ci_scripts/success.sh
4943

50-
after_success: coveralls

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ recursive-include autosklearn/metalearning/files *.arff
66
recursive-include autosklearn/metalearning/files *.csv
77
recursive-include autosklearn/metalearning/files *.txt
88
include autosklearn/util/logging.yaml
9+
recursive-include autosklearn *.pyx

Makefile

Lines changed: 23 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -1,177 +1,32 @@
1-
# Makefile for Sphinx documentation
2-
#
1+
# simple makefile to simplify repetitive build env management tasks under posix
32

4-
# You can set these variables from the command line.
5-
SPHINXOPTS =
6-
SPHINXBUILD = sphinx-build
7-
PAPER =
8-
BUILDDIR = build
3+
PYTHON ?= python
4+
CYTHON ?= cython
5+
NOSETESTS ?= nosetests
6+
CTAGS ?= ctags
97

10-
# User-friendly check for sphinx-build
11-
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
12-
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
13-
endif
14-
15-
# Internal variables.
16-
PAPEROPT_a4 = -D latex_paper_size=a4
17-
PAPEROPT_letter = -D latex_paper_size=letter
18-
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
19-
# the i18n builder cannot share the environment and doctrees with the others
20-
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
21-
22-
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
23-
24-
help:
25-
@echo "Please use \`make <target>' where <target> is one of"
26-
@echo " html to make standalone HTML files"
27-
@echo " dirhtml to make HTML files named index.html in directories"
28-
@echo " singlehtml to make a single large HTML file"
29-
@echo " pickle to make pickle files"
30-
@echo " json to make JSON files"
31-
@echo " htmlhelp to make HTML files and a HTML help project"
32-
@echo " qthelp to make HTML files and a qthelp project"
33-
@echo " devhelp to make HTML files and a Devhelp project"
34-
@echo " epub to make an epub"
35-
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
36-
@echo " latexpdf to make LaTeX files and run them through pdflatex"
37-
@echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
38-
@echo " text to make text files"
39-
@echo " man to make manual pages"
40-
@echo " texinfo to make Texinfo files"
41-
@echo " info to make Texinfo files and run them through makeinfo"
42-
@echo " gettext to make PO message catalogs"
43-
@echo " changes to make an overview of all changed/added/deprecated items"
44-
@echo " xml to make Docutils-native XML files"
45-
@echo " pseudoxml to make pseudoxml-XML files for display purposes"
46-
@echo " linkcheck to check all external links for integrity"
47-
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
8+
all: clean inplace test
489

4910
clean:
50-
rm -rf $(BUILDDIR)/*
51-
52-
html:
53-
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
54-
@echo
55-
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
56-
57-
dirhtml:
58-
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
59-
@echo
60-
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
61-
62-
singlehtml:
63-
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
64-
@echo
65-
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
66-
67-
pickle:
68-
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
69-
@echo
70-
@echo "Build finished; now you can process the pickle files."
71-
72-
json:
73-
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
74-
@echo
75-
@echo "Build finished; now you can process the JSON files."
76-
77-
htmlhelp:
78-
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
79-
@echo
80-
@echo "Build finished; now you can run HTML Help Workshop with the" \
81-
".hhp project file in $(BUILDDIR)/htmlhelp."
82-
83-
qthelp:
84-
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
85-
@echo
86-
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
87-
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
88-
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/AutoSklearn.qhcp"
89-
@echo "To view the help file:"
90-
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/AutoSklearn.qhc"
91-
92-
devhelp:
93-
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
94-
@echo
95-
@echo "Build finished."
96-
@echo "To view the help file:"
97-
@echo "# mkdir -p $$HOME/.local/share/devhelp/AutoSklearn"
98-
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/AutoSklearn"
99-
@echo "# devhelp"
100-
101-
epub:
102-
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
103-
@echo
104-
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
105-
106-
latex:
107-
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
108-
@echo
109-
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
110-
@echo "Run \`make' in that directory to run these through (pdf)latex" \
111-
"(use \`make latexpdf' here to do that automatically)."
112-
113-
latexpdf:
114-
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
115-
@echo "Running LaTeX files through pdflatex..."
116-
$(MAKE) -C $(BUILDDIR)/latex all-pdf
117-
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
118-
119-
latexpdfja:
120-
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
121-
@echo "Running LaTeX files through platex and dvipdfmx..."
122-
$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
123-
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
124-
125-
text:
126-
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
127-
@echo
128-
@echo "Build finished. The text files are in $(BUILDDIR)/text."
129-
130-
man:
131-
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
132-
@echo
133-
@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
134-
135-
texinfo:
136-
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
137-
@echo
138-
@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
139-
@echo "Run \`make' in that directory to run these through makeinfo" \
140-
"(use \`make info' here to do that automatically)."
141-
142-
info:
143-
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
144-
@echo "Running Texinfo files through makeinfo..."
145-
make -C $(BUILDDIR)/texinfo info
146-
@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
147-
148-
gettext:
149-
$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
150-
@echo
151-
@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
11+
$(PYTHON) setup.py clean
12+
rm -rf dist
15213

153-
changes:
154-
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
155-
@echo
156-
@echo "The overview file is in $(BUILDDIR)/changes."
14+
in: inplace # just a shortcut
15+
inplace:
16+
$(PYTHON) setup.py build_ext -i
15717

158-
linkcheck:
159-
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
160-
@echo
161-
@echo "Link check complete; look for any errors in the above output " \
162-
"or in $(BUILDDIR)/linkcheck/output.txt."
18+
doc:
19+
cd ./doc
20+
make
21+
cd ..
16322

164-
doctest:
165-
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
166-
@echo "Testing of doctests in the sources finished, look at the " \
167-
"results in $(BUILDDIR)/doctest/output.txt."
23+
test-code: in
24+
$(NOSETESTS) -s -v tests
25+
test-doc:
26+
$(NOSETESTS) -s -v doc/*.rst
16827

169-
xml:
170-
$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
171-
@echo
172-
@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
28+
test-coverage:
29+
rm -rf coverage .coverage
30+
$(NOSETESTS) -s -v --with-coverage tests
17331

174-
pseudoxml:
175-
$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
176-
@echo
177-
@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
32+
test: test-code test-sphinxext test-doc

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
auto-sklearn is an automated machine learning toolkit and a drop-in replacement for a scikit-learn estimator.
44

5-
Find the documentation [here](http://auto-sklearn.readthedocs.org)
5+
Find the documentation [here](http://automl.github.io/auto-sklearn/)
66

77
Status for master branch:
88

99
[![Build Status](https://travis-ci.org/automl/auto-sklearn.svg?branch=master)](https://travis-ci.org/automl/auto-sklearn)
1010
[![Code Health](https://landscape.io/github/automl/auto-sklearn/master/landscape.png)](https://landscape.io/github/automl/auto-sklearn/master)
11-
[![Documentation Status](https://readthedocs.org/projects/auto-sklearn/badge/?version=master)](http://auto-sklearn.readthedocs.org/en/master/)
1211
[![Coverage Status](https://coveralls.io/repos/automl/auto-sklearn/badge.svg?branch=master&service=github)](https://coveralls.io/github/automl/auto-sklearn?branch=master)
1312

1413
Status for development branch
1514

1615
[![Build Status](https://travis-ci.org/automl/auto-sklearn.svg?branch=development)](https://travis-ci.org/automl/auto-sklearn)
1716
[![Code Health](https://landscape.io/github/automl/auto-sklearn/development/landscape.png)](https://landscape.io/github/automl/auto-sklearn/development)
18-
[![Documentation Status](https://readthedocs.org/projects/auto-sklearn/badge/?version=development)](http://auto-sklearn.readthedocs.org/en/development/)
1917
[![Coverage Status](https://coveralls.io/repos/automl/auto-sklearn/badge.svg?branch=development&service=github)](https://coveralls.io/github/automl/auto-sklearn?branch=development)

0 commit comments

Comments
 (0)