Skip to content

Commit 4775e7e

Browse files
andersbogsnesandersbogsnes
committed
Merge branch 'release/0.11.0'
2 parents 02621e8 + b2deaf4 commit 4775e7e

Some content is hidden

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

68 files changed

+1484
-722
lines changed

‎.github/dependabot.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "pip"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
labels:
8+
- "update"
9+
target-branch: "develop"
10+
11+
- package-ecosystem: "github-actions"
12+
directory: "/"
13+
schedule:
14+
interval: "daily"
15+
target-branch: "develop"

‎.github/pull_request_template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
- [ ] close issue XXX
1+
- [ ] closes #XXX
22
- [ ] Tests added
33
- [ ] Passes flake8
44
- [ ] Updated CHANGELOG

‎.github/workflows/release.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Release
2+
on:
3+
release:
4+
types:
5+
- published
6+
jobs:
7+
release:
8+
name: Release package
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
- uses: actions/setup-python@v2.1.1
13+
with:
14+
python-version: 3.8
15+
- uses: dschep/install-poetry-action@v1.3
16+
- run: poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }}
17+
- run: poetry publish --build

‎.github/workflows/test.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Integration
2+
on: push
3+
env:
4+
TOX_VERSION: 3.17.1
5+
POETRY_VERSION: 1.0.9
6+
jobs:
7+
test:
8+
runs-on: ${{ matrix.os }}
9+
strategy:
10+
matrix:
11+
python-version: ['3.7', '3.8']
12+
os: [ubuntu-latest, windows-latest]
13+
name: Test Python ${{ matrix.python-version }} on ${{ matrix.os }}
14+
steps:
15+
- uses: actions/checkout@v2
16+
- uses: actions/setup-python@v2.1.1
17+
with:
18+
python-version: ${{ matrix.python-version }}
19+
- uses: BSFishy/pip-action@v1
20+
with:
21+
packages: poetry==${{ env.POETRY_VERSION }} tox==${{ env.TOX_VERSION }}
22+
- run: python -m poetry config virtualenvs.create false
23+
- run: tox -e py,optional-artifactory
24+
25+
lint:
26+
name: Lint
27+
runs-on: ubuntu-latest
28+
steps:
29+
- uses: actions/checkout@v2
30+
- uses: actions/setup-python@v2.1.1
31+
with:
32+
python-version: 3.8
33+
- uses: pre-commit/action@v2.0.0
34+
env:
35+
SKIP: no-commit-to-branch
36+
37+
docs:
38+
runs-on: ubuntu-latest
39+
strategy:
40+
matrix:
41+
python-version: ['3.7', '3.8']
42+
name: Documentation python ${{ matrix.python-version }}
43+
steps:
44+
- uses: actions/checkout@v2
45+
- uses: actions/setup-python@v2.1.1
46+
with:
47+
python-version: ${{ matrix.python-version }}
48+
- uses: dschep/install-poetry-action@v1.3
49+
with:
50+
version: ${{ env.POETRY_VERSION }}
51+
- run: pip install tox==$TOX_VERSION
52+
- run: tox -e docs
53+
54+
coverage:
55+
name: Coverage report
56+
runs-on: ubuntu-latest
57+
steps:
58+
- uses: actions/checkout@v2
59+
- uses: actions/setup-python@v2.1.1
60+
with:
61+
python-version: 3.8
62+
- uses: dschep/install-poetry-action@v1.3
63+
with:
64+
version: ${{ env.POETRY_VERSION }}
65+
- run: pip install tox==$TOX_VERSION
66+
- run: tox -e py,optional-artifactory,coverage-report
67+
- name: Upload coverage to Codecov
68+
uses: codecov/codecov-action@v1.0.12

‎.pre-commit-config.yaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
repos:
22
- repo: https://github.com/ambv/black
3-
rev: 19.3b0
3+
rev: 19.10b0
44
hooks:
55
- id: black
66
- repo: https://github.com/pre-commit/pre-commit-hooks
7-
rev: v2.2.3
7+
rev: v3.1.0
88
hooks:
99
- id: trailing-whitespace
1010
- id: end-of-file-fixer
1111
- id: debug-statements
12-
- id: flake8
1312
- id: check-added-large-files
1413
- id: check-merge-conflict
1514
- id: forbid-new-submodules
1615
- id: no-commit-to-branch
1716
args: [--branch, master, --branch, develop]
17+
- repo: https://gitlab.com/pycqa/flake8
18+
rev: 3.8.3
19+
hooks:
20+
- id: flake8

