Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Wagner committed Mar 5, 2017
2 parents 7e92925 + bb95561 commit 0ca035c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions gopca/go_pca.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,8 @@ def _local_filter(params, gse_analysis, enriched, ranked_genes,
params.mHG_X_frac, params.mHG_X_min, L,
adjust_pval_thresh=False,
escore_pval_thresh=params.escore_pval_thresh,
gene_set_ids=[gs_id], table=table)
gene_set_ids=[gs_id], table=table,
exact_pval='if_necessary')
assert len(enr) in [0, 1]
# enr will be an empty list if GO term does not meet the p-value
# threshold
Expand Down Expand Up @@ -484,7 +485,8 @@ def _generate_pc_signatures(matrix, params, gse_analysis, W, pc,
ranked_genes, params.pval_thresh,
params.mHG_X_frac, params.mHG_X_min, params.mHG_L,
adjust_pval_thresh=False,
escore_pval_thresh=params.escore_pval_thresh)
escore_pval_thresh=params.escore_pval_thresh,
exact_pval='if_significant')
if not enriched:
# no gene sets were found to be enriched
return []
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
'future>= 0.16, <1',
'unicodecsv>= 0.14.1, <1',
'xlsxwriter>= 0.7.7, <1',
'genometools>=0.2.2, <0.3',
'genometools>=0.2.6, <0.3',
'setuptools>=27.2.0',
]

Expand Down Expand Up @@ -68,7 +68,7 @@
setup(
name='gopca',

version='0.2.1',
version='0.2.2',

description=description,
long_description=long_description,
Expand Down

0 comments on commit 0ca035c

Please sign in to comment.