Skip to content

Commit

Permalink
Merge branch 'release/0.15.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
simonvh committed Sep 29, 2020
2 parents 2dc3e97 + faa31a3 commit 2e09182
Show file tree
Hide file tree
Showing 46 changed files with 2,451 additions and 1,071 deletions.
33 changes: 33 additions & 0 deletions .rtd-environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: gimmemotifs
channels:
- defaults
- bioconda
- conda-forge
dependencies:
- configparser
- diskcache
- feather-format
- genomepy >=0.8.3
- jinja2
- logomaker
- matplotlib-base >=3.1.2
- ncurses
- numpy
- pandas >=1.0.3
- pillow
- pyarrow >=0.16.0
- pybedtools
- python >=3
- python-xxhash
- pyyaml >=3.10
- qnorm
- represent
- scikit-learn >=0.18
- scipy >=1.3.0
- seaborn
- statsmodels
- tqdm >=4.27.0
- xdg
- xgboost >=0.71
- sphinx_bootstrap_theme
- numpydoc
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@ before_install:
fi
- chmod +x miniconda.sh
- ./miniconda.sh -b -p $HOME/miniconda -f
- export PATH=$HOME/miniconda/bin:$PATH
- conda config --set always_yes yes
- source "$HOME/miniconda/etc/profile.d/conda.sh"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ulimit -S -n 4096; ulimit -a; fi

install:
Expand All @@ -34,7 +37,8 @@ install:
else
conda env create -q -f conda_env.osx.txt -n gimme;
fi
- source activate gimme
- conda activate gimme
- conda list
- python setup.py build && pip install -e .

before_script:
Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,33 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

### Fixed

## [0.15.0] - 2020-09-29

### Added

- Added additional columns to `gimme maelstrom` output for better intepretation (correlation of motif to signal and % of regions with motif).
- Added support for multi-species input in `genome@chrom:start-end` format.
- `gimme maelstrom` warns if data is not row-centered and will center by default.
- `gimme maelstrom` selects a set of non-redundant (or less redundant) motifs by default.
- Added SVR regressor for `gimme maelstrom`.
- Added quantile normalization to `coverage_table`.

### Removed

- Removed the lightning classifiers and regressors as the package is no longer actively maintained.

### Changed

- Visually improved HTML output.
- Score of `maelstrom` is now an aggregate z-score based on combining z-scores from individual methods using Stouffer's method. The z-scores of individual methods are generated using the inverse normal transform.
- Reorganized some classes and functions.

### Fixed

- Fixed minor issues with sorting columns in HTML output.
- `gimme motifs` doesn't crash when no motifs are found.
- Fixed error with Ensembl chromosome names in `combine_peaks`.

## [0.14.4] - 2020-04-02

### Fixed
Expand Down
14 changes: 5 additions & 9 deletions conda_env.dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ configparser
dinamo
diskcache
feather-format
future
gadem
genomepy >=0.6.1
ghostscript
genomepy >=0.8.3
homer
icu=58
ipywidgets # Necessary for progress bar in Jupyter notebook
jinja2
logomaker
Expand All @@ -18,17 +15,16 @@ ncurses
numpy
prosampler
pillow
pyarrow
pyarrow >=0.16.0
pybedtools
pysam
python
python-xxhash
pyyaml >=3.10
scikit-learn >=0.18
scipy >=1.3.0
qnorm
scikit-learn >=0.23
scipy >=1.4.1
seaborn
six
sklearn-contrib-lightning
statsmodels
tqdm >=4.27.0
trawler
Expand Down
13 changes: 6 additions & 7 deletions conda_env.osx.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ bedtools
configparser
diskcache
feather-format
future
gadem
genomepy >=0.6.1
genomepy >=0.8.3
ghostscript
homer
jinja2
logomaker
llvm-openmp
matplotlib >=2.0
meme >=5
ncurses
Expand All @@ -21,19 +21,18 @@ pysam
python
python-xxhash
pyyaml >=3.10
scikit-learn >=0.18
scipy <1.3.0
qnorm
scikit-learn
scipy
seaborn
six
sklearn-contrib-lightning
statsmodels
tqdm >=4.27.0
trawler
ucsc-bigbedtobed
ucsc-genepredtobed
weeder
xdg
xgboost >=0.71
xgboost=0.72
xxmotif

# development-specific
Expand Down
37 changes: 37 additions & 0 deletions conda_env.test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
bedtools
configparser
dinamo
diskcache
feather-format
gadem
genomepy >=0.6.1
ghostscript
homer
icu=58
ipywidgets # Necessary for progress bar in Jupyter notebook
jinja2
logomaker
matplotlib >=2.0
meme >=5
ncurses
numpy
pillow
prosampler
pyarrow
pybedtools
python >=3.8
python-xxhash
pyyaml >=3.10
qnorm
scikit-learn >=0.18
scipy <1.3.0
seaborn
statsmodels
tqdm >=4.27.0
trawler
ucsc-bigbedtobed
ucsc-genepredtobed
weeder
xdg
xgboost >=0.71
xxmotif
18 changes: 7 additions & 11 deletions conda_env.txt
Original file line number Diff line number Diff line change
@@ -1,39 +1,35 @@
bedtools
configparser
dinamo
diskcache
feather-format
future
gadem
genomepy >=0.6.1
genomepy >=0.8.3
ghostscript
homer
icu=58
ipywidgets # Necessary for progress bar in Jupyter notebook
jinja2
logomaker
matplotlib >=2.0
meme >=5
matplotlib-base >=3.1.2
meme >=5.1.1
ncurses
numpy
pandas >=1.0.3
pillow
prosampler
pyarrow
pyarrow >=0.16.0
pybedtools
pysam
python
python >=3
python-xxhash
pyyaml >=3.10
qnorm
scikit-learn >=0.18
scipy <1.3.0
seaborn
six
sklearn-contrib-lightning
statsmodels
tqdm >=4.27.0
trawler
ucsc-bigbedtobed
ucsc-genepredtobed
weeder
xdg
xgboost >=0.71
Expand Down
3 changes: 2 additions & 1 deletion data/templates/sortable/sortable-theme-slick.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* line 2, ../sass/_sortable.sass */
table[data-sortable] {
font-size: 80%;
font-family: 'Nunito Sans';
font-size: 90%;
border-collapse: collapse;
border-spacing: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion data/templates/sortable/sortable.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2e09182

Please sign in to comment.