‎.travis.yml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# v0.11.0
2+
- Added `load_demo_dataset` function
3+
- If the dataset has no train set `score_estimator` will now run `create_train_test` with default configurations
4+
- `Model.make_prediction` now takes a threshold argument when making a binary classification
5+
- All ML-tooling logging messages now go to stdout instead of stderr
6+
- Can pass a feature pipeline to `Model` which will then automatically generate a
7+
combined feature_pipeline + estimator Pipeline
8+
- Can pass a feature pipeline to `Dataset.plot` methods, to apply preprocessing
9+
before visualization
10+
- New config implementation. If you need to reset the configuration, you should use `Model.config.reset_config()`
11+
112
# v0.10.3
213
- Fixed typehints in Dataset
314
- Dataset.create_train_test now takes a boolean `stratify` parameter.

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Model Tooling library
2-
[![Build Status](https://travis-ci.com/andersbogsnes/ml_tooling.svg?branch=master)](https://travis-ci.com/andersbogsnes/ml_tooling)
2+
[![Build Status](https://github.com/andersbogsnes/ml_tooling/workflows/Tests/badge.svg)](https://github.com/andersbogsnes/ml_tooling/actions?workflow=Tests)
33
[![codecov](https://codecov.io/gh/andersbogsnes/ml_tooling/branch/develop/graph/badge.svg)](https://codecov.io/gh/andersbogsnes/ml_tooling)
4-
[![Python 3](https://pyup.io/repos/github/andersbogsnes/ml_tooling/python-3-shield.svg)](https://pyup.io/repos/github/andersbogsnes/ml_tooling/)
5-
[![Updates](https://pyup.io/repos/github/andersbogsnes/ml_tooling/shield.svg)](https://pyup.io/repos/github/andersbogsnes/ml_tooling/)
4+
[![Python 3](https://img.shields.io/pypi/pyversions/ml_tooling.svg)](https://pyup.io/repos/github/andersbogsnes/ml_tooling/)
65
[![CodeFactor](https://www.codefactor.io/repository/github/andersbogsnes/ml_tooling/badge)](https://www.codefactor.io/repository/github/andersbogsnes/ml_tooling)
76
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
87

‎dev-requirements.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
tox
33
pre-commit
44
pytest
5+
pytest-cov
56
dohq-artifactory

‎dev-requirements.txt‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,45 @@
44
#
55
# pip-compile dev-requirements.in
66
#
7-
aspy.yaml==1.3.0 # via pre-commit
8-
attrs==19.3.0
9-
certifi==2020.4.5.2 # via requests
7+
appdirs==1.4.4 # via virtualenv
8+
attrs==19.3.0 # via -r requirements.txt, pytest
9+
certifi==2020.6.20 # via requests
1010
cfgv==3.1.0 # via pre-commit
1111
chardet==3.0.4 # via requests
12-
cycler==0.10.0
13-
dohq-artifactory==0.7.377
14-
filelock==3.0.12 # via tox
15-
identify==1.4.19 # via pre-commit
16-
idna==2.9 # via requests
17-
importlib-metadata==1.6.1 # via pluggy, pre-commit, pytest, tox
18-
joblib==0.15.1
19-
kiwisolver==1.2.0
20-
matplotlib==3.2.1
21-
more-itertools==8.3.0 # via pytest
12+
coverage==5.2 # via pytest-cov
13+
cycler==0.10.0 # via -r requirements.txt, matplotlib
14+
distlib==0.3.1 # via virtualenv
15+
dohq-artifactory==0.7.382 # via -r dev-requirements.in
16+
filelock==3.0.12 # via tox, virtualenv
17+
identify==1.4.25 # via pre-commit
18+
idna==2.10 # via requests
19+
joblib==0.16.0 # via -r requirements.txt, scikit-learn
20+
kiwisolver==1.2.0 # via -r requirements.txt, matplotlib
21+
matplotlib==3.3.0 # via -r requirements.txt
22+
more-itertools==8.4.0 # via pytest
2223
nodeenv==1.4.0 # via pre-commit
23-
numpy==1.18.5
24+
numpy==1.19.1 # via -r requirements.txt, matplotlib, pandas, scikit-learn, scipy
2425
packaging==20.4 # via pytest, tox
25-
pandas==1.0.4
26+
pandas==1.0.5 # via -r requirements.txt
27+
pillow==7.2.0 # via -r requirements.txt, matplotlib
2628
pluggy==0.13.1 # via pytest, tox
27-
pre-commit==2.5.1
28-
py==1.8.1 # via pytest, tox
29-
pyparsing==2.4.7
30-
pytest==5.4.3
31-
python-dateutil==2.8.1
32-
pytz==2020.1
33-
pyyaml==5.3.1
34-
requests==2.23.0 # via dohq-artifactory
35-
scikit-learn==0.23.1
36-
scipy==1.4.1
29+
pre-commit==2.6.0 # via -r dev-requirements.in
30+
py==1.9.0 # via pytest, tox
31+
pyjwt==1.7.1 # via dohq-artifactory
32+
pyparsing==2.4.7 # via -r requirements.txt, matplotlib, packaging
33+
pytest-cov==2.10.0 # via -r dev-requirements.in
34+
pytest==5.4.3 # via -r dev-requirements.in, pytest-cov
35+
python-dateutil==2.8.1 # via -r requirements.txt, dohq-artifactory, matplotlib, pandas
36+
pytz==2020.1 # via -r requirements.txt, pandas
37+
pyyaml==5.3.1 # via -r requirements.txt, pre-commit
38+
requests==2.24.0 # via dohq-artifactory
39+
scikit-learn==0.23.1 # via -r requirements.txt
40+
scipy==1.5.1 # via -r requirements.txt, scikit-learn
41+
six==1.15.0 # via -r requirements.txt, cycler, packaging, python-dateutil, tox, virtualenv
42+
sqlalchemy==1.3.18 # via -r requirements.txt
43+
threadpoolctl==2.1.0 # via -r requirements.txt, scikit-learn
3744
toml==0.10.1 # via pre-commit, tox
38-
sqlalchemy==1.3.17
39-
six==1.15.0
40-
virtualenv==20.0.21 # via pre-commit, tox
41-
tox==3.15.2
45+
tox==3.18.0 # via -r dev-requirements.in
4246
urllib3==1.25.9 # via requests
43-
wcwidth==0.2.4 # via pytest
44-
zipp==3.1.0 # via importlib-metadata
45-
46-
# The following packages are considered to be unsafe in a requirements file:
47-
# setuptools==45.1.0 # via kiwisolver
47+
virtualenv==20.0.27 # via pre-commit, tox
48+
wcwidth==0.2.5 # via pytest

0 commit comments

Comments
 (0)