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 species data location #282

Open
wants to merge 1,989 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1989 commits
Select commit Hold shift + click to select a range
b94a55c
rewrite modality_counts test to be like the code
olgabot Jan 11, 2015
79f8d9f
change test min_samples params so they're larger
olgabot Jan 11, 2015
a37ea80
Increase modality parameter stepsize to 2, so fewer models to test ag…
olgabot Jan 11, 2015
ae414bd
Move all barplot code into one function, and do it by hand instead of…
olgabot Jan 11, 2015
1401064
Remove counts from modality estimator since it's something you can do…
olgabot Jan 11, 2015
34fc854
Properly calculate per-group counts of modalities
olgabot Jan 11, 2015
ef4dda3
fix up groupbys when they are None
olgabot Jan 11, 2015
df7d72a
Add more tests for splicng data and fixes for basedata if arguments a…
olgabot Jan 11, 2015
8c2eb4b
yay tests passing!
olgabot Jan 11, 2015
04dab94
added feature standardization to cluster plot by default
mlovci Jan 12, 2015
7b6691d
added feature standardization to cluster plot by default
mlovci Jan 12, 2015
218ef73
add colors and groupby to test_plot_two_features
olgabot Jan 13, 2015
7cc0731
"best" location for modalities bars legend
olgabot Jan 13, 2015
02ce439
set bar height to 0 if modality not detected
olgabot Jan 13, 2015
baa231c
fix number of modalities to always be the same
olgabot Jan 13, 2015
d8f9d19
fix width, linewidth and edgecolor
olgabot Jan 13, 2015
6fce6cc
Add percentages to study-level plot_modalities_bars
olgabot Jan 13, 2015
5bb02ae
add grid and ticklabels to modalities_bars figure
olgabot Jan 13, 2015
520b2ee
fix typo
olgabot Jan 13, 2015
dd21a84
add xlabel and ylabel
olgabot Jan 13, 2015
0590855
Add xlim
olgabot Jan 13, 2015
35f9d66
add plot_modalities_bars to gallery examples
olgabot Jan 13, 2015
e8424af
add groupbys to plot_modalities_reduced
olgabot Jan 13, 2015
ad16522
force modality assigments to always be a series
olgabot Jan 13, 2015
301ed26
removed groupby from plot_modalities_reduced invocation
olgabot Jan 13, 2015
424941e
add docstring
olgabot Jan 13, 2015
922a5e4
remove xticks and yticks from reduced space
olgabot Jan 13, 2015
20e5358
fix number of axes for modalities reduced plots
olgabot Jan 13, 2015
537ec9f
increase alpha
olgabot Jan 13, 2015
fc2280a
remove commented out pdb set trace
olgabot Jan 13, 2015
d0690de
add plot_modalities_reduced example
olgabot Jan 13, 2015
4b171eb
Add feature_ids to plot_modalities_lavalamps, and docstring
olgabot Jan 13, 2015
64d424a
add plot_event_modality_estimation to show logliks and bayes factors …
olgabot Jan 13, 2015
3325a94
fix call to modality_visualizer.event_estimation
olgabot Jan 14, 2015
bb5497a
add plot_modalities_lavalamps to gallery
olgabot Jan 14, 2015
10a709d
Fix build badge for Travis-CI
olgabot Jan 14, 2015
47ac671
add modality_colors to argument
olgabot Jan 14, 2015
16b35eb
fix reference to modality_colors
olgabot Jan 14, 2015
4d3a51f
fix logsumexps
olgabot Jan 14, 2015
77366f7
dropna for seaborn violinplot
olgabot Jan 14, 2015
ecb3ef2
move xlabel to loglik, fix formatting
olgabot Jan 14, 2015
930b2c4
Add renamed event id to event estimation plot
olgabot Jan 14, 2015
9bd11b4
add event ID using figtext which won't resize the axes
olgabot Jan 14, 2015
ff570c9
add xlabel to loglik for padding, change xticks of violin, smaller fo…
olgabot Jan 14, 2015
3801126
add phantom text for xlabel
olgabot Jan 14, 2015
20dbf41
turn on grid for ax_bayesfactor
olgabot Jan 14, 2015
ab0ba3d
Add plot example for plot_event_modality_estimation
olgabot Jan 14, 2015
833fb39
Add comment about readme badge in doc/releases/v0.2.5.txt
olgabot Jan 14, 2015
8524082
make font size smaller, add renamed to fig text
olgabot Jan 14, 2015
2ded4a8
change example for plot_event_modality_estimation
olgabot Jan 15, 2015
ba019c8
add uniform at _logsumexp step
olgabot Jan 15, 2015
b4d8535
Merge pull request #237 from YeoLab/readme_fixes
olgabot Jan 20, 2015
7207532
fix test_logsumexp test
olgabot Jan 20, 2015
5cd6aff
Add flag to py.test to show top 20 tests with the longest durations
olgabot Jan 20, 2015
61c8166
add numpydoc style docstrings to contributing.md
olgabot Jan 20, 2015
7c6f714
Merge branch 'bayesian_modalities'
olgabot Jan 20, 2015
ec0ad72
Merge branch 'master' of github.com:YeoLab/flotilla
olgabot Jan 20, 2015
bc19063
Initial commit for cosine transform pca
olgabot Jan 2, 2015
0e4368f
Move cosine transform code out of SplicingData.reduce() and into Spli…
olgabot Jan 20, 2015
f39983d
Removed SplicingData.reduce since now SplicingData._subset_and_standa…
olgabot Jan 20, 2015
e89cb91
Add test for SplicingData._subset_and_standardize
olgabot Jan 21, 2015
971b313
fix reduce bug
olgabot Jan 21, 2015
643f77c
Added Gitter badge
gitter-badger Jan 22, 2015
46fcdc8
Add example of pac splicing
olgabot Jan 23, 2015
e17613d
don't cache feature_renamer series
Jan 23, 2015
631a7c0
update plot_two_features and plot_two_samples tests to always use fe…
olgabot Jan 26, 2015
6c8d81c
properly access features with enough observations
olgabot Jan 26, 2015
a4b8bb6
properly except get_ipython()
olgabot Jan 26, 2015
265ee7e
Remove matplotlib inline call (user needs to do this themselves, and …
olgabot Jan 26, 2015
28ad908
update make lint call to not exclude everything
olgabot Jan 26, 2015
214c691
Add release note about removing ``matplotlib inline``
olgabot Jan 26, 2015
40cebad
Add cosine transform about splicing pca to release notes
olgabot Jan 26, 2015
c1646f6
Add docstring for SplicingData._subset_and_standardize
olgabot Jan 26, 2015
f7ef4c0
Fix up BaseData._subset_and_standardize docstring, with a concise one…
olgabot Jan 26, 2015
a5fc37c
remove whitespace for pep8
olgabot Jan 26, 2015
85c513f
Merge pull request #235 from YeoLab/splicing_pca
olgabot Jan 26, 2015
10f7f28
don't cache feature_renamer series
Jan 23, 2015
bc93f01
add a test for making sure feature_rename_col can change for feature_…
olgabot Jan 27, 2015
7e61b4b
Merge branch 'dont_cache_feature_renamer_series' of github.com:YeoLab…
olgabot Jan 27, 2015
04ddb11
Update makefile "lint" command to ignore __init__.py files
olgabot Jan 27, 2015
acdd8b8
Remove compute/visulaize/data_model imports from flotilla/__init__.py…
olgabot Jan 27, 2015
64772fe
Add __all__ statements to __init__.py so that make lint doesn't get mad
olgabot Jan 27, 2015
5d79984
Properly check if a file exists
olgabot Jan 27, 2015
9aa3eed
simple exception since "as e" isn't used
olgabot Jan 27, 2015
ad88300
remove variable assignment for validate_params
olgabot Jan 27, 2015
77237ea
comment out generate_scatter_table
olgabot Jan 27, 2015
d06630b
lint fixes
olgabot Jan 27, 2015
bf73a23
lint and more fixes for tests, but test (should) still pass
olgabot Jan 27, 2015
9d75d76
fix blank lines
olgabot Jan 27, 2015
7b9baa9
remove second command ot call pep8 on flotilla/test (redundant call)
olgabot Jan 27, 2015
d10e79f
pep8 fixes in flotilla/compute
olgabot Jan 27, 2015
082c90c
pep8 fixes, clean up all_true and all_false code
olgabot Jan 27, 2015
a559829
pep8 fixes, removed classify() memoize, hopefully addressing https://…
olgabot Jan 27, 2015
fcb0a3d
lint fixes in flotilla/data_model
olgabot Jan 27, 2015
2ccdeeb
pep8 fixes, remove generate_scatter_table
olgabot Jan 27, 2015
dd2136b
Fix to pep8 standards
olgabot Jan 27, 2015
95059a9
add lint, pep8 to testing script
olgabot Jan 27, 2015
fef17e5
move install commands around
olgabot Jan 27, 2015
42a2e4e
move install commands around
olgabot Jan 27, 2015
19ad6b5
Merge pull request #239 from gitter-badger/gitter-badge
olgabot Jan 27, 2015
98c9a86
move install commands around
olgabot Jan 27, 2015
7fbd5ea
Make comment about gitter badge
olgabot Jan 27, 2015
c748dad
move doc of classifier/regressor to use PredictorBase.__init__.__doc_…
olgabot Jan 27, 2015
8fa9933
Merge pull request #249 from YeoLab/dont_cache_feature_renamer_series
olgabot Jan 30, 2015
d95eb25
Merge branch 'lint_pep8'
olgabot Jan 30, 2015
d9e53c2
fix inconsequential merge conflict in base
olgabot Jan 30, 2015
42a297a
Add release note about scale_by_variance
olgabot Jan 26, 2015
2cf9780
Propagate scale_by_variance from DecompositionViz BaseData, Study.plo…
olgabot Jan 26, 2015
c1d7675
Change {reduced,violins}_fig to fig_{reduced,violins} for easy findin…
olgabot Jan 30, 2015
174a656
Initial commit for test_decomposition viz
olgabot Jan 30, 2015
7dc4227
{reduced,violins}_fig --> fig_{reduced,violins} for easy finding
olgabot Jan 30, 2015
dab3590
{reduced,violins}_fig --> fig_{reduced,violins}
olgabot Jan 30, 2015
a7689d2
dumb typo bug that was making the build fail
olgabot Jan 30, 2015
06f7a32
add indication that order and violinplot_kws are optional
olgabot Jan 30, 2015
81a4561
plot_violins=False, improve docstring of plot_dimensionality_reduction
olgabot Jan 30, 2015
39f4e5a
Change test_{decomposition,generic}.py --> test_{decomposition,generi…
olgabot Jan 30, 2015
8b6bb65
fix up Study.plot_pca docstring
olgabot Jan 30, 2015
9dd5186
pep8 fixes
olgabot Jan 30, 2015
02966de
Merge pull request #250 from YeoLab/scale_by_pca_variance
olgabot Jan 31, 2015
412cc6c
shorten test suite for testing of docs deployment
olgabot Feb 3, 2015
222e859
Update maturity used in the example classifier
olgabot Feb 3, 2015
e564505
Add simple push to travis yml
olgabot Feb 3, 2015
c9775e1
add brainspan data for plotting
olgabot Feb 3, 2015
a4721ee
fix getting of sample ids for trait
olgabot Feb 3, 2015
8e8c593
remove ax from plotting kwargs
olgabot Feb 3, 2015
abcee1b
change plot_classifier to use brainspan data
olgabot Feb 3, 2015
b90f8d5
add indexerror as possible error
olgabot Feb 3, 2015
312635d
restore test suite
olgabot Feb 4, 2015
69ca38c
change development docs branch back to master
olgabot Feb 4, 2015
65aad23
Merge pull request #254 from YeoLab/fix_docs
olgabot Feb 4, 2015
63ad940
only test one thing at a time...
olgabot Feb 4, 2015
9b06d85
Merge branch 'master' of github.com:YeoLab/flotilla
olgabot Feb 5, 2015
5cfc7f5
use npt to test instead of pdt
olgabot Feb 24, 2015
37d001e
Add warnings if the sample ids of subsets don't match up
olgabot Feb 24, 2015
e15c591
simplify tests
olgabot Feb 25, 2015
a9b0468
Add example gene ontology data
olgabot Feb 26, 2015
624f3b1
initial commit for gene ontology
olgabot Feb 3, 2015
a4d97c1
cleanup old ontology code
olgabot Feb 3, 2015
bd1dd7f
add docstring
olgabot Feb 26, 2015
f4037db
add logic to not try to createa GO database if gene_ontology_data is …
olgabot Feb 26, 2015
a073baa
Add status messages of building gene ontology database
olgabot Feb 26, 2015
3a4eec2
fix setting index
olgabot Feb 26, 2015
730f92e
add pdb set trace
olgabot Feb 26, 2015
384d063
few fixes
olgabot Feb 26, 2015
2087a81
change column names
olgabot Feb 26, 2015
f6d2ec3
reorganise GeneOntology data, create ontology in __init__, add option…
olgabot Feb 26, 2015
2117f28
add more options to go enrichment, fix up docstring
olgabot Feb 26, 2015
9ec93b5
stdout --> warnings
olgabot Feb 26, 2015
1073d16
Add go term domains and name to growing defaultdict, and return None …
olgabot Feb 26, 2015
cd2e250
make sure to create defaultdict properly
olgabot Feb 26, 2015
457c65e
df.empty is attribute, not method
olgabot Feb 26, 2015
861cfd8
also say error for why species data wasn't loaded
olgabot Feb 26, 2015
e72dba6
better error message
olgabot Feb 26, 2015
554c59d
access 0th value because 0th item by series may not be valid
olgabot Feb 26, 2015
ff28167
make sure provided domains are converted to frozenset, and fix logic …
olgabot Feb 26, 2015
b6300e4
also check that features of interest overlap with GO term
olgabot Feb 26, 2015
2143049
Make GeneOntologyData accessible from base flotilla
olgabot Feb 26, 2015
8c71cbf
Sort dataframe by p value
olgabot Feb 26, 2015
d8d4ea4
Add tests for gene ontology data
olgabot Feb 26, 2015
5cc8be4
fix tests after refactoring
olgabot Feb 27, 2015
2eabe5a
add example gene ontology data
olgabot Feb 27, 2015
d50b551
Fix tests and add more for a total of 98% coverage!
olgabot Feb 28, 2015
502375a
remove go.py (replaced with the data model)
olgabot Feb 28, 2015
66d8b81
Fix lint errors because pyflakes got majorly strict
olgabot Feb 28, 2015
7a68a43
remove plot_study_sample_legend because it's unused
olgabot Feb 28, 2015
0e6f05e
fix pep8
olgabot Feb 28, 2015
99187a1
fix bug addded while linting
olgabot Feb 28, 2015
b3d81df
speeding up test suite time
olgabot Feb 28, 2015
5393026
add more tests for Study
olgabot Feb 28, 2015
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
ce93758
Add release notes
olgabot Mar 13, 2015
5dd63d3
Merge pull request #267 from YeoLab/shorten_test_suite_time
olgabot Mar 13, 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
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
afc2b9e
Add test of species loading
olgabot Apr 2, 2015
e67d8f1
change species data url, fix up loading of species and gene ontology …
olgabot Apr 2, 2015
45c6077
pep8 fixes
olgabot Apr 2, 2015
665d458
Add docstring to load_species_data and an "nrows" keyword argument th…
olgabot Apr 2, 2015
e99961f
Only read the first 100 rows of the species data
olgabot Apr 2, 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
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,12 @@ build
dist
.idea*
.idea/*
*DS_store
*DS_store

virtualenv

# emacs
*~
.coverage
.ipynb_checkpoints
_build
6 changes: 0 additions & 6 deletions .gitmodules

This file was deleted.

65 changes: 65 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
language: python
python:
# - "2.6"
- "2.7"
# - "3.3"
# - "3.4"

# Set up our virtualenv
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
# Set up coveralls
- export COVERALLS_SERVICE_NAME=travis-ci
- export COVERALLS_REPO_TOKEN=Pk8rldcpUmf4b8ITeoa7XBYHiAc3LNXlc

# command to install dependencies
install:
- conda create -n testenv --yes python=$TRAVIS_PYTHON_VERSION
- source activate testenv
# install as much as we can via conda
- conda install --yes pip numpy scipy cython matplotlib nose six scikit-learn ipython networkx pandas tornado statsmodels setuptools pytest pyzmq jinja2 pyyaml
# Install the rest via pip (brewer2mpl, gspread, seaborn, etc)
- pip install -r requirements.txt
- pip install pep8
- pip install https://github.com/dcramer/pyflakes/tarball/master
- 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 # make any change needed for setup.sh
- echo $DEPLOY_HTML_DIR

# command to run tests
script:
- make coverage
- make lint
- make pep8

after_script:
- coveralls
# 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; pip install sphinx numpydoc sphinx_bootstrap_theme runipy; sudo pip install -r doc/requirements.txt --use-mirrors; cd doc ; make setup_gh_pages ; make generate ; make deploy ; fi

# For slack notifications
notifications:
slack:
rooms:
- yeolab:HxLwrd5FGhZQ8SyBD9Fvh3dn#flotilla

env:
global:
- GH_REPO="YeoLab/flotilla" #change this to your right project
- secure: N8LIn+ZtvaL+j9uHJFRtTWHbJtLk47r+7PUaSPapmpRPkqD4zClwC1+xVrfRXYiTWLVmCMfbcOAjQmZR8OjL8TKD4yGPzXAS5yb9QUhlMBf2is7CECIZQcQ/kht4KGKF72QoRY4r/Eh4NKhayBUWwZmHXd5zIKn8C/irvr+6LBI=

# configure the right travis-ci secure key, see sphinx-deployment/README for more details
#- secure: im3gWbsEF135C0jKlOIRJUa1tgtsCAaqwGDSpzwe/fnTosqystNE+mhvFfERmy1K4qRg0cbRYGd8L6pP/V7RR3GMqFX4h5wexZeKsCN895S0d7QIWUmw2yJ3+mvk/g+E6q56tORzhKzKVRef5VWkk84EOKrZ/KIeoVpKVAlVR1s=
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
119 changes: 119 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@

For developers
==============

Please put ALL import statements at the top of the `*.py` file (potentially underneath docstrings, of course).
The only exception is if a package is not listed in `requirements.txt`,then a "function-only" import may be allowed.
If this doesn't make sense to you, just put the import at the top of the file.


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 `make pep8` and `make lint` output
- [ ] 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.
17 changes: 17 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
export SHELL := /bin/bash

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

coverage:
cp testing/matplotlibrc .
py.test --durations=20 --cov flotilla --cov-report term-missing flotilla/test/
rm matplotlibrc

lint:
pyflakes flotilla

pep8:
pep8 flotilla
Loading