Skip to content
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

Release 0.0.0a17 #172

Closed
wants to merge 53 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
8b3913f
Add test case and function stub for flatten_timepoint_specific_output…
dweindl Aug 20, 2019
e1ee5a0
observable changes in sbml model are still missing
Aug 20, 2019
f4e4ed4
changes implemented now also in sbml
Aug 21, 2019
34a6d06
Merge branch 'develop' into feature_125_flatten_timepoint_specific_ov…
dweindl Sep 7, 2019
8497bac
Add PEtab problem illustration to format description
dweindl Sep 7, 2019
dd2a871
Merge branch 'develop' into feature_petab_figure
dweindl Sep 26, 2019
c7db917
Merge branch 'develop' into feature_125_flatten_timepoint_specific_ov…
dweindl Sep 26, 2019
42d87f3
Merge pull request #136 from ICB-DCM/feature_petab_figure
dweindl Oct 4, 2019
e871f9d
Merge branch 'develop' into feature_125_flatten_timepoint_specific_ov…
dweindl Oct 4, 2019
fecc292
updated function doc
Oct 4, 2019
5b03d15
remove creation of sbml file in test_flatten_timepoint_specific_outpu…
Oct 4, 2019
2fc3b2f
remove return statement from flatten_timepoint_specific_output_overri…
Oct 4, 2019
232581f
warning A value is trying to be set on a copy of a slice from a DataF…
Oct 4, 2019
5924f63
changed values[n] to string-based indexing
Oct 4, 2019
c1d7f9d
add line break - PEP
Oct 4, 2019
28c0098
fix call to generate exp id (#110)
yannikschaelte May 9, 2019
fe2ceaa
Fix deploy (#115)
yannikschaelte May 16, 2019
52beaf4
Visualization (#109)
erikadudki Aug 8, 2019
fe2d5fd
Feature visualization (#120)
paulstapor Aug 16, 2019
f180f34
Fix, test and deprecate petab.sbml.constant_species_to_parameters (#122)
dweindl Aug 18, 2019
24bdb5d
Add test case and function stub for flatten_timepoint_specific_output…
dweindl Aug 20, 2019
529441c
observable changes in sbml model are still missing
Aug 20, 2019
f6cceae
changes implemented now also in sbml
Aug 21, 2019
0e6c0f9
Feature prior (#130)
paulstapor Aug 26, 2019
f4b6d44
Add logo
dweindl Aug 27, 2019
bdcacaf
Add github social logo (#134)
dweindl Sep 6, 2019
1721791
Add PEtab problem illustration to format description
dweindl Sep 7, 2019
20b5790
Fix logo (#139)
yannikschaelte Sep 10, 2019
9cd3d8a
updated function doc
Oct 4, 2019
8377108
remove creation of sbml file in test_flatten_timepoint_specific_outpu…
Oct 4, 2019
15325d3
remove return statement from flatten_timepoint_specific_output_overri…
Oct 4, 2019
a85ffa8
warning A value is trying to be set on a copy of a slice from a DataF…
Oct 4, 2019
7025f12
changed values[n] to string-based indexing
Oct 4, 2019
7f9ca49
add line break - PEP
Oct 4, 2019
a111d67
Merge branch 'feature_125_flatten_timepoint_specific_overrides' of gi…
Oct 4, 2019
93f18db
Merge branch 'master' into feature_125_flatten_timepoint_specific_ove…
Oct 4, 2019
6884a82
Add helper function and test case to deal with timepoint-specific par…
Oct 4, 2019
ec0bd35
Add functionality to create data summary report (#140) (#141)
dweindl Oct 22, 2019
f63ace7
Fix get_noise_distributions: so far we got 'normal' everywhere due to…
dweindl Nov 29, 2019
82ff3dc
Fix create_parameter_df: Exclude rule targets (#149)
dweindl Nov 29, 2019
12f75a1
Verify condition table column names occur as model parameters (Closes…
dweindl Nov 29, 2019
90d8545
Fixup #151: ignore conditionName column (#153)
dweindl Nov 29, 2019
8fab85e
More informative error messages in case of wrongly set observable and…
dweindl Nov 29, 2019
92e3366
Update doc for copasi import and github installation (#158)
dweindl Dec 2, 2019
eca81a5
Extend validator to check if all required parameters are present in p…
dweindl Dec 2, 2019
ed1ec91
Setup documentation for RTD (#161)
dweindl Dec 3, 2019
79b7c88
Handle None in petab.core.split_parameter_replacement_list (Closes #121)
dweindl Dec 1, 2019
5dce8d2
Fix(lint) correct handling of optional columns. Check before access.
dweindl Nov 30, 2019
ebef1fc
Visualization, allow empty column observableParameters (measurement-f…
erikadudki Dec 3, 2019
60d5e1f
Cleanup (#167)
dweindl Dec 4, 2019
5c399c9
Add CHANGELOG (Closes #137)
dweindl Dec 4, 2019
7eec68e
Remove obsolete generate_experiment_id.py (Closes #111)
dweindl Dec 3, 2019
a6a304f
Bump version number to 0.0.0a17 and update ChangeLog
dweindl Dec 4, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .rtd_pip_reqs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
sphinx
sphinxcontrib-napoleon
sphinx-markdown-tables
sphinx-rtd-theme
recommonmark
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@ language: python

python:
- '3.6'

install:
- pip install -U pytest pytest-cov codecov flake8
- pip install -e .
- pip install -U -r ./.travis_pip_reqs.txt
- pip install -e .[reports]

script:
- pytest --cov
- python3 -m flake8 --exclude=build,doc,example,tmp

after_success:
- codecov

deploy:
provider: pypi
username: yannik.schaelte
Expand Down
9 changes: 9 additions & 0 deletions .travis_pip_reqs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
pytest
pytest-cov
codecov
flake8
sphinx
sphinxcontrib-napoleon
sphinx-markdown-tables
sphinx-rtd-theme
recommonmark
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# PEtab changelog

### 0.0.0a17

Data format: *No changes*

Library:
* Extended visualization support
* Add helper function and test case to deal with timepoint-specific parameters
flatten_timepoint_specific_output_overrides (#128) (Closes #125)
* Fix get_noise_distributions: so far we got 'normal' everywhere due to
wrong grouping (#147)
* Fix create_parameter_df: Exclude rule targets (#149)
* Verify condition table column names occur as model parameters
(Closes #150) (#151)
* More informative error messages in case of wrongly set observable and
noise parameters (Closes #118) (#155)
* Update doc for copasi import and github installation (#158)
* Extend validator to check if all required parameters are present in
parameter table (Closes #43) (#159)
* Setup documentation for RTD (#161)
* Handle None in petab.core.split_parameter_replacement_list (Closes #121)
* Fix(lint) correct handling of optional columns. Check before access.
* Remove obsolete generate_experiment_id.py (Closes #111) #166

### 0.0.0a16 and earlier

See git history
18 changes: 15 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ for example:
Where PEtab is used / supported:

- Within the systems biology optimization
[benchmark problem collection](https://github.com/LoosC/Benchmark-Models)
[benchmark problem collection](https://github.com/LeonardSchmiester/Benchmark-Models)

- A PEtab -> [COPASI](http://copasi.org/)
[converter](https://github.com/copasi/python-petab-importer)

- [pyPESTO](https://github.com/ICB-DCM/pyPESTO/)

Expand Down Expand Up @@ -85,15 +88,24 @@ it is running

It will require Python3.6 to run.

Development versions of the PEtab library can be installed using

pip3 install https://github.com/ICB-DCM/PEtab/archive/develop.zip

(replace `develop` by the branch or commit you would like to install).

When setting up a new parameter estimation problem, the most useful tools will
be:

- The PEtab validator, which is now automatically installed using Python entrypoints to
be available as a shell command from anywhere called `petablint`
- The **PEtab validator**, which is now automatically installed using Python
entrypoints to be available as a shell command from anywhere called
`petablint`

- `petab.core.create_parameter_df` to create the parameter table, once you
have set up the model, condition table and measurement table

- Functions in `petab.sbml` to define observables and error model parameters
in the SBML model

## Extending PEtab

Expand Down
1 change: 1 addition & 0 deletions doc/CHANGELOG.md
20 changes: 20 additions & 0 deletions doc/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?=
SPHINXBUILD ?= sphinx-build
SOURCEDIR = .
BUILDDIR = build

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

.PHONY: help Makefile

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
78 changes: 78 additions & 0 deletions doc/conf.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# Configuration file for the Sphinx documentation builder.
#
# This file only contains a selection of the most common options. For a full
# list see the documentation:
# https://www.sphinx-doc.org/en/master/usage/configuration.html

# -- Path setup --------------------------------------------------------------

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
import os
import sys
sys.path.insert(0, os.path.abspath('..'))

# -- Project information -----------------------------------------------------

project = 'PEtab'
copyright = '2019, Daniel Weindl, Yannik Schälte, Dantong Wang, Carolin Loos, Jan Hasenauer, Paul Stapor, Elba Raimúndez Álvarez, Erika Dudkin, Charles Tapley Hoyt, Fabian Fröhlich'
author = 'Daniel Weindl, Yannik Schälte, Dantong Wang, Carolin Loos, Jan Hasenauer, Paul Stapor, Elba Raimúndez Álvarez, Erika Dudkin, Charles Tapley Hoyt, Fabian Fröhlich'

# The full version, including alpha/beta/rc tags
release = 'latest'


# -- General configuration ---------------------------------------------------

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.napoleon',
'sphinx.ext.autodoc',
'recommonmark',
'sphinx.ext.autosummary',
'sphinx_markdown_tables',
]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = []

master_doc = 'index'

autosummary_generate = True

autodoc_default_options = {
"members": None,
"imported-members": None,
"inherited-members": None,
"private-members": None,
"show-inheritance": None,
}

# -- Options for HTML output -------------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'sphinx_rtd_theme'

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']

html_context = {
"display_github": True,
"github_user": "ICB-DCM",
"github_repo": "petab",
"github_version": "develop",
"conf_py_path": "/doc",
}
16 changes: 9 additions & 7 deletions doc/documentation_data_format.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Optimization problem data format specification

This document explains the data format used for the benchmark collection.
# PEtab data format specification

This document explains the PEtab data format.

## Purpose

Expand All @@ -12,10 +11,11 @@ systems biology, especially for the case of Ordinary Differential Equation

## Overview

This data format specifies a parameter estimation problems using a number of
text-based files ([Systems Biology Markup Language (SBML)](http://sbml.org)
and [Tab-Separated Values
(TSV)](https://www.iana.org/assignments/media-types/text/tab-separated-values)), i.e.
The PEtab data format specifies a parameter estimation problem using a number
of text-based files ([Systems Biology Markup Language (SBML)](http://sbml.org)
and
[Tab-Separated Values (TSV)](https://www.iana.org/assignments/media-types/text/tab-separated-values)),
i.e.

- An SBML model [SBML]

Expand All @@ -33,6 +33,8 @@ and [Tab-Separated Values
- (optional) A visualization file, which contains specifications how the data
and/or simulations should be plotted by the visualization routines [TSV]

![Files constituting a PEtab problem](gfx/petab_files.png)

The following sections will describe the minimum requirements of those
components in the core standard, which should provide all information for
defining the parameter estimation problem.
Expand Down
Binary file added doc/gfx/petab_files.pdf
Binary file not shown.
Binary file added doc/gfx/petab_files.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading