Skip to content

Commit

Permalink
Merge pull request #18 from matthiaskoenig/develop
Browse files Browse the repository at this point in the history
changes for v0.3.2
  • Loading branch information
matthiaskoenig authored Jan 2, 2020
2 parents 423ccc7 + 5105ee5 commit d0cde3a
Show file tree
Hide file tree
Showing 34 changed files with 22,518 additions and 3,022 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
pyexsimo.egg-info/
*.xlsx#
.ipynb_checkpoints/
__pycache__
__pycache__
*.h5
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sudo: required
language: python
# cache: pip
cache: pip
python:
- "3.6"

Expand Down
19 changes: 11 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<h1><img alt="EXSIMO logo" src="./docs/images/exsimo_logo_200.png" height="100" /> EXSIMO: EXecutable SImulation MOdel</h1>
<h1><img src="./docs/images/exsimo_logo_200.png" height="100" /> EXSIMO: EXecutable SImulation MOdel</h1>

[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3596068.svg)](https://doi.org/10.5281/zenodo.3596068)
[![Build Status](https://travis-ci.org/matthiaskoenig/exsimo.svg?branch=develop)](https://travis-ci.org/matthiaskoenig/exsimo)
[![GitHub version](https://badge.fury.io/gh/matthiaskoenig%2Fexsimo.svg)](https://badge.fury.io/gh/matthiaskoenig%2Fexsimo)
[![codecov](https://codecov.io/gh/matthiaskoenig/exsimo/branch/develop/graph/badge.svg)](https://codecov.io/gh/matthiaskoenig/exsimo)
![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/matthiaskoenig/exsimo)
![Docker Pulls](https://img.shields.io/docker/pulls/matthiaskoenig/exsimo)
[![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/matthiaskoenig/exsimo)](https://hub.docker.com/repository/docker/matthiaskoenig/exsimo)
[![Docker Pulls](https://img.shields.io/docker/pulls/matthiaskoenig/exsimo)](https://hub.docker.com/repository/docker/matthiaskoenig/exsimo)

<b><a href="https://orcid.org/0000-0003-1725-179X" title="https://orcid.org/0000-0003-1725-179X"><img src="./docs/images/orcid.png" height="15"/></a> Matthias König</b>

Expand All @@ -16,9 +16,12 @@ Data, model and code for executable simulation model of hepatic glucose metaboli
* `docs/models` - SBML model and model report
* `pyexsimo` - python package (model generation, simulation experiments, tests, ...)

Results of the executed model are available from https://matthiaskoenig.github.io/exsimo/

Docker images available from https://hub.docker.com/repository/docker/matthiaskoenig/exsimo
**Reports**: https://matthiaskoenig.github.io/exsimo/
**Docker images**: https://hub.docker.com/repository/docker/matthiaskoenig/exsimo
**Zenodo snapshots**: [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3596068.svg)](https://doi.org/10.5281/zenodo.3596068)
**Github releases**: https://github.com/matthiaskoenig/exsimo/releases

<img src="./docs/images/exsimo_overview.png" width="600" />

## Setup local environment
To run the analysis locally create a python virtual environment and install `pyexsimo`.
Expand All @@ -44,7 +47,7 @@ docker run -it matthiaskoenig/exsimo:latest
```
To run a specific model version use the respective tag
```bash
docker run -it matthiaskoenig/exsimo:0.3.0
docker run -it matthiaskoenig/exsimo:0.3.1
```
To run the tests use `pytest`, to execute the analysis use `execute`.

Expand All @@ -57,7 +60,7 @@ pytest
## Run analysis
The complete analysis can be run via
```
(exsimo) execute
execute
```
which updates the results in the `./docs/` folder.

Expand Down
11 changes: 9 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ This document describes steps for releasing a new version
```
git checkout develop
```
## bump version
Update version info in `_version.py`
## bump version & requirements
- update version info in `pyexsimo/_version.py`
- check `sbmlsim` and `sbmlutils` hashes in `requirements.txt`

## run tests
```
(exsimo) pytest
Expand All @@ -30,6 +32,11 @@ Merge pull request in master. This triggers a zenodo update and the build of a n
## check online report
[https://matthiaskoenig.github.io/exsimo/](https://matthiaskoenig.github.io/exsimo/)

## upload tagged docker-container
docker build -t matthiaskoenig/exsimo:${EXSIMO_VERSION} .
docker login
docker push matthiaskoenig/exsimo:${EXSIMO_VERSION}

## update develop branch
```
git checkout master
Expand Down
4 changes: 2 additions & 2 deletions docs/DoseResponseExperiment.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
* [insulin.tsv](./sbmlsim/DoseResponseExperiment_data_insulin.tsv)

## Figures
* [DoseResponseExperiment_fig1.png](DoseResponseExperiment_fig1.png)
* [DoseResponseExperiment_fig1.svg](DoseResponseExperiment_fig1.svg)

### fig1
![DoseResponseExperiment_fig1.png](DoseResponseExperiment_fig1.png)
![DoseResponseExperiment_fig1.svg](DoseResponseExperiment_fig1.svg)


## Code
Expand Down
Binary file removed docs/DoseResponseExperiment_fig1.png
Binary file not shown.
Loading

0 comments on commit d0cde3a

Please sign in to comment.