Skip to content

Commit

Permalink
Merge pull request #359 from automl/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
mfeurer authored Oct 4, 2017
2 parents 0ee3699 + 769ef35 commit a263efb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ matrix:

include:
- os: linux
env: DISTRIB="conda" PYTHON_VERSION="3.4" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh"
env: DISTRIB="conda" PYTHON_VERSION="3.4" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-4.3.21-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"
env: DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-4.3.21-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"
env: DISTRIB="conda" PYTHON_VERSION="3.6" MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-4.3.21-Linux-x86_64.sh"

# Temporarily disabling OSX builds because thy take too long
# Set language to generic to not break travis-ci
Expand Down
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies:
# Other stuff...
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install build-essential
# Conda installation
- wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh
- wget https://repo.continuum.io/miniconda/Miniconda3-4.3.21-Linux-x86_64.sh -O ~/miniconda.sh
- bash ~/miniconda.sh -b -p $HOME/miniconda
- conda create -n testenv --yes python=3.6 pip wheel nose gcc swig

Expand Down
3 changes: 2 additions & 1 deletion doc/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ Changes
~~~~~~~

* Allows the usage of scikit-learn 0.18.2.
* Fixes requirement pyrfr to version ``0.4.0``.
* Upgrade to latest SMAC version (``0.6.0``) and latest random forest version
(``0.6.1``).
* Added a Dockerfile.
* Added the possibility to change the size of the holdout set when
using holdout resampling strategy.
Expand Down

0 comments on commit a263efb

Please sign in to comment.