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

Update violinplots to work with seaborn 0.6 #317

Open
wants to merge 2,159 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2159 commits
Select commit Hold shift + click to select a range
2b104cb
fix up plot_two_feature tests
olgabot Mar 4, 2015
fb27eb8
Add GO to release notes
olgabot Mar 4, 2015
ebc00d7
Merge pull request #266 from YeoLab/gene_ontology
olgabot Mar 4, 2015
bea9ca7
update date on release notes
olgabot Mar 4, 2015
726c128
Merge branch 'master' of github.com:YeoLab/flotilla
olgabot Mar 4, 2015
33a0f46
update version 0.2.5dev --> 0.2.5 for release
olgabot Mar 4, 2015
a3b9289
version bump to 0.2.6dev
olgabot Mar 4, 2015
4dd890f
save the GO data with the package
olgabot Mar 4, 2015
40bec13
start rewriting test for saving
olgabot Mar 4, 2015
0985a58
version down to 0.2.5 for fixing docs in release
olgabot Mar 4, 2015
2e20564
try to fix travis ci docs deployment
olgabot Mar 4, 2015
769aeed
version bump to 0.2.6dev
olgabot Mar 5, 2015
abc19be
shift bimodal and middle distributions to start with parameters more …
olgabot Mar 5, 2015
7e859b6
change min_samples to 10
olgabot Mar 5, 2015
c9d3e65
forgot parens around bimodal model parameters
olgabot Mar 5, 2015
a024c56
change min samples to default to 10 instead of 0.5
olgabot Mar 11, 2015
93a7fa3
Add ".data_original" to GeneOntologyData for compatibility with other…
olgabot Mar 12, 2015
23999a4
Fix up test for saving, add gene ontology data to study
olgabot Mar 12, 2015
259c656
Make Metadata's self.data_original point to self.data
olgabot Mar 12, 2015
1d3835b
save the minimum number of reads per sample, and save metadata's data…
olgabot Mar 12, 2015
6baf673
pep8 and lint fixes
olgabot Mar 12, 2015
714ab3c
add known genes from chr22 for testing
olgabot Mar 12, 2015
c04925f
Add release notes
olgabot Mar 12, 2015
5832ace
downgrade next version to 0.2.6 instead of 0.3.0 (not ready yet)
olgabot Mar 12, 2015
0b779f6
Merge pull request #271 from YeoLab/save_go_data
olgabot Mar 12, 2015
47f170a
Merged with master
olgabot Mar 12, 2015
cfd4abc
Fix creation of study in test
olgabot Mar 12, 2015
0bafb39
initial commit of supplemental data
olgabot Mar 12, 2015
7f4fac4
remove "_fixed", "_no_na" fixtures
olgabot Mar 12, 2015
4b86fc1
initial tests of supplemental seem to work
olgabot Mar 12, 2015
3e589dd
pep8 fixes (hopefully will fix failing tests)
olgabot Mar 12, 2015
5681048
lint fixes
olgabot Mar 12, 2015
abaa7a4
initial commit of heatmap PCs
olgabot Mar 12, 2015
d9673a5
make ax_loadings an actual ax
olgabot Mar 12, 2015
9c89875
fix rows/columns for gridspec from subplotspec
olgabot Mar 12, 2015
2dff7fe
try making the axes for heatmap loadings a different way
olgabot Mar 13, 2015
0f42964
fix typos
olgabot Mar 13, 2015
a6e3300
move plot_loadings_heatmap to after ax creation
olgabot Mar 13, 2015
8509168
change specification of gridspec
olgabot Mar 13, 2015
ae8c6b4
change number of rows, cols in gridspec, and make explained variance …
olgabot Mar 13, 2015
ebaecfd
make explained variance ratio bigger
olgabot Mar 13, 2015
4efc05b
make ax explained variance, heatmap wider, explained variance ratio s…
olgabot Mar 13, 2015
54d966a
don't make heatmap bleed into colorbar
olgabot Mar 13, 2015
73f237a
fix ax pcs colorbar
olgabot Mar 13, 2015
0280594
make explained variance ratio graph shorter
olgabot Mar 13, 2015
8491d41
change wspace and hspace to 0
olgabot Mar 13, 2015
be2aec9
make yticklabels of heatmap smaller
olgabot Mar 13, 2015
520abf2
increase wspace, hspace, actually get yticklabels
olgabot Mar 13, 2015
09d9b5a
Add another column to gridspec, remove ax_empty
olgabot Mar 13, 2015
67aef3d
revert back to when figure was "good enough"
olgabot Mar 13, 2015
85f0f3e
shrink yticklabels of PC heatmap down to 12 (from 13)
olgabot Mar 13, 2015
5b4e875
shrink yticklabels down to 11 pt font
olgabot Mar 13, 2015
f995cfc
add colorbar label
olgabot Mar 13, 2015
366705d
Despine only the scatter and line plots, not the the heatmap
olgabot Mar 13, 2015
9398bc0
Add release notes
olgabot Mar 13, 2015
ce93758
Add release notes
olgabot Mar 13, 2015
5dd63d3
Merge pull request #267 from YeoLab/shorten_test_suite_time
olgabot Mar 13, 2015
66e8c4a
fix merge conflict
olgabot Mar 14, 2015
ce91f11
fix supplemental/spikein merge conflict
olgabot Mar 14, 2015
f3e1436
add release notes
olgabot Mar 16, 2015
3ca34ee
pep8 fixes
olgabot Mar 16, 2015
24c1fff
Add newline to sys.stdout message
olgabot Mar 16, 2015
d28eaaf
Add supplemental data to reading/loading of the datapackage
olgabot Mar 16, 2015
9040761
Add test for embarking on a datapackage with supplemental data
olgabot Mar 16, 2015
6e12d23
move _is_absolute_path to not a method of Study because it's needed d…
olgabot Mar 16, 2015
4e00dfc
initial addition of ipynb for supplementaldata
olgabot Mar 16, 2015
663ce48
Clarify where example plots should go, add requirement for new non-pl…
olgabot Mar 16, 2015
7bc0818
actually iterate over the items of name_to_df
olgabot Mar 16, 2015
054ba2e
fix resource --> supplemental in reading all supplemental data
olgabot Mar 16, 2015
986571a
Get supplemental resource name, not name of supplemental
olgabot Mar 16, 2015
b2aeaea
fix pep8
olgabot Mar 16, 2015
bb92407
Add option and test for user-specified flotilla directory
olgabot Mar 16, 2015
8c7705e
Add finished supplementaldata ipynb
olgabot Mar 16, 2015
8206a59
fix modality priors
olgabot Mar 16, 2015
f87e50b
Add docstrings and set minimum samples to be 10
olgabot Mar 16, 2015
75b54dc
Fix tests for modality assignments
olgabot Mar 16, 2015
164d2c5
fix pep8
olgabot Mar 16, 2015
e3ac7b5
merged up to master
olgabot Mar 16, 2015
4352e28
removed _fixed from test_splicingdata
olgabot Mar 16, 2015
8a5c59b
Merge pull request #276 from YeoLab/pr_checklist_examples
olgabot Mar 16, 2015
cdeb225
actually save the minimum number of samples
olgabot Mar 16, 2015
300a57e
Add release notes
olgabot Mar 16, 2015
b05ffc6
Add release notes about documenting
olgabot Mar 16, 2015
fc88ff0
Merge pull request #272 from YeoLab/supplemental_data
olgabot Mar 17, 2015
0c2f544
Fix pep8, add docstring
olgabot Mar 17, 2015
7e77203
Add docstring for plot
olgabot Mar 17, 2015
ab45aaa
pep8+docstrings
olgabot Mar 17, 2015
9464f90
add release notes
olgabot Mar 17, 2015
4afb11f
Add supplementaldata to tutorial
olgabot Mar 17, 2015
bfa166d
Merge pull request #278 from YeoLab/supplemental_data
olgabot Mar 17, 2015
a17486c
Move installing packages for documentation to only happen if this bra…
olgabot Mar 17, 2015
36453f1
Merge pull request #277 from YeoLab/study_save_min_samples
olgabot Mar 17, 2015
61ea979
Merge branch 'master' of github.com:YeoLab/flotilla
olgabot Mar 17, 2015
a788b66
fix pep8 errors created by removal of "_fixed"
olgabot Mar 17, 2015
6780653
add ipython notebook
olgabot Mar 18, 2015
63c398f
add modalities ipython notebook to tutorial.rst
olgabot Mar 18, 2015
d58b977
Add release notes
olgabot Mar 18, 2015
4552526
Merge branch 'master' into modality_priors
olgabot Mar 18, 2015
8fafe2a
Merge branch 'modality_priors'
olgabot Mar 18, 2015
ac92137
fix merge conflict in tutorial.rst and v0.2.6.rst
olgabot Mar 18, 2015
19208b3
remove mention of "scripts/" directory in PR checklist
olgabot Mar 18, 2015
4db36ee
add citation for PR checklist
olgabot Mar 18, 2015
17d153c
place the PCA legend in the "best" place
olgabot Mar 18, 2015
2f9e6e9
Add release notes about PCA legend
olgabot Mar 18, 2015
87293eb
Auto-expand plot_gene violins to the number of phenotypes
olgabot Apr 8, 2015
42cbcb8
Change default plotting markers from a circle to a variety of symbols
olgabot Apr 8, 2015
c653e55
Add "data_type" to error message of no feature id found
olgabot Apr 8, 2015
905cb68
Fix gridspec_kws --> gridspec_kw typo
olgabot Apr 8, 2015
c827e26
add tests for plot_gene, plot_event!
olgabot Apr 8, 2015
98eca91
fix test for metadata plotting markers
olgabot Apr 8, 2015
25d5cab
force phenotype_groupby to always be a series
olgabot Apr 8, 2015
5e8b7f1
Auto-adjust violin size in plot_pca
olgabot Apr 8, 2015
c71f086
Test plot_pca with violins
olgabot Apr 8, 2015
9030cca
Add release notes
olgabot Apr 8, 2015
b178977
Merge pull request #285 from YeoLab/variable_width_violin_plots
olgabot Apr 8, 2015
13067fa
make sure boolean columns are used as sample/feature subsets
olgabot Apr 8, 2015
510051b
Actually test if things were plotted to the axes
olgabot Apr 10, 2015
6afcc34
Add a feature renamer if there wasn't one
olgabot Apr 10, 2015
2b406df
pep8 fixes
olgabot Apr 10, 2015
9e46069
Add release notes
olgabot Apr 10, 2015
9efbcbd
fix merge conflict (more things in release ntoes
olgabot Apr 10, 2015
f5bbf28
Merge branch 'decomposition_heatmap_pcs'
olgabot Apr 10, 2015
a47f61f
pep8 fixes
olgabot Apr 10, 2015
6078455
Add release notes about fixing boolean subset columns for metadata
olgabot Apr 10, 2015
6ab59c1
Merge pull request #251 from waffle-iron/master
olgabot Apr 10, 2015
55247a8
Add jsonschema to doc install requirements
olgabot Apr 10, 2015
0c9a657
temporarily change master branch for testing
olgabot Apr 10, 2015
dfec06b
Merge pull request #290 from YeoLab/boolean_feature_subsets
olgabot Apr 10, 2015
c634d25
install ipython and jsonschema using conda
olgabot Apr 10, 2015
d7f1f6b
don't run test suite for now
olgabot Apr 10, 2015
c8abd2d
say yes to install
olgabot Apr 10, 2015
7102bc6
change max depth
olgabot Apr 10, 2015
6899dc7
remove plot_modalities_reduced for now
olgabot Apr 10, 2015
4e86ce6
Make sure REPO_URL_GITHUB is defined
olgabot Apr 10, 2015
9122823
trying whatever I can for things to get included in the tutorial
olgabot Apr 10, 2015
41f48e6
trying to include things in the tutorial
olgabot Apr 10, 2015
17ff007
comment out plotting functions for now
olgabot Apr 10, 2015
5e915a9
use brainspan instead of shalek2013 data as examples
olgabot Apr 10, 2015
cd7aed1
add release notes
olgabot Apr 10, 2015
0d02b72
Merge pull request #296 from YeoLab/doc_ipynb_fixes
olgabot Apr 10, 2015
213e9a7
remove dev from version number
olgabot Apr 10, 2015
21f12a6
Add date to 0.2.6
olgabot Apr 10, 2015
2afd1f9
Version bump to 0.2.7dev
olgabot Apr 10, 2015
53a8744
change MASTER to real master
olgabot Apr 10, 2015
8c5c82f
change MASTER to tutorial for now
olgabot Apr 20, 2015
11d3e18
remove sudo from the pip install because it seems to be using a diffe…
olgabot Apr 20, 2015
73cdc38
use flotilla._shalek2013 as example instead of the string
olgabot Apr 20, 2015
2a96b51
move building the docs into the testing script (if the docs don't bui…
olgabot Apr 20, 2015
9f8afaf
Use only ipython2 to make documentaion
olgabot Apr 20, 2015
08304ae
add documentation tools from seaborn
olgabot Apr 20, 2015
85f7e47
use seaborn style code for making ipython notebooks of documentation …
olgabot Apr 20, 2015
74aa466
use blog version of shalek2013
olgabot Apr 20, 2015
7aeef8a
Add release notes about documentation
olgabot Apr 20, 2015
916d961
Update makefile for making ipython notebook documentation
olgabot Apr 20, 2015
e10c2fa
add folder that's autodownloaded for the shalek and satija data
olgabot Apr 20, 2015
55de4ec
add a separate conda requirements file
olgabot Apr 20, 2015
7f972b3
moved programs from .travis.yml to conda_requriements.txt
olgabot Apr 20, 2015
4158a5b
cleaned up conda install command
olgabot Apr 20, 2015
32bcd9f
fix usage of conda install with a file
olgabot Apr 20, 2015
e8b0ed4
add separate conda_requirements installation document for building docs
olgabot Apr 20, 2015
8fe35c6
auto-say es to ipython-notebook 2
olgabot Apr 20, 2015
46ad877
add ipython to regular conda requirements
olgabot Apr 20, 2015
fd18091
remove ipython notebook from pre-install
olgabot Apr 20, 2015
cce2450
make nb_to_doc and nbstripoutput executable
olgabot Apr 20, 2015
b7ee55a
fix conversion of ipython notebooks to rst files
olgabot Apr 20, 2015
331734b
change MASTER branch to real master
olgabot Apr 20, 2015
3e0045f
Turn tests back on :)
olgabot Apr 20, 2015
285160e
Merge pull request #301 from YeoLab/tutorial
olgabot Apr 20, 2015
bfd3d6c
remove "dev" from version
olgabot Apr 20, 2015
a1adb01
Add dates to release notes
olgabot Apr 20, 2015
0930ba7
make sure to reinstall flotilla in documentation
olgabot Apr 20, 2015
6e7dab2
add note to release ntoes
olgabot Apr 20, 2015
9e39240
add combat license
olgabot Jan 31, 2015
99b00c6
add combat.py
olgabot Jan 31, 2015
2653d69
initial commit for adding combat functionality
olgabot Feb 3, 2015
c415723
Add metadata_ignore_subset_cols
olgabot May 8, 2015
59049d7
Set the first column as the index for importing feature data
olgabot May 8, 2015
7eab2f5
make a dict of the colors directly rather than through a defaultdict
olgabot May 8, 2015
9d60d78
use L2 norm for vector sizes
olgabot May 8, 2015
fb8a2fb
Use flake8 instead of pyflakes so can exclude "external" directory
olgabot May 8, 2015
53a4f58
don't install pyflakes or pep8 in travis anymore since now using flake8
olgabot May 8, 2015
50ceddc
Add flake8 to requirements
olgabot May 8, 2015
33b7625
Take out reference to pep8 and add a welcome statement to contributin…
olgabot May 8, 2015
49af2e4
remove pep8 command
olgabot May 8, 2015
6851662
Merge pull request #253 from YeoLab/combat_batch_effects
olgabot May 8, 2015
4acc5e0
only do "make lint" on python2
olgabot May 19, 2015
e7831d0
change splicing na threshold max to 0.5 and not 1
olgabot May 19, 2015
d3553fa
Merge branch 'py3k_test_fixes'
olgabot May 19, 2015
6c4b001
Merge branch 'master' of github.com:YeoLab/flotilla
olgabot May 19, 2015
4e4adc9
remove pep8 since using flake8 now
olgabot May 19, 2015
a3f3583
Add auto-deployment to PyPI on tagged branches
olgabot May 20, 2015
bfb04cb
Merge branch 'travis_pypi'
olgabot May 20, 2015
1a9b428
Merge branch 'master' of github.com:YeoLab/flotilla
olgabot May 20, 2015
7818f76
version bump to 0.2.8dev
olgabot May 21, 2015
c67b25b
Update combat code to work with multiple covariates in the batches
olgabot May 22, 2015
7fca3f6
Merge pull request #306 from YeoLab/update_combat
olgabot May 22, 2015
b873e0c
Simplify README.rst for PyPI
olgabot May 22, 2015
337852c
un-indent lists so they don't appear as quotes
olgabot May 22, 2015
3fa098b
trailing unindented list
olgabot May 22, 2015
e3fb5f8
By default, rasterize the lavalamp plot
olgabot May 22, 2015
8c57616
raster is the wrong keyword, use rasterized
olgabot May 22, 2015
21f9108
Fix tidy_splicing_with_expression to deal with when splicing events m…
olgabot May 23, 2015
f6c0c99
use coverage instead of pytest-cov to calculate coverage (something i…
olgabot May 23, 2015
85b7ece
Add release notes
olgabot May 23, 2015
d72f492
Remove rasterizing release notes, add release notes for this correct …
olgabot May 23, 2015
3b815c8
lint fixes and remove commented code
olgabot May 23, 2015
80c23fa
Remove commented code
olgabot May 23, 2015
00aef52
Fix over-indentation for lint
olgabot May 23, 2015
9ba8822
pep8 in study objects
olgabot May 28, 2015
9143306
Merge pull request #309 from YeoLab/splicing_multiple_expression_ids
olgabot May 28, 2015
3028b71
Update combat code to work with multiple covariates in the batches
olgabot May 22, 2015
effec4a
Simplify README.rst for PyPI
olgabot May 22, 2015
97eb519
un-indent lists so they don't appear as quotes
olgabot May 22, 2015
d949afb
trailing unindented list
olgabot May 22, 2015
01f9e8d
Fix tidy_splicing_with_expression to deal with when splicing events m…
olgabot May 23, 2015
13a9301
use coverage instead of pytest-cov to calculate coverage (something i…
olgabot May 23, 2015
59b076a
Add release notes
olgabot May 23, 2015
42097f3
Remove rasterizing release notes, add release notes for this correct …
olgabot May 23, 2015
e868717
lint fixes and remove commented code
olgabot May 23, 2015
3c8b362
Remove commented code
olgabot May 23, 2015
f98a103
Fix over-indentation for lint
olgabot May 23, 2015
ad47f36
pep8 in study objects
olgabot May 28, 2015
9f77583
Add release notes, fix naming and make sure releases are described in…
olgabot May 28, 2015
b19728e
Merge pull request #308 from YeoLab/raster_lavalamp
olgabot May 28, 2015
b3d02c4
Stepwise modality estimation
olgabot May 29, 2015
b2e69a8
Add tests for stepwise modality estimation
olgabot May 29, 2015
71990dd
Add stepwise modality estimation for a single event
olgabot May 29, 2015
aed3874
uniform --> ambiguous
olgabot May 29, 2015
7ef2cf8
Close plots after plotting tests
olgabot May 29, 2015
e4434fe
whitespace for pep8
olgabot May 30, 2015
dc990b9
add release notes
olgabot May 30, 2015
888c5f1
Merge pull request #310 from YeoLab/stepwise_modalities
olgabot May 30, 2015
5448dea
update all NMF and modality calculations to require 20 samples, fix b…
olgabot Jun 9, 2015
304959a
change number of samples to 50 for splicing testing
olgabot Jun 9, 2015
75f749e
use n=20 as default instead of n=0.5
olgabot Jun 9, 2015
5c7cea3
fix tests for splicing modalities and NMF space
olgabot Jun 9, 2015
7761406
update all NMF and modality calculations to require 20 samples, fix b…
olgabot Jun 9, 2015
0a0e9ac
change number of samples to 50 for splicing testing
olgabot Jun 9, 2015
6946175
use n=20 as default instead of n=0.5
olgabot Jun 9, 2015
65703c4
fix tests for splicing modalities and NMF space
olgabot Jun 9, 2015
5bed758
if there are zero non-NA values in a dataset, make sure all its log b…
olgabot Jun 10, 2015
0f57cf9
Merge remote-tracking branch 'origin/splicing_min20' into splicing_min20
olgabot Jun 10, 2015
e742b7c
don't estimate modalities on data iwth no counts
olgabot Jun 10, 2015
ccedfb6
Add violinplots from temposeq ipython
olgabot Jul 1, 2015
c2100a6
Require seaborn 0.6 for violinplot and stripplot
olgabot Jul 1, 2015
4c752f6
fix logic
olgabot Jul 1, 2015
3fd682c
Add docstrings
olgabot Jul 1, 2015
c3b6c68
Add splicing-specific parameters for violinplots in plot_feature
olgabot Jul 1, 2015
a0f57a4
propagate changes to BaseData._violinplot
olgabot Jul 1, 2015
a65151c
lint fixes
olgabot Jul 6, 2015
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
3 changes: 3 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[run]
omit = *test/*
branch = True
2 changes: 2 additions & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
service_name: travis-ci
repo_token: Pk8rldcpUmf4b8ITeoa7XBYHiAc3LNXlc
13 changes: 12 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,15 @@ build
dist
.idea*
.idea/*
*DS_store
*DS_store

virtualenv

# emacs
*~
.coverage
.ipynb_checkpoints
_build

# Shalek and Satija data
nature12172-s1
6 changes: 0 additions & 6 deletions .gitmodules

This file was deleted.

54 changes: 54 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
language: python
python:
- '2.7'
before_install:
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh
-O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-3.4.2-Linux-x86_64.sh
-O miniconda.sh; fi
- chmod +x miniconda.sh
- "./miniconda.sh -b"
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then export PATH=~/miniconda/bin:$PATH;
else export PATH=~/miniconda3/bin/:$PATH; fi
- conda update --yes conda
- export COVERALLS_SERVICE_NAME=travis-ci
- export COVERALLS_REPO_TOKEN=Pk8rldcpUmf4b8ITeoa7XBYHiAc3LNXlc
install:
- conda create -n testenv --yes python=$TRAVIS_PYTHON_VERSION
- source activate testenv
- conda install --yes --file conda_requirements.txt
- pip install -r requirements.txt
- pip install coverage
- pip install coveralls
before_script:
- git config --global user.email "olga.botvinnik@gmail.com"
- git config --global user.name "olgabot"
- git config --global push.default simple
- export REPO_URL_GITHUB="https://$GH_TOKEN@github.com/$GH_REPO.git"
- ". ./.travis/setup.sh"
- echo $DEPLOY_HTML_DIR
script:
- make coverage
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then make lint ; fi
# For building the docs
- MASTER=master
- if [[ $TRAVIS_BRANCH == v*.*.* ]] ; then export DEPLOY_HTML_DIR=docs ; fi
- if [[ $TRAVIS_BRANCH == "$MASTER" ]] ; then export DEPLOY_HTML_DIR=docs-dev ; fi
- if [[ $TRAVIS_BRANCH == v*.*.* ]] || [[ $TRAVIS_BRANCH == "$MASTER" ]] ; then sudo apt-get install pandoc; conda install --yes --file doc/conda_requirements.txt ; conda install --yes ipython-notebook=2; pip install -r doc/requirements.txt; pip install . ; cd doc ; make setup_gh_pages ; make generate ; make deploy ; fi
after_script:
- coveralls
notifications:
slack:
rooms:
- yeolab:HxLwrd5FGhZQ8SyBD9Fvh3dn#flotilla
env:
global:
- GH_REPO="YeoLab/flotilla"
- secure: N8LIn+ZtvaL+j9uHJFRtTWHbJtLk47r+7PUaSPapmpRPkqD4zClwC1+xVrfRXYiTWLVmCMfbcOAjQmZR8OjL8TKD4yGPzXAS5yb9QUhlMBf2is7CECIZQcQ/kht4KGKF72QoRY4r/Eh4NKhayBUWwZmHXd5zIKn8C/irvr+6LBI=
deploy:
provider: pypi
user: obot
password:
secure: YVGmMuvzAcgEZqk1ezIl6yMwPW4DZ0euHbifyHfz1FQHGlAxHJa8CMfzVfkbkR820xTapidkZkBlBAY1zOyJ346M/rID0T5WvBM68qbeYvyp24IR7p4gEnlcBvljs+Ce9/egzIs/XxceYnJekJ2iyWmTaTxb2v8Efqp1UNEaaIY=
on:
tags: true
repo: YeoLab/flotilla
13 changes: 13 additions & 0 deletions .travis/setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash

#setup travis-ci configuration basing one the being-built branch

if [[ $TRAVIS_BRANCH == 'master' ]] ; then
export DEPLOY_HTML_DIR=docs
elif [[ $TRAVIS_BRANCH == 'develop' ]] ; then
export DEPLOY_HTML_DIR=docs/develop
elif [[ $TRAVIS_BRANCH =~ ^v[0-9.]+$ ]]; then
export DEPLOY_HTML_DIR=docs/${TRAVIS_BRANCH:1}
else
export DEPLOY_HTML_DIR=docs/$TRAVIS_BRANCH
fi
118 changes: 118 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
Contributing to `flotilla`
==========================

You are an awesome human being for wanting to contribute to the `flotilla`
large-scale RNA-seq open-source software! Check out our guidelines below for
how to best format your code and features so your sweet new idea can be added
as soon as possible.

Install in development mode
---------------------------

First clone the repository,

git clone git@github.com:YeoLab/flotilla

Change directories to the flotilla directory you just made,

cd flotilla

Now install via `pip` in "editable" mode, aka "develop" mode:

pip install -e .

Git branching
-------------

We use the [GitHub-Flow](http://scottchacon.com/2011/08/31/github-flow.html) model.

To contribute:

1. Make a branch off of the master.

2. Commit updates exclusively to your branch.

3. When changes on that branch are finished, open a [pull request](https://help.github.com/articles/using-pull-requests/).

4. Once someone has reviewed and approved of the changes on your branch, you should immediately merge your branch into the master.

Naming conventions
------------------

When in doubt, please defer to [Python Enhancement Proposal 8 (aka [PEP8]
(http://legacy.python.org/dev/peps/pep-0008/)) and the [Zen of Python]
(http://legacy.python.org/dev/peps/pep-0020/)

* Classes are `CamelCase`, e.g.: `BaseData` and `PCAViz`
* Functions are `lower_case_with_underscores`, e.g. `go_enrichment` and
`binify`
* Explicit is better than implicit


Docstring conventions
---------------------

We will attempt to stick to the [`numpy` docstring specification](https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt) (aka
"`numpydoc`").

To make this easier, I use ["Live Templates" in PyCharm]
(http://peter-hoffmann.com/2010/python-live-templates-for-pycharm.html),
check out the instructions [here](https://github.com/YeoLab/PyCharm-Python-Templates) for how to install and use them.

Testing
-------

In the source directory (wherever you cloned `flotilla` to that has this README.md file), do:

make test

This will run the unit test suite.

### Coverage

To check coverage of the test suite, run

make coverage

in the source directory.


PEP8 Conventions
----------------

To run `pep8` and `pyflakes` over the code, make sure you have [this fork]
(pip install https://github.com/dcramer/pyflakes/tarball/master) of
`pyflakes` installed (e.g. via `pip install https://github
.com/dcramer/pyflakes/tarball/master`) and run:

make lint

Pull Request Checklist
----------------------

When you make a pull request, please copy this text into your first message
of the pull request, which will create a checklist, which should be completed
before the pull request is merged.

```
- [ ] Is it mergable?
- [ ] Did it pass the tests?
- [ ] If it introduces new functionality in is it tested?
Check for code coverage. To run code coverage on only the file you changed,
for example `flotilla/compute/splicing.py`, use this command:
`py.test --cov flotilla/compute/splicing.py --cov-report term-missing flotilla/test/compute/test_splicing.py`
which will show you which lines aren't covered by the tests.
- [ ] Do the new functions have descriptive
[numpydoc](https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt)
style docstrings?
- [ ] If it adds a new feature, is it documented as an IPython Notebook in
`examples/`, and is that notebook added to `doc/tutorial.rst`?
- [ ] If it adds a new plot, is it documented in the gallery, as a `.py` file
in `examples/`?
- [ ] Is it well formatted? Look at the output of `make lint`.
- [ ] Is it documented in the doc/releases/?
- [ ] Was a spellchecker run on the source code and documentation after
changes were made?
```

Note: This checklist was heavily borrowed from the [khmer](https://khmer.readthedocs.org/en/latest/dev/coding-guidelines-and-review.html#checklist) project.
90 changes: 90 additions & 0 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
Docker Installation Instructions
================================

[Docker](https://www.docker.com/whatisdocker/) is the preferred method to obtain the most up-to-date
version of `flotilla`. Every change we make to the source code triggers a new build of a virtual
machine that contains flotilla and all its dependencies.

Please follow instructions [here](docker/docker_instructions.md) to get, install, and run the `flotilla` image.



OS X Installation instructions
==============================

The following steps have been tested on a clean install of Mavericks 10.9.4.

All others must fend for themselves to install matplotlib, scipy and their third-party dependencies.

*This part only needs to be done once*

* [Install anaconda](https://store.continuum.io/cshop/anaconda/)
* [Install Xcode (this can take an hour)](https://itunes.apple.com/us/app/xcode/id497799835?mt=12)
* Open Xcode and agree to terms and services (it is very important to read them thoroughly)
* Install [homebrew](http://brew.sh/)


`ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"`


* Install freetype:


`brew install freetype`


* Install heavy packages (this can take an hour or more)

```
conda install pip numpy scipy cython matplotlib nose six scikit-learn ipython networkx pandas tornado statsmodels setuptools pytest pyzmq jinja2 pyyaml`
```

* Create a virtual environment
```
conda create -n flotilla_env pip numpy scipy cython matplotlib nose six scikit-learn ipython networkx pandas tornado statsmodels setuptools pytest pyzmq jinja2 pyyaml`
```

* Switch to virtual environment


`source activate flotilla_env`


* Install flotilla and its dependencies (this can take a few minutes):


`pip install git+https://github.com/YeoLab/flotilla.git`


* Create a scratch space for your work


`mkdir ~/flotilla_scratch`


* Make a place to store flotilla projects


`mkdir ~/flotilla_projects`


* Go back to the real world

`source deactivate`



* switch to virtual environment


`source activate flotilla_env`


* start an ipython notebook:


`ipython notebook --notebook-dir=~/flotilla_scratch`


* create a new notebook by clicking `New Notebook`
* rename your notebook from "Untitled" to something more informative by clicking the title panel.
50 changes: 33 additions & 17 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,37 @@
The MIT License (MIT)
UC Copyright Notice

Copyright (c) 2014, Michael Lovci, Olga Botvinnik, Gene Yeo
This software is Copyright (C) 2014 The Regents of the University of California. All Rights Reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Permission to copy, modify, and distribute this software and its documentation for educational,
research and non-profit purposes, without fee, and without a written agreement is hereby granted,
provided that the above copyright notice, this paragraph and the following three paragraphs appear in all copies.

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
Permission to make commercial use of this software may be obtained by contacting:
Technology Transfer Office
9500 Gilman Drive, Mail Code 0910
University of California
La Jolla, CA 92093-0910
(858) 534-5815
invent@ucsd.edu

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
This software program and documentation are copyrighted by The Regents of the
University of California. The software program and documentation are supplied
"as is", without any accompanying services from The Regents. The Regents does
not warrant that the operation of the program will be uninterrupted or
error-free. The end-user understands that the program was developed for
research purposes and is advised not to rely exclusively on the program for
any reason.

IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO
ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
CONSEQUENTIAL DAMAGES, INCLDING LOST PROFITS, ARISING
OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION,
EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE. THE UNIVERSITY OF
CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
MODIFICATIONS.
14 changes: 14 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export SHELL := /bin/bash

test:
cp testing/matplotlibrc .
py.test
rm matplotlibrc

coverage:
cp testing/matplotlibrc .
coverage run --source flotilla --omit=test --module py.test
rm matplotlibrc

lint:
flake8 --exclude flotilla/external,doc flotilla
Loading