Skip to content

Commit e7f98a6

Browse files
committed
make release-tag: Merge branch 'master' into stable
2 parents 766f551 + e24f4d3 commit e7f98a6

46 files changed

Lines changed: 1128 additions & 1131 deletions

Some content is hidden

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

.github/workflows/docs.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Generate Docs
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
7+
jobs:
8+
9+
docs:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
14+
- name: Python
15+
uses: actions/setup-python@v1
16+
with:
17+
python-version: 3.6
18+
19+
- name: Build
20+
run: |
21+
python -m pip install --upgrade pip
22+
pip install -e .[dev]
23+
make docs
24+
- name: Deploy
25+
uses: peaceiris/actions-gh-pages@v3
26+
with:
27+
github_token: ${{secrets.GITHUB_TOKEN}}
28+
publish_dir: docs/_build/html
29+

.github/workflows/tests.yml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Run Tests
2+
3+
on:
4+
push:
5+
branches: [ '*' ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
devel:
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
matrix:
14+
python-version: [3.6, 3.7]
15+
os: [ubuntu-latest, macos-latest]
16+
steps:
17+
- uses: actions/checkout@v1
18+
- name: Set up Python ${{ matrix.python-version }}
19+
uses: actions/setup-python@v1
20+
with:
21+
python-version: ${{ matrix.python-version }}
22+
- name: Install package
23+
run: pip install .[dev]
24+
- name: make test-devel
25+
run: make test-devel
26+
27+
unit:
28+
runs-on: ${{ matrix.os }}
29+
strategy:
30+
matrix:
31+
python-version: [3.6, 3.7]
32+
os: [ubuntu-latest, macos-latest]
33+
steps:
34+
- uses: actions/checkout@v1
35+
- name: Set up Python ${{ matrix.python-version }}
36+
uses: actions/setup-python@v1
37+
with:
38+
python-version: ${{ matrix.python-version }}
39+
- name: Install package and dependencies
40+
run: pip install .[test]
41+
- name: Test with pytest
42+
run: make test
43+
44+
readme:
45+
runs-on: ${{ matrix.os }}
46+
strategy:
47+
matrix:
48+
python-version: [3.6, 3.7]
49+
os: [ubuntu-latest, macos-latest]
50+
steps:
51+
- uses: actions/checkout@v1
52+
- name: Set up Python ${{ matrix.python-version }}
53+
uses: actions/setup-python@v1
54+
with:
55+
python-version: ${{ matrix.python-version }}
56+
- name: Install package and dependencies
57+
run: pip install rundoc .
58+
- name: make test-readme
59+
run: make test-readme
60+

.travis.yml

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

HISTORY.md

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,45 @@
11
# History
22

3+
## 0.1.2 - 2021-02-19
4+
5+
New Modeler component
6+
7+
* Invalid default metric name - [Issue #82](https://github.com/MLBazaar/Cardea/issues/82) by @ChengFR
8+
9+
* Parameter 'presort' in 'sklearn.ensemble.GradientBoostingClassifier' has been deprecated since sklearn v0.22 - [Issue #80](https://github.com/MLBazaar/Cardea/issues/80) by @ChengFR
10+
11+
* Loading demo data in either FHIR or MIMIC format - [Issue #79](https://github.com/MLBazaar/Cardea/issues/79) by @sarahmish
12+
13+
* Fix a customized primitive: Categorizer - [Issue #75](https://github.com/MLBazaar/Cardea/issues/75) by @ChengFR
14+
15+
* Update Cardea Class - [Issue #73](https://github.com/MLBazaar/Cardea/issues/73) by @sarahmish
16+
17+
* Clean up the modeler - [Issue #71](https://github.com/MLBazaar/Cardea/issues/71) by @ChengFR
18+
19+
* Update and clean up the dependencies - [Issue #70](https://github.com/MLBazaar/Cardea/issues/70) by @ChengFR
20+
21+
322
## 0.1.1 - 2020-12-11
423

524
Benchmark framework
625

7-
* Link google colab to Cardea and add badge README.md - [Issue #67](https://github.com/DAI-Lab/Cardea/issues/67) by @sarahmish
26+
* Link google colab to Cardea and add badge README.md - [Issue #67](https://github.com/MLBazaar/Cardea/issues/67) by @sarahmish
827

9-
* Modeler load pipelines instead of lists of primitives enhancement - [Issue #65](https://github.com/DAI-Lab/Cardea/issues/65) by @ChengFR
28+
* Modeler load pipelines instead of lists of primitives enhancement - [Issue #65](https://github.com/MLBazaar/Cardea/issues/65) by @ChengFR
1029

11-
* Benchmark testing apis enhancement - [Issue #64](https://github.com/DAI-Lab/Cardea/issues/64) by @ChengFR
30+
* Benchmark testing apis enhancement - [Issue #64](https://github.com/MLBazaar/Cardea/issues/64) by @ChengFR
1231

13-
* Update documentation theme enhancement - [Issue #62](https://github.com/DAI-Lab/Cardea/issues/62) by @sarahmish
32+
* Update documentation theme enhancement - [Issue #62](https://github.com/MLBazaar/Cardea/issues/62) by @sarahmish
1433

15-
* Primitive setup enhancement - [Issue #61](https://github.com/DAI-Lab/Cardea/issues/61) by @sarahmish & @ChengFR
34+
* Primitive setup enhancement - [Issue #61](https://github.com/MLBazaar/Cardea/issues/61) by @sarahmish & @ChengFR
1635

1736

1837
## 0.1.0 - 2020-09-15
1938

2039
Release on PyPI: https://pypi.org/project/cardea/
2140

22-
* Analysis notebooks enhancement - [Issue #58](https://github.com/DAI-Lab/Cardea/issues/58) by @sarahmish
41+
* Analysis notebooks enhancement - [Issue #58](https://github.com/MLBazaar/Cardea/issues/58) by @sarahmish
2342

24-
* MIMIC III data loader enhancement - [Issue #57](https://github.com/DAI-Lab/Cardea/issues/57) by @sarahmish
43+
* MIMIC III data loader enhancement - [Issue #57](https://github.com/MLBazaar/Cardea/issues/57) by @sarahmish
2544

26-
* Freeze package on analysis compatibility - [Issue #55](https://github.com/DAI-Lab/Cardea/issues/55) by @sarahmish
45+
* Freeze package on analysis compatibility - [Issue #55](https://github.com/MLBazaar/Cardea/issues/55) by @sarahmish

Makefile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,17 @@ test: ## run tests quickly with the default Python
115115
test-all: ## run tests on every Python version with tox
116116
tox
117117

118+
.PHONY: test-readme
119+
test-readme: ## run the readme snippets
120+
rundoc run --single-session python3 -t python3 README.md
118121

119122

123+
.PHONY: check-dependencies
124+
check-dependencies: ## test if there are any broken dependencies
125+
pip check
126+
127+
.PHONY: test-devel
128+
test-devel: check-dependencies lint docs ## test everything that needs development dependencies
120129

121130

122131
.PHONY: coverage
@@ -131,16 +140,14 @@ coverage: clean-coverage ## check code coverage quickly with the default Python
131140

132141
.PHONY: docs
133142
docs: clean-docs ## generate Sphinx HTML documentation, including API docs
134-
sphinx-apidoc --module-first --separate --no-toc --output-dir docs/api/ cardea
135143
$(MAKE) -C docs html
136-
touch docs/_build/html/.nojekyll
137144

138145
.PHONY: viewdocs
139-
viewdocs: docs ## view docs in browser
146+
viewdocs: ## view the docs in a browser
140147
$(BROWSER) docs/_build/html/index.html
141148

142149
.PHONY: servedocs
143-
servedocs: docs ## compile the docs watching for changes
150+
servedocs: ## compile the docs watching for changes
144151
watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
145152

146153

0 commit comments

Comments
 (0)