Skip to content

Commit 70d1a30

Browse files
authored
Merge pull request #939 from automl/development
Release 0.9
2 parents 859fb99 + d2be274 commit 70d1a30

File tree

101 files changed

+4299
-1299
lines changed

Some content is hidden

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

101 files changed

+4299
-1299
lines changed
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
#https://help.github.com/en/actions/language-and-framework-guides/publishing-docker-images#publishing-images-to-github-packages
2+
name: Publish Docker image
3+
on:
4+
push:
5+
# Push to `master` or `development`
6+
branches:
7+
- master
8+
- development
9+
- docker_workflow
10+
11+
jobs:
12+
push_to_registry:
13+
name: Push Docker image to GitHub Packages
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Check out the repo
17+
uses: actions/checkout@v2
18+
- name: Extract branch name
19+
shell: bash
20+
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
21+
id: extract_branch
22+
- name: Push to GitHub Packages
23+
uses: docker/build-push-action@v1
24+
with:
25+
username: ${{ github.actor }}
26+
password: ${{ secrets.GITHUB_TOKEN }}
27+
registry: docker.pkg.github.com
28+
repository: automl/auto-sklearn/auto-sklearn
29+
tag_with_ref: true
30+
tags: ${{ steps.extract_branch.outputs.branch }}
31+
- name: Push to Docker Hub
32+
uses: docker/build-push-action@v1
33+
with:
34+
username: ${{ secrets.DOCKER_USERNAME }}
35+
password: ${{ secrets.DOCKER_PASSWORD }}
36+
repository: mfeurer/auto-sklearn
37+
tags: ${{ steps.extract_branch.outputs.branch }}
38+
- name: Docker Login
39+
run: docker login docker.pkg.github.com -u $GITHUB_ACTOR -p $GITHUB_TOKEN
40+
env:
41+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
42+
- name: Pull Docker image
43+
run: docker pull docker.pkg.github.com/$GITHUB_REPOSITORY/auto-sklearn:$BRANCH
44+
env:
45+
BRANCH: ${{ steps.extract_branch.outputs.branch }}
46+
- name: Run image
47+
run: docker run -i -d --name unittester -v $GITHUB_WORKSPACE:/workspace -w /workspace docker.pkg.github.com/$GITHUB_REPOSITORY/auto-sklearn:$BRANCH
48+
env:
49+
BRANCH: ${{ steps.extract_branch.outputs.branch }}
50+
- name: Auto-Sklearn loaded
51+
run: docker exec -i unittester python3 -c 'import autosklearn; print(f"Auto-sklearn imported from {autosklearn.__file__}")'
52+
- name: Run unit testing
53+
run: docker exec -i unittester python3 -m pytest -v test

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ matrix:
2424
env: DISTRIB="conda" DOCPUSH="true" PYTHON="3.7" SKIP_TESTS="true"
2525
- os: linux
2626
env: DISTRIB="conda" RUN_FLAKE8="true" SKIP_TESTS="true"
27+
- os: linux
28+
env: DISTRIB="conda" RUN_MYPY="true" SKIP_TESTS="true"
2729
- os: linux
2830
env: DISTRIB="conda" PYTHON="3.5"
2931
- os: linux

Dockerfile

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,35 @@
1-
FROM ubuntu
1+
FROM ubuntu:18.04
22

3-
# System requirements
4-
RUN apt-get update && apt-get install -y \
5-
build-essential \
6-
curl \
7-
python3-pip \
8-
swig \
9-
&& rm -rf /var/lib/apt/lists/*
3+
WORKDIR /auto-sklearn
4+
5+
# Copy the checkout autosklearn version for installation
6+
ADD . /auto-sklearn/
7+
8+
# install linux packages
9+
RUN apt-get update
10+
11+
# Set the locale
12+
# workaround for https://github.com/automl/auto-sklearn/issues/867
13+
RUN apt-get -y install locales
14+
RUN touch /usr/share/locale/locale.alias
15+
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
16+
ENV LANG en_US.UTF-8
17+
ENV LANGUAGE en_US:en
18+
ENV LC_ALL en_US.UTF-8
19+
20+
RUN apt install -y python3-dev python3-pip
21+
RUN pip3 install --upgrade setuptools
22+
RUN apt-get install -y build-essential curl
23+
24+
# https://github.com/automl/auto-sklearn/issues/314
25+
RUN apt-get install -y swig3.0
26+
RUN ln -s /usr/bin/swig3.0 /usr/bin/swig
1027

1128
# Upgrade pip then install dependencies
1229
RUN pip3 install --upgrade pip
13-
RUN curl https://raw.githubusercontent.com/automl/auto-sklearn/master/requirements.txt \
14-
| xargs -n 1 -L 1 pip3 install
30+
RUN pip3 install pytest==4.6.* pep8 codecov pytest-cov flake8 flaky openml
31+
RUN curl https://raw.githubusercontent.com/automl/auto-sklearn/master/requirements.txt | xargs -n 1 -L 1 pip3 install
32+
RUN pip3 install jupyter
1533

1634
# Install
17-
RUN pip3 install \
18-
auto-sklearn \
19-
jupyter
35+
RUN pip3 install -e /auto-sklearn/

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ recursive-include autosklearn/metalearning/files *.arff
22
recursive-include autosklearn/metalearning/files *.csv
33
recursive-include autosklearn/metalearning/files *.txt
44
include autosklearn/util/logging.yaml
5-
recursive-include autosklearn *.pyx
65
include requirements.txt
6+
include autosklearn/requirements.txt
77
recursive-include autosklearn/experimental/askl2_portfolios *.json
88
include autosklearn/experimental/askl2_training_data.json

autosklearn/__init__.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
# -*- encoding: utf-8 -*-
22
import os
3+
import pkg_resources
34
import sys
45

56
from autosklearn.util import dependencies
67
from autosklearn.__version__ import __version__ # noqa (imported but unused)
78

89

9-
__MANDATORY_PACKAGES__ = '''
10-
numpy>=1.9
11-
scikit-learn>=0.22.0,<0.23
12-
lockfile>=0.10
13-
smac>=0.12
14-
pyrfr>=0.6.1,<0.8
15-
ConfigSpace>=0.4.0,<0.5
16-
'''
10+
requirements = pkg_resources.resource_string('autosklearn', 'requirements.txt')
11+
requirements = requirements.decode('utf-8')
1712

18-
dependencies.verify_packages(__MANDATORY_PACKAGES__)
13+
dependencies.verify_packages(requirements)
1914

2015
if os.name != 'posix':
2116
raise ValueError(

autosklearn/__version__.py

Lines changed: 1 addition & 1 deletion
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.8.0"
4+
__version__ = "0.9.0"

0 commit comments

Comments
 (0)