Skip to content

Release/1.0.0 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Mar 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
74d7d53
mlf-core sync
Zethson Nov 11, 2020
251c671
Add sync enabled to mlf_core.cfg
Zethson Feb 3, 2021
ae537cd
mlf-core sync
Zethson Feb 24, 2021
bd8ece1
Bump version from 0.1.0-SNAPSHOT to 0.1.0
steffenlem Mar 11, 2021
756ae60
Bump version from 0.1.0 to 1.0.0
steffenlem Mar 11, 2021
7eb7c41
Replaced dataset
steffenlem Mar 11, 2021
d76df4d
Updated version tag
steffenlem Mar 12, 2021
15e8d51
Merge branch 'development' into mlf_core_sync_v1.3.2
steffenlem Mar 15, 2021
4f16517
Fixed changes of PR
steffenlem Mar 16, 2021
110002e
Provided paths to data loading function
steffenlem Mar 26, 2021
b996054
Corrected path to container
steffenlem Mar 26, 2021
36ae28b
Changed output of dataload from dataset to DMatrix
steffenlem Mar 26, 2021
0e9793a
Removed old runs
steffenlem Mar 26, 2021
c69faf4
fix bandit
Zethson Mar 27, 2021
ed83ea4
fix flake8
Zethson Mar 27, 2021
2acd96f
Merge pull request #7 from mlf-core/mlf_core_sync_v1.3.2
Zethson Mar 27, 2021
c9c988d
Merge branch 'development' into development
Zethson Mar 27, 2021
c1144dc
Merge pull request #8 from steffenlem/development
Zethson Mar 27, 2021
c378708
Resolved merge conflict
steffenlem Mar 28, 2021
e4897a7
Updated parameter doc
steffenlem Mar 28, 2021
bdce587
Replaced term benign with healthy in documentation
steffenlem Mar 28, 2021
e3d7e8b
Added info on hyperparameters to docs
steffenlem Mar 28, 2021
2bfd6a5
fix README wording
Zethson Mar 28, 2021
51f6d5e
Adjusted versions to the experiment runs
steffenlem Mar 29, 2021
39a813d
Fixed data loading and evaluation step
steffenlem Mar 29, 2021
cd1f89a
Fixed flake8 errors
steffenlem Mar 29, 2021
4217cd3
Added experiment runs
steffenlem Mar 29, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[flake8]
exclude = docs
exclude = docs/*
max-line-length = 160
64 changes: 64 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: mlf-core linting
on:
push:
pull_request:
release:
types: [published]

jobs:

mlf-core-lint:
name: Run mlf-core lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: 3.9

- name: Install mlf-core
run: pip install mlf-core

- name: Run mlf-core lint
run: mlf-core lint .


flake8:
name: Run flake8
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: 3.9

- name: Install flake8
run: pip install flake8

- name: Lint with flake8
run: flake8 .

bandit:
name: Run bandit
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
steps:
- uses: actions/checkout@v2
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: 3.9

- name: Install bandit
run: pip install bandit

- name: Run bandit
run: bandit -r lcep -c .bandit.yml
74 changes: 74 additions & 0 deletions .github/workflows/master_branch_protection.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: PR to master branch from patch/release branch only

on:
pull_request:
branches:
- master

jobs:
check_target:
runs-on: ubuntu-latest
name: Check Target branch
steps:
# PRs to the repository master branch are only ok if coming from any patch or release branch
- name: Check PRs
run: |
{ [[ $GITHUB_HEAD_REF = *"release"* ]]; } || [[ $GITHUB_HEAD_REF == *"patch"* ]]


# If the above check failed, post a comment on the PR explaining the failure
# NOTE - this may not work if the PR is coming from a fork, due to limitations in GitHub actions secrets
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v1
with:
message: |
Hi @${{ github.event.pull_request.user.login }},

It looks like this pull-request is has been made against the ${{github.event.pull_request.head.repo.full_name}} `master` branch.
The `master` branch should always contain code from the latest release.
Because of this, PRs to `master` are only allowed if they come from any ${{github.event.pull_request.head.repo.full_name}} `release` or `patch` branch.

You do not need to close this PR, you can change the target branch to `development` by clicking the _"Edit"_ button at the top of this page.

Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false

check_version:
name: No SNAPSHOT version on master branch
runs-on: ubuntu-latest
steps:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.8'
# PRs to the repository master branch are only ok if coming from any patch or release branch
- name: Install mlf-core
run: pip install mlf-core

- name: Check project version
run: |
PROJECTVERSION=$(mlf-core bump-version --project-version . | tail -n1)
echo $PROJECTVERSION;
if [[ $PROJECTVERSION == *"SNAPSHOT"* ]];then
exit -1
else
exit 0
fi

# If the above check failed, post a comment on the PR explaining the failure
# NOTE - this may not work if the PR is coming from a fork, due to limitations in GitHub actions secrets
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v1
with:
message: |
Hi @${{ github.event.pull_request.user.login }},

It looks like this pull-request is has been made against the ${{github.event.pull_request.head.repo.full_name}} `master` branch.
A version check determined that you are using a SNAPSHOT version.
The `master` branch should never have any SNAPSHOT versions, since only fully stable code should be on the `master` branch.
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false

37 changes: 0 additions & 37 deletions .github/workflows/pr_to_master_from_patch_release_only.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/publish_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
username: mlf-core
password: '${{ secrets.MLF_CORE_SYNC_TOKEN}}'
registry: ghcr.io
tags: "latest,0.1.0-SNAPSHOT"
tags: "latest,1.0.0"

38 changes: 38 additions & 0 deletions .github/workflows/publish_docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Build Documentation

on: [push]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v1
with:
python-version: 3.8

- name: Install pip
run: |
python -m pip install --upgrade pip

- name: Install doc dependencies
run: |
pip install -r docs/requirements.txt

- name: Build docs
run: |
cd docs
make html

- name: Deploy
if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'}}
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/_build/html

27 changes: 0 additions & 27 deletions .github/workflows/run_bandit.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .github/workflows/run_flake8_linting.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .github/workflows/run_mlf_core_lint.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ jobs:
token: '${{ secrets.MLF_CORE_SYNC_TOKEN }}'

- name: Sync project
run: mlf-core sync . ${{ secrets.MLF_CORE_SYNC_TOKEN }} zethson
run: mlf-core --verbose sync . ${{ secrets.MLF_CORE_SYNC_TOKEN }} zethson
6 changes: 3 additions & 3 deletions .github/workflows/train_cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ jobs:
with:
dockerfile: Dockerfile
repository: ghcr.io/mlf-core/lcep
tags: 0.1.0-SNAPSHOT
tags: 1.0.0
push: false

- name: Setup Python
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python }}
python-version: ${{ matrix.python }}

- name: Install mlflow
run: pip install mlflow

- name: Train on the CPU
run: mlflow run . -P training-data='/data/train.tsv' -P test-data='/data/test.tsv'
run: mlflow run . -P max_epochs=2 -P training-data='/data/train.tsv' -P test-data='/data/test.tsv'
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,6 @@ dmypy.json

# Jetbrains IDE
.idea/

# visual studio code
.vscode
4 changes: 2 additions & 2 deletions .mlf_core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ domain: mlflow
language: xgboost
project_slug: lcep
project_slug_no_hyphen: lcep
template_version: '1.3.0 # <<MLF-CORE_NO_BUMP>>'
template_version: '1.3.2 # <<MLF-CORE_NO_BUMP>>'
template_handle: mlflow-xgboost
github_username: mlf-core
creator_github_username: zethson
Expand All @@ -15,5 +15,5 @@ email: lukas.heumos@posteo.net
project_name: lcep
project_short_description: Classifying cancerous liver samples from gene expression
data.
version: 0.1.0-SNAPSHOT
version: 1.0.0
license: MIT
1 change: 1 addition & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Development Lead
----------------

* Lukas Heumos <lukas.heumos@posteo.net>
* Steffen Lemke <steffen.lemke@uni-tuebingen.de>

Contributors
------------
Expand Down
19 changes: 17 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,23 @@ Changelog
This project adheres to `Semantic Versioning <https://semver.org/>`_.


0.1.0-SNAPSHOT (2020-11-11)
---------------------------------------------
1.0.0 (2021-03-11)
------------------

**Added**

* Added new train and test dataset based on TCGA-LIHC & GTEx (liver)
* Added optimized hyperparameters to the model

**Fixed**

**Dependencies**

**Deprecated**


0.1.0 (2021-03-11)
------------------

**Added**

Expand Down
Loading