Skip to content

Commit

Permalink
Merge pull request #283 from automl/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
mfeurer authored May 16, 2017
2 parents 2e29eba + 7f891fa commit f763e69
Show file tree
Hide file tree
Showing 703 changed files with 55,487 additions and 11,735 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ matrix:
env: DISTRIB="conda" PYTHON_VERSION="3.4" 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-latest-Linux-x86_64.sh"
- os: linux
env: DISTRIB="conda" PYTHON_VERSION="3.6" 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 Down Expand Up @@ -56,20 +58,20 @@ before_install:
- conda update --yes conda
- conda create -n testenv --yes python=$PYTHON_VERSION pip wheel nose
- source activate testenv
- conda install --yes gcc
- conda install --yes gcc swig
- echo "Using GCC at "`which gcc`
- export CC=`which gcc`
# Fixes version `GLIBCXX_3.4.21' not found (on Ubuntu 16.04)
- conda install --yes libgcc

install:
# Install general requirements the way setup.py suggests
- pip install coverage pep8 python-coveralls
- pip install pep8 codecov
- cat requirements.txt | xargs -n 1 -L 1 pip install
# Install openml dependency for metadata generation unittest
- pip install xmltodict requests
- pip install git+https://github.com/renatopp/liac-arff
- pip install git+https://github.com/openml/openml-python@master --no-deps
- pip install git+https://github.com/openml/openml-python@0b9009b0436fda77d9f7c701bd116aff4158d5e1 --no-deps
- mkdir ~/.openml
- echo "apikey = 610344db6388d9ba34f6db45a3cf71de" > ~/.openml/config
# Debug output to know all exact package versions!
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Status for master branch:

[![Build Status](https://travis-ci.org/automl/auto-sklearn.svg?branch=master)](https://travis-ci.org/automl/auto-sklearn)
[![Code Health](https://landscape.io/github/automl/auto-sklearn/master/landscape.png)](https://landscape.io/github/automl/auto-sklearn/master)
[![Coverage Status](https://coveralls.io/repos/automl/auto-sklearn/badge.svg?branch=master&service=github)](https://coveralls.io/github/automl/auto-sklearn?branch=master)
[![codecov](https://codecov.io/gh/automl/auto-sklearn/branch/master/graph/badge.svg)](https://codecov.io/gh/automl/auto-sklearn)

Status for development branch

[![Build Status](https://travis-ci.org/automl/auto-sklearn.svg?branch=development)](https://travis-ci.org/automl/auto-sklearn)
[![Code Health](https://landscape.io/github/automl/auto-sklearn/development/landscape.png)](https://landscape.io/github/automl/auto-sklearn/development)
[![Coverage Status](https://coveralls.io/repos/automl/auto-sklearn/badge.svg?branch=development&service=github)](https://coveralls.io/github/automl/auto-sklearn?branch=development)
[![codecov](https://codecov.io/gh/automl/auto-sklearn/branch/development/graph/badge.svg)](https://codecov.io/gh/automl/auto-sklearn)
11 changes: 5 additions & 6 deletions autosklearn/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@


__MANDATORY_PACKAGES__ = '''
numpy>=1.9,<1.12
scikit-learn==0.17.1
smac==0.3.0
numpy>=1.9
scikit-learn==0.18.1
smac==0.5.0
lockfile>=0.10
ConfigSpace>=0.3.1,<0.4
pyrfr==0.2.0
xgboost==0.4a30
ConfigSpace>=0.3.3,<0.4
pyrfr>=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.1.3"
__version__ = "0.2.0"
Loading

0 comments on commit f763e69

Please sign in to comment.