Skip to content

Commit 76c033b

Browse files
authored
Merge pull request #406 from automl/development
Development
2 parents a263efb + 3d5bfe6 commit 76c033b

File tree

568 files changed

+48817
-47844
lines changed

Some content is hidden

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

568 files changed

+48817
-47844
lines changed

.travis.yml

+5-11
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@ env:
66
global:
77
- OPENBLAS_NUM_THREADS=1
88
- OMP_NUM_THREADS=1
9+
- MKL_NUM_THREADS=1
910

1011
matrix:
1112
allow_failures:
1213
- os: osx
1314

1415
include:
1516
- os: linux
16-
env: DISTRIB="conda" PYTHON_VERSION="3.4" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-4.3.21-Linux-x86_64.sh"
17+
env: DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh"
1718
- os: linux
18-
env: DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-4.3.21-Linux-x86_64.sh"
19+
env: DISTRIB="conda" PYTHON_VERSION="3.6" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh"
1920
- os: linux
20-
env: DISTRIB="conda" PYTHON_VERSION="3.6" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-4.3.21-Linux-x86_64.sh"
21+
env: DISTRIB="conda" PYTHON_VERSION="3.6" EXAMPLES="true" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh"
2122

2223
# Temporarily disabling OSX builds because thy take too long
2324
# Set language to generic to not break travis-ci
@@ -27,10 +28,6 @@ matrix:
2728
#- os: osx
2829
# sudo: required
2930
# language: generic
30-
# env: DISTRIB="conda" PYTHON_VERSION="3.4" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh"
31-
#- os: osx
32-
# sudo: required
33-
# language: generic
3431
# env: DISTRIB="conda" PYTHON_VERSION="3.5" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh"
3532

3633
cache:
@@ -55,11 +52,8 @@ before_install:
5552
- bash miniconda.sh -b -p $HOME/miniconda
5653
- export PATH="$HOME/miniconda/bin:$PATH"
5754
- if [[ `which conda` ]]; then echo 'Conda installation successful'; else exit 1; fi
58-
- conda create -n testenv --yes python=$PYTHON_VERSION pip wheel nose
55+
- conda create -n testenv --yes python=$PYTHON_VERSION pip wheel nose gxx_linux-64 gcc_linux-64 swig
5956
- source activate testenv
60-
- conda install --yes gcc swig
61-
- echo "Using GCC at "`which gcc`
62-
- export CC=`which gcc`
6357

6458
install:
6559
# Install general requirements the way setup.py suggests

autosklearn/__init__.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55

66
__MANDATORY_PACKAGES__ = '''
77
numpy>=1.9
8-
scikit-learn>=0.18.1,<0.19
8+
scikit-learn>=0.19,<0.20
99
lockfile>=0.10
10-
smac>=0.6.0,<0.7
11-
pyrfr>=0.6.1,<0.7
12-
ConfigSpace>=0.3.3,<0.4
13-
pyrfr>=0.6.0,<0.7
10+
smac>=0.8,<0.9
11+
pyrfr>=0.6.1,<0.8
12+
ConfigSpace>=0.4.0,<0.5
1413
'''
1514

1615
dependencies.verify_packages(__MANDATORY_PACKAGES__)

autosklearn/__version__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
"""Version information."""
22

33
# The following line *must* be the last in the module, exactly as formatted:
4-
__version__ = "0.2.1"
4+
__version__ = "0.3.0"

0 commit comments

Comments
 (0)