Skip to content

Commit

Permalink
Merge pull request #406 from automl/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
mfeurer authored Jan 4, 2018
2 parents a263efb + 3d5bfe6 commit 76c033b
Show file tree
Hide file tree
Showing 568 changed files with 48,817 additions and 47,844 deletions.
16 changes: 5 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@ env:
global:
- OPENBLAS_NUM_THREADS=1
- OMP_NUM_THREADS=1
- MKL_NUM_THREADS=1

matrix:
allow_failures:
- os: osx

include:
- os: linux
env: DISTRIB="conda" PYTHON_VERSION="3.4" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-4.3.21-Linux-x86_64.sh"
env: DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh"
- os: linux
env: DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-4.3.21-Linux-x86_64.sh"
env: DISTRIB="conda" PYTHON_VERSION="3.6" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh"
- os: linux
env: DISTRIB="conda" PYTHON_VERSION="3.6" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-4.3.21-Linux-x86_64.sh"
env: DISTRIB="conda" PYTHON_VERSION="3.6" EXAMPLES="true" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh"

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

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

install:
# Install general requirements the way setup.py suggests
Expand Down
9 changes: 4 additions & 5 deletions autosklearn/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@

__MANDATORY_PACKAGES__ = '''
numpy>=1.9
scikit-learn>=0.18.1,<0.19
scikit-learn>=0.19,<0.20
lockfile>=0.10
smac>=0.6.0,<0.7
pyrfr>=0.6.1,<0.7
ConfigSpace>=0.3.3,<0.4
pyrfr>=0.6.0,<0.7
smac>=0.8,<0.9
pyrfr>=0.6.1,<0.8
ConfigSpace>=0.4.0,<0.5
'''

dependencies.verify_packages(__MANDATORY_PACKAGES__)
2 changes: 1 addition & 1 deletion autosklearn/__version__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Version information."""

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

0 comments on commit 76c033b

Please sign in to comment